[sumo] 01/02: Merge branch 'master' into jessie-backports

Anton Gladky gladk at moszumanska.debian.org
Sun Mar 19 15:18:30 UTC 2017


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch jessie-backports
in repository sumo.

commit 9eaefcba09d018af95e3996fc5337299a4a0e508
Merge: 590b48d 967d4d9
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Mar 19 15:45:38 2017 +0100

    Merge branch 'master' into jessie-backports

 AUTHORS                                            |     1 +
 Makefile.am                                        |    16 +-
 Makefile.in                                        |    16 +-
 aclocal.m4                                         |     7 +-
 configure                                          |    54 +-
 configure.ac                                       |    18 +-
 data/3D/car-microcargo-citrus.mtl                  |    65 +
 data/3D/car-microcargo-citrus.obj                  |  2422 +++
 data/3D/car-minibus-citrus.mtl                     |    65 +
 data/3D/car-minibus-citrus.obj                     |  2614 +++
 data/3D/car-normal-citrus.mtl                      |    65 +
 data/3D/car-normal-citrus.obj                      |  2448 +++
 data/3D/tl.obj.mtl                                 |    34 +
 data/3D/tlg.obj                                    |  5075 +++++
 data/3D/tlr.obj                                    |  5075 +++++
 data/3D/tlu.obj                                    |  5075 +++++
 data/3D/tly.obj                                    |  5075 +++++
 data/typemap/opendriveNetconvert.typ.xml           |    39 +-
 data/typemap/opendriveNetconvertBicycle.typ.xml    |     2 +-
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     2 +-
 data/typemap/osmNetconvert.typ.xml                 |     4 +-
 data/typemap/osmNetconvertBicycle.typ.xml          |     8 +-
 data/typemap/osmNetconvertShips.typ.xml            |     1 +
 data/xsd/additional_file.xsd                       |    32 +-
 data/xsd/connections_file.xsd                      |     1 +
 data/xsd/det_e2_file.xsd                           |     5 +-
 data/xsd/det_e3_file.xsd                           |    29 +
 data/xsd/dfrouterConfiguration.xsd                 |     2 +
 data/xsd/edgediff_file.xsd                         |     6 +
 data/xsd/edges_file.xsd                            |     6 +
 data/xsd/marouterConfiguration.xsd                 |     2 +
 data/xsd/meandataTypes.xsd                         |     1 +
 data/xsd/net_file.xsd                              |     6 +
 data/xsd/netconvertConfiguration.xsd               |     8 +
 data/xsd/netgenerateConfiguration.xsd              |     7 +
 data/xsd/netstate_file.xsd                         |     9 +-
 data/xsd/polyconvertConfiguration.xsd              |     2 +-
 data/xsd/routeTypes.xsd                            |    55 +-
 data/xsd/sumoConfiguration.xsd                     |    15 +-
 data/xsd/tripinfo_file.xsd                         |     2 +
 debian/changelog                                   |    17 +
 debian/copyright                                   |    73 +-
 debian/patches/10_remove_embedded_gl2ps.patch      |    56 +-
 debian/patches/20_fix_scripts_headers.patch        |    62 +-
 debian/patches/30_add_missing_link.patch           |    17 +-
 debian/patches/40_drop_some_buildflags.patch       |     8 +-
 debian/patches/50_use_system_openlayers.patch      |     6 +-
 debian/patches/60_fix_format_not_a_string.patch    |    48 +
 debian/patches/series                              |     1 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../adlershof_dlr/data/3D/car-minibus-citrus.mtl   |    65 +
 .../adlershof_dlr/data/3D/car-minibus-citrus.obj   |  2614 +++
 .../adlershof_dlr/data/3D/car-normal-citrus.mtl    |    65 +
 .../adlershof_dlr/data/3D/car-normal-citrus.obj    |  2448 +++
 .../OSM/adlershof_dlr/data/3D/tl.obj.mtl           |    34 +
 .../netconvert/OSM/adlershof_dlr/data/3D/tlg.obj   |  5075 +++++
 .../netconvert/OSM/adlershof_dlr/data/3D/tlr.obj   |  5075 +++++
 .../netconvert/OSM/adlershof_dlr/data/3D/tlu.obj   |  5075 +++++
 .../netconvert/OSM/adlershof_dlr/data/3D/tly.obj   |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../OSM/adlershof_dlr/data/xsd/additional_file.xsd |   354 +
 .../adlershof_dlr/data/xsd/amitran/linkdata.xsd    |    35 +
 .../OSM/adlershof_dlr/data/xsd/amitran/network.xsd |    55 +
 .../OSM/adlershof_dlr/data/xsd/amitran/od.xsd      |    44 +
 .../OSM/adlershof_dlr/data/xsd/amitran/routes.xsd  |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../OSM/adlershof_dlr/data/xsd/baseTypes.xsd       |   256 +
 .../adlershof_dlr/data/xsd/connections_file.xsd    |    74 +
 .../OSM/adlershof_dlr/data/xsd/det_e1_file.xsd     |    40 +
 .../OSM/adlershof_dlr/data/xsd/det_e2_file.xsd     |    37 +
 .../OSM/adlershof_dlr/data/xsd/det_e3_file.xsd     |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../OSM/adlershof_dlr/data/xsd/edgediff_file.xsd   |   100 +
 .../OSM/adlershof_dlr/data/xsd/edges_file.xsd      |   102 +
 .../OSM/adlershof_dlr/data/xsd/emission_file.xsd   |    47 +
 .../OSM/adlershof_dlr/data/xsd/fcd_file.xsd        |    38 +
 .../OSM/adlershof_dlr/data/xsd/full_file.xsd       |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../OSM/adlershof_dlr/data/xsd/meandataTypes.xsd   |    69 +
 .../OSM/adlershof_dlr/data/xsd/meandata_file.xsd   |    13 +
 .../OSM/adlershof_dlr/data/xsd/net_file.xsd        |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../OSM/adlershof_dlr/data/xsd/netstate_file.xsd   |    74 +
 .../OSM/adlershof_dlr/data/xsd/nodes_file.xsd      |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../OSM/adlershof_dlr/data/xsd/queue_file.xsd      |    35 +
 .../OSM/adlershof_dlr/data/xsd/routeTypes.xsd      |   593 +
 .../OSM/adlershof_dlr/data/xsd/routes_file.xsd     |    28 +
 .../OSM/adlershof_dlr/data/xsd/summary_file.xsd    |    25 +
 .../adlershof_dlr/data/xsd/sumoConfiguration.xsd   |   239 +
 .../OSM/adlershof_dlr/data/xsd/taz_file.xsd        |    29 +
 .../OSM/adlershof_dlr/data/xsd/tllogic_file.xsd    |    32 +
 .../OSM/adlershof_dlr/data/xsd/tripinfo_file.xsd   |   125 +
 .../OSM/adlershof_dlr/data/xsd/turns_file.xsd      |    46 +
 .../OSM/adlershof_dlr/data/xsd/types_file.xsd      |    26 +
 .../OSM/adlershof_dlr/data/xsd/vtypeprobe_file.xsd |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross3l_edge2edge_conns/data/3D/tl.obj.mtl     |    34 +
 .../cross3l_edge2edge_conns/data/3D/tlg.obj        |  5075 +++++
 .../cross3l_edge2edge_conns/data/3D/tlr.obj        |  5075 +++++
 .../cross3l_edge2edge_conns/data/3D/tlu.obj        |  5075 +++++
 .../cross3l_edge2edge_conns/data/3D/tly.obj        |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../data/xsd/additional_file.xsd                   |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../data/xsd/amitran/network.xsd                   |    55 +
 .../data/xsd/amitran/od.xsd                        |    44 +
 .../data/xsd/amitran/routes.xsd                    |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross3l_edge2edge_conns/data/xsd/baseTypes.xsd |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../data/xsd/det_e1_file.xsd                       |    40 +
 .../data/xsd/det_e2_file.xsd                       |    37 +
 .../data/xsd/det_e3_file.xsd                       |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../data/xsd/edgediff_file.xsd                     |   100 +
 .../data/xsd/edges_file.xsd                        |   102 +
 .../data/xsd/emission_file.xsd                     |    47 +
 .../cross3l_edge2edge_conns/data/xsd/fcd_file.xsd  |    38 +
 .../cross3l_edge2edge_conns/data/xsd/full_file.xsd |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../data/xsd/meandataTypes.xsd                     |    69 +
 .../data/xsd/meandata_file.xsd                     |    13 +
 .../cross3l_edge2edge_conns/data/xsd/net_file.xsd  |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../data/xsd/netstate_file.xsd                     |    74 +
 .../data/xsd/nodes_file.xsd                        |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../data/xsd/queue_file.xsd                        |    35 +
 .../data/xsd/routeTypes.xsd                        |   593 +
 .../data/xsd/routes_file.xsd                       |    28 +
 .../data/xsd/summary_file.xsd                      |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross3l_edge2edge_conns/data/xsd/taz_file.xsd  |    29 +
 .../data/xsd/tllogic_file.xsd                      |    32 +
 .../data/xsd/tripinfo_file.xsd                     |   125 +
 .../data/xsd/turns_file.xsd                        |    46 +
 .../data/xsd/types_file.xsd                        |    26 +
 .../data/xsd/vtypeprobe_file.xsd                   |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross3l_lane2lane_conns/data/3D/tl.obj.mtl     |    34 +
 .../cross3l_lane2lane_conns/data/3D/tlg.obj        |  5075 +++++
 .../cross3l_lane2lane_conns/data/3D/tlr.obj        |  5075 +++++
 .../cross3l_lane2lane_conns/data/3D/tlu.obj        |  5075 +++++
 .../cross3l_lane2lane_conns/data/3D/tly.obj        |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../data/xsd/additional_file.xsd                   |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../data/xsd/amitran/network.xsd                   |    55 +
 .../data/xsd/amitran/od.xsd                        |    44 +
 .../data/xsd/amitran/routes.xsd                    |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross3l_lane2lane_conns/data/xsd/baseTypes.xsd |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../data/xsd/det_e1_file.xsd                       |    40 +
 .../data/xsd/det_e2_file.xsd                       |    37 +
 .../data/xsd/det_e3_file.xsd                       |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../data/xsd/edgediff_file.xsd                     |   100 +
 .../data/xsd/edges_file.xsd                        |   102 +
 .../data/xsd/emission_file.xsd                     |    47 +
 .../cross3l_lane2lane_conns/data/xsd/fcd_file.xsd  |    38 +
 .../cross3l_lane2lane_conns/data/xsd/full_file.xsd |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../data/xsd/meandataTypes.xsd                     |    69 +
 .../data/xsd/meandata_file.xsd                     |    13 +
 .../cross3l_lane2lane_conns/data/xsd/net_file.xsd  |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../data/xsd/netstate_file.xsd                     |    74 +
 .../data/xsd/nodes_file.xsd                        |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../data/xsd/queue_file.xsd                        |    35 +
 .../data/xsd/routeTypes.xsd                        |   593 +
 .../data/xsd/routes_file.xsd                       |    28 +
 .../data/xsd/summary_file.xsd                      |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross3l_lane2lane_conns/data/xsd/taz_file.xsd  |    29 +
 .../data/xsd/tllogic_file.xsd                      |    32 +
 .../data/xsd/tripinfo_file.xsd                     |   125 +
 .../data/xsd/turns_file.xsd                        |    46 +
 .../data/xsd/types_file.xsd                        |    26 +
 .../data/xsd/vtypeprobe_file.xsd                   |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross3l_no_turnarounds/data/3D/tl.obj.mtl      |    34 +
 .../cross3l_no_turnarounds/data/3D/tlg.obj         |  5075 +++++
 .../cross3l_no_turnarounds/data/3D/tlr.obj         |  5075 +++++
 .../cross3l_no_turnarounds/data/3D/tlu.obj         |  5075 +++++
 .../cross3l_no_turnarounds/data/3D/tly.obj         |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../data/xsd/additional_file.xsd                   |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../data/xsd/amitran/network.xsd                   |    55 +
 .../cross3l_no_turnarounds/data/xsd/amitran/od.xsd |    44 +
 .../data/xsd/amitran/routes.xsd                    |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross3l_no_turnarounds/data/xsd/baseTypes.xsd  |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../data/xsd/det_e1_file.xsd                       |    40 +
 .../data/xsd/det_e2_file.xsd                       |    37 +
 .../data/xsd/det_e3_file.xsd                       |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../data/xsd/edgediff_file.xsd                     |   100 +
 .../cross3l_no_turnarounds/data/xsd/edges_file.xsd |   102 +
 .../data/xsd/emission_file.xsd                     |    47 +
 .../cross3l_no_turnarounds/data/xsd/fcd_file.xsd   |    38 +
 .../cross3l_no_turnarounds/data/xsd/full_file.xsd  |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../data/xsd/meandataTypes.xsd                     |    69 +
 .../data/xsd/meandata_file.xsd                     |    13 +
 .../cross3l_no_turnarounds/data/xsd/net_file.xsd   |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../data/xsd/netstate_file.xsd                     |    74 +
 .../cross3l_no_turnarounds/data/xsd/nodes_file.xsd |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../cross3l_no_turnarounds/data/xsd/queue_file.xsd |    35 +
 .../cross3l_no_turnarounds/data/xsd/routeTypes.xsd |   593 +
 .../data/xsd/routes_file.xsd                       |    28 +
 .../data/xsd/summary_file.xsd                      |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross3l_no_turnarounds/data/xsd/taz_file.xsd   |    29 +
 .../data/xsd/tllogic_file.xsd                      |    32 +
 .../data/xsd/tripinfo_file.xsd                     |   125 +
 .../cross3l_no_turnarounds/data/xsd/turns_file.xsd |    46 +
 .../cross3l_no_turnarounds/data/xsd/types_file.xsd |    26 +
 .../data/xsd/vtypeprobe_file.xsd                   |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross3l_prohibitions/data/3D/tl.obj.mtl        |    34 +
 .../cross3l_prohibitions/data/3D/tlg.obj           |  5075 +++++
 .../cross3l_prohibitions/data/3D/tlr.obj           |  5075 +++++
 .../cross3l_prohibitions/data/3D/tlu.obj           |  5075 +++++
 .../cross3l_prohibitions/data/3D/tly.obj           |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../data/xsd/additional_file.xsd                   |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../data/xsd/amitran/network.xsd                   |    55 +
 .../cross3l_prohibitions/data/xsd/amitran/od.xsd   |    44 +
 .../data/xsd/amitran/routes.xsd                    |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross3l_prohibitions/data/xsd/baseTypes.xsd    |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../cross3l_prohibitions/data/xsd/det_e1_file.xsd  |    40 +
 .../cross3l_prohibitions/data/xsd/det_e2_file.xsd  |    37 +
 .../cross3l_prohibitions/data/xsd/det_e3_file.xsd  |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../data/xsd/edgediff_file.xsd                     |   100 +
 .../cross3l_prohibitions/data/xsd/edges_file.xsd   |   102 +
 .../data/xsd/emission_file.xsd                     |    47 +
 .../cross3l_prohibitions/data/xsd/fcd_file.xsd     |    38 +
 .../cross3l_prohibitions/data/xsd/full_file.xsd    |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../data/xsd/meandataTypes.xsd                     |    69 +
 .../data/xsd/meandata_file.xsd                     |    13 +
 .../cross3l_prohibitions/data/xsd/net_file.xsd     |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../data/xsd/netstate_file.xsd                     |    74 +
 .../cross3l_prohibitions/data/xsd/nodes_file.xsd   |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../cross3l_prohibitions/data/xsd/queue_file.xsd   |    35 +
 .../cross3l_prohibitions/data/xsd/routeTypes.xsd   |   593 +
 .../cross3l_prohibitions/data/xsd/routes_file.xsd  |    28 +
 .../cross3l_prohibitions/data/xsd/summary_file.xsd |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross3l_prohibitions/data/xsd/taz_file.xsd     |    29 +
 .../cross3l_prohibitions/data/xsd/tllogic_file.xsd |    32 +
 .../data/xsd/tripinfo_file.xsd                     |   125 +
 .../cross3l_prohibitions/data/xsd/turns_file.xsd   |    46 +
 .../cross3l_prohibitions/data/xsd/types_file.xsd   |    26 +
 .../data/xsd/vtypeprobe_file.xsd                   |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross3l_unconstrained/data/3D/tl.obj.mtl       |    34 +
 .../cross3l_unconstrained/data/3D/tlg.obj          |  5075 +++++
 .../cross3l_unconstrained/data/3D/tlr.obj          |  5075 +++++
 .../cross3l_unconstrained/data/3D/tlu.obj          |  5075 +++++
 .../cross3l_unconstrained/data/3D/tly.obj          |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../data/xsd/additional_file.xsd                   |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../data/xsd/amitran/network.xsd                   |    55 +
 .../cross3l_unconstrained/data/xsd/amitran/od.xsd  |    44 +
 .../data/xsd/amitran/routes.xsd                    |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross3l_unconstrained/data/xsd/baseTypes.xsd   |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../cross3l_unconstrained/data/xsd/det_e1_file.xsd |    40 +
 .../cross3l_unconstrained/data/xsd/det_e2_file.xsd |    37 +
 .../cross3l_unconstrained/data/xsd/det_e3_file.xsd |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../data/xsd/edgediff_file.xsd                     |   100 +
 .../cross3l_unconstrained/data/xsd/edges_file.xsd  |   102 +
 .../data/xsd/emission_file.xsd                     |    47 +
 .../cross3l_unconstrained/data/xsd/fcd_file.xsd    |    38 +
 .../cross3l_unconstrained/data/xsd/full_file.xsd   |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../data/xsd/meandataTypes.xsd                     |    69 +
 .../data/xsd/meandata_file.xsd                     |    13 +
 .../cross3l_unconstrained/data/xsd/net_file.xsd    |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../data/xsd/netstate_file.xsd                     |    74 +
 .../cross3l_unconstrained/data/xsd/nodes_file.xsd  |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../cross3l_unconstrained/data/xsd/queue_file.xsd  |    35 +
 .../cross3l_unconstrained/data/xsd/routeTypes.xsd  |   593 +
 .../cross3l_unconstrained/data/xsd/routes_file.xsd |    28 +
 .../data/xsd/summary_file.xsd                      |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross3l_unconstrained/data/xsd/taz_file.xsd    |    29 +
 .../data/xsd/tllogic_file.xsd                      |    32 +
 .../data/xsd/tripinfo_file.xsd                     |   125 +
 .../cross3l_unconstrained/data/xsd/turns_file.xsd  |    46 +
 .../cross3l_unconstrained/data/xsd/types_file.xsd  |    26 +
 .../data/xsd/vtypeprobe_file.xsd                   |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../dlr-testtrack/data/3D/car-minibus-citrus.mtl   |    65 +
 .../dlr-testtrack/data/3D/car-minibus-citrus.obj   |  2614 +++
 .../dlr-testtrack/data/3D/car-normal-citrus.mtl    |    65 +
 .../dlr-testtrack/data/3D/car-normal-citrus.obj    |  2448 +++
 .../netconvert/dlr-testtrack/data/3D/tl.obj.mtl    |    34 +
 .../netconvert/dlr-testtrack/data/3D/tlg.obj       |  5075 +++++
 .../netconvert/dlr-testtrack/data/3D/tlr.obj       |  5075 +++++
 .../netconvert/dlr-testtrack/data/3D/tlu.obj       |  5075 +++++
 .../netconvert/dlr-testtrack/data/3D/tly.obj       |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../dlr-testtrack/data/xsd/additional_file.xsd     |   354 +
 .../dlr-testtrack/data/xsd/amitran/linkdata.xsd    |    35 +
 .../dlr-testtrack/data/xsd/amitran/network.xsd     |    55 +
 .../dlr-testtrack/data/xsd/amitran/od.xsd          |    44 +
 .../dlr-testtrack/data/xsd/amitran/routes.xsd      |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../dlr-testtrack/data/xsd/baseTypes.xsd           |   256 +
 .../dlr-testtrack/data/xsd/connections_file.xsd    |    74 +
 .../dlr-testtrack/data/xsd/det_e1_file.xsd         |    40 +
 .../dlr-testtrack/data/xsd/det_e2_file.xsd         |    37 +
 .../dlr-testtrack/data/xsd/det_e3_file.xsd         |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../dlr-testtrack/data/xsd/edgediff_file.xsd       |   100 +
 .../dlr-testtrack/data/xsd/edges_file.xsd          |   102 +
 .../dlr-testtrack/data/xsd/emission_file.xsd       |    47 +
 .../netconvert/dlr-testtrack/data/xsd/fcd_file.xsd |    38 +
 .../dlr-testtrack/data/xsd/full_file.xsd           |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../dlr-testtrack/data/xsd/meandataTypes.xsd       |    69 +
 .../dlr-testtrack/data/xsd/meandata_file.xsd       |    13 +
 .../netconvert/dlr-testtrack/data/xsd/net_file.xsd |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../dlr-testtrack/data/xsd/netstate_file.xsd       |    74 +
 .../dlr-testtrack/data/xsd/nodes_file.xsd          |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../dlr-testtrack/data/xsd/queue_file.xsd          |    35 +
 .../dlr-testtrack/data/xsd/routeTypes.xsd          |   593 +
 .../dlr-testtrack/data/xsd/routes_file.xsd         |    28 +
 .../dlr-testtrack/data/xsd/summary_file.xsd        |    25 +
 .../dlr-testtrack/data/xsd/sumoConfiguration.xsd   |   239 +
 .../netconvert/dlr-testtrack/data/xsd/taz_file.xsd |    29 +
 .../dlr-testtrack/data/xsd/tllogic_file.xsd        |    32 +
 .../dlr-testtrack/data/xsd/tripinfo_file.xsd       |   125 +
 .../dlr-testtrack/data/xsd/turns_file.xsd          |    46 +
 .../dlr-testtrack/data/xsd/types_file.xsd          |    26 +
 .../dlr-testtrack/data/xsd/vtypeprobe_file.xsd     |    20 +
 .../dlr-testtrack/input_connections.con.xml        |     4 +-
 .../hokkaido/data/3D/car-microcargo-citrus.mtl     |    65 +
 .../hokkaido/data/3D/car-microcargo-citrus.obj     |  2422 +++
 .../hokkaido/data/3D/car-minibus-citrus.mtl        |    65 +
 .../hokkaido/data/3D/car-minibus-citrus.obj        |  2614 +++
 .../hokkaido/data/3D/car-normal-citrus.mtl         |    65 +
 .../hokkaido/data/3D/car-normal-citrus.obj         |  2448 +++
 .../netconvert/hokkaido/data/3D/tl.obj.mtl         |    34 +
 docs/examples/netconvert/hokkaido/data/3D/tlg.obj  |  5075 +++++
 docs/examples/netconvert/hokkaido/data/3D/tlr.obj  |  5075 +++++
 docs/examples/netconvert/hokkaido/data/3D/tlu.obj  |  5075 +++++
 docs/examples/netconvert/hokkaido/data/3D/tly.obj  |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../hokkaido/data/emissions/PHEMlight/PC_D_EU4.csv |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../hokkaido/data/emissions/PHEMlight/PC_G_EU4.csv |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../hokkaido/data/typemap/osmNetconvert.typ.xml    |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../hokkaido/data/typemap/osmPolyconvert.typ.xml   |    40 +
 .../hokkaido/data/typemap/visumPolyconvert.typ.xml |     8 +
 .../hokkaido/data/xsd/activitygenConfiguration.xsd |    69 +
 .../hokkaido/data/xsd/additional_file.xsd          |   354 +
 .../hokkaido/data/xsd/amitran/linkdata.xsd         |    35 +
 .../hokkaido/data/xsd/amitran/network.xsd          |    55 +
 .../netconvert/hokkaido/data/xsd/amitran/od.xsd    |    44 +
 .../hokkaido/data/xsd/amitran/routes.xsd           |    23 +
 .../hokkaido/data/xsd/amitran/trajectories.xsd     |   107 +
 .../netconvert/hokkaido/data/xsd/baseTypes.xsd     |   256 +
 .../hokkaido/data/xsd/connections_file.xsd         |    74 +
 .../netconvert/hokkaido/data/xsd/det_e1_file.xsd   |    40 +
 .../netconvert/hokkaido/data/xsd/det_e2_file.xsd   |    37 +
 .../netconvert/hokkaido/data/xsd/det_e3_file.xsd   |    29 +
 .../hokkaido/data/xsd/dfrouterConfiguration.xsd    |   117 +
 .../hokkaido/data/xsd/duarouterConfiguration.xsd   |   117 +
 .../netconvert/hokkaido/data/xsd/edgediff_file.xsd |   100 +
 .../netconvert/hokkaido/data/xsd/edges_file.xsd    |   102 +
 .../netconvert/hokkaido/data/xsd/emission_file.xsd |    47 +
 .../netconvert/hokkaido/data/xsd/fcd_file.xsd      |    38 +
 .../netconvert/hokkaido/data/xsd/full_file.xsd     |   100 +
 .../hokkaido/data/xsd/jtrrouterConfiguration.xsd   |   106 +
 .../hokkaido/data/xsd/marouterConfiguration.xsd    |   124 +
 .../netconvert/hokkaido/data/xsd/meandataTypes.xsd |    69 +
 .../netconvert/hokkaido/data/xsd/meandata_file.xsd |    13 +
 .../netconvert/hokkaido/data/xsd/net_file.xsd      |   210 +
 .../hokkaido/data/xsd/netconvertConfiguration.xsd  |   255 +
 .../hokkaido/data/xsd/netgenerateConfiguration.xsd |   193 +
 .../netconvert/hokkaido/data/xsd/netstate_file.xsd |    74 +
 .../netconvert/hokkaido/data/xsd/nodes_file.xsd    |    58 +
 .../hokkaido/data/xsd/od2tripsConfiguration.xsd    |    91 +
 .../hokkaido/data/xsd/polyconvertConfiguration.xsd |   106 +
 .../netconvert/hokkaido/data/xsd/queue_file.xsd    |    35 +
 .../netconvert/hokkaido/data/xsd/routeTypes.xsd    |   593 +
 .../netconvert/hokkaido/data/xsd/routes_file.xsd   |    28 +
 .../netconvert/hokkaido/data/xsd/summary_file.xsd  |    25 +
 .../hokkaido/data/xsd/sumoConfiguration.xsd        |   239 +
 .../netconvert/hokkaido/data/xsd/taz_file.xsd      |    29 +
 .../netconvert/hokkaido/data/xsd/tllogic_file.xsd  |    32 +
 .../netconvert/hokkaido/data/xsd/tripinfo_file.xsd |   125 +
 .../netconvert/hokkaido/data/xsd/turns_file.xsd    |    46 +
 .../netconvert/hokkaido/data/xsd/types_file.xsd    |    26 +
 .../hokkaido/data/xsd/vtypeprobe_file.xsd          |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross_notypes_kmh/data/3D/tl.obj.mtl           |    34 +
 .../speed_in_kmh/cross_notypes_kmh/data/3D/tlg.obj |  5075 +++++
 .../speed_in_kmh/cross_notypes_kmh/data/3D/tlr.obj |  5075 +++++
 .../speed_in_kmh/cross_notypes_kmh/data/3D/tlu.obj |  5075 +++++
 .../speed_in_kmh/cross_notypes_kmh/data/3D/tly.obj |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../cross_notypes_kmh/data/xsd/additional_file.xsd |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../cross_notypes_kmh/data/xsd/amitran/network.xsd |    55 +
 .../cross_notypes_kmh/data/xsd/amitran/od.xsd      |    44 +
 .../cross_notypes_kmh/data/xsd/amitran/routes.xsd  |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross_notypes_kmh/data/xsd/baseTypes.xsd       |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../cross_notypes_kmh/data/xsd/det_e1_file.xsd     |    40 +
 .../cross_notypes_kmh/data/xsd/det_e2_file.xsd     |    37 +
 .../cross_notypes_kmh/data/xsd/det_e3_file.xsd     |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../cross_notypes_kmh/data/xsd/edgediff_file.xsd   |   100 +
 .../cross_notypes_kmh/data/xsd/edges_file.xsd      |   102 +
 .../cross_notypes_kmh/data/xsd/emission_file.xsd   |    47 +
 .../cross_notypes_kmh/data/xsd/fcd_file.xsd        |    38 +
 .../cross_notypes_kmh/data/xsd/full_file.xsd       |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../cross_notypes_kmh/data/xsd/meandataTypes.xsd   |    69 +
 .../cross_notypes_kmh/data/xsd/meandata_file.xsd   |    13 +
 .../cross_notypes_kmh/data/xsd/net_file.xsd        |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../cross_notypes_kmh/data/xsd/netstate_file.xsd   |    74 +
 .../cross_notypes_kmh/data/xsd/nodes_file.xsd      |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../cross_notypes_kmh/data/xsd/queue_file.xsd      |    35 +
 .../cross_notypes_kmh/data/xsd/routeTypes.xsd      |   593 +
 .../cross_notypes_kmh/data/xsd/routes_file.xsd     |    28 +
 .../cross_notypes_kmh/data/xsd/summary_file.xsd    |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross_notypes_kmh/data/xsd/taz_file.xsd        |    29 +
 .../cross_notypes_kmh/data/xsd/tllogic_file.xsd    |    32 +
 .../cross_notypes_kmh/data/xsd/tripinfo_file.xsd   |   125 +
 .../cross_notypes_kmh/data/xsd/turns_file.xsd      |    46 +
 .../cross_notypes_kmh/data/xsd/types_file.xsd      |    26 +
 .../cross_notypes_kmh/data/xsd/vtypeprobe_file.xsd |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../data/3D/car-normal-citrus.mtl                  |    65 +
 .../data/3D/car-normal-citrus.obj                  |  2448 +++
 .../cross_usingtypes_kmh/data/3D/tl.obj.mtl        |    34 +
 .../cross_usingtypes_kmh/data/3D/tlg.obj           |  5075 +++++
 .../cross_usingtypes_kmh/data/3D/tlr.obj           |  5075 +++++
 .../cross_usingtypes_kmh/data/3D/tlu.obj           |  5075 +++++
 .../cross_usingtypes_kmh/data/3D/tly.obj           |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../data/xsd/additional_file.xsd                   |   354 +
 .../data/xsd/amitran/linkdata.xsd                  |    35 +
 .../data/xsd/amitran/network.xsd                   |    55 +
 .../cross_usingtypes_kmh/data/xsd/amitran/od.xsd   |    44 +
 .../data/xsd/amitran/routes.xsd                    |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../cross_usingtypes_kmh/data/xsd/baseTypes.xsd    |   256 +
 .../data/xsd/connections_file.xsd                  |    74 +
 .../cross_usingtypes_kmh/data/xsd/det_e1_file.xsd  |    40 +
 .../cross_usingtypes_kmh/data/xsd/det_e2_file.xsd  |    37 +
 .../cross_usingtypes_kmh/data/xsd/det_e3_file.xsd  |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../data/xsd/edgediff_file.xsd                     |   100 +
 .../cross_usingtypes_kmh/data/xsd/edges_file.xsd   |   102 +
 .../data/xsd/emission_file.xsd                     |    47 +
 .../cross_usingtypes_kmh/data/xsd/fcd_file.xsd     |    38 +
 .../cross_usingtypes_kmh/data/xsd/full_file.xsd    |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../data/xsd/meandataTypes.xsd                     |    69 +
 .../data/xsd/meandata_file.xsd                     |    13 +
 .../cross_usingtypes_kmh/data/xsd/net_file.xsd     |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../data/xsd/netstate_file.xsd                     |    74 +
 .../cross_usingtypes_kmh/data/xsd/nodes_file.xsd   |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../cross_usingtypes_kmh/data/xsd/queue_file.xsd   |    35 +
 .../cross_usingtypes_kmh/data/xsd/routeTypes.xsd   |   593 +
 .../cross_usingtypes_kmh/data/xsd/routes_file.xsd  |    28 +
 .../cross_usingtypes_kmh/data/xsd/summary_file.xsd |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../cross_usingtypes_kmh/data/xsd/taz_file.xsd     |    29 +
 .../cross_usingtypes_kmh/data/xsd/tllogic_file.xsd |    32 +
 .../data/xsd/tripinfo_file.xsd                     |   125 +
 .../cross_usingtypes_kmh/data/xsd/turns_file.xsd   |    46 +
 .../cross_usingtypes_kmh/data/xsd/types_file.xsd   |    26 +
 .../data/xsd/vtypeprobe_file.xsd                   |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../cross_notypes/data/3D/car-minibus-citrus.mtl   |    65 +
 .../cross_notypes/data/3D/car-minibus-citrus.obj   |  2614 +++
 .../cross_notypes/data/3D/car-normal-citrus.mtl    |    65 +
 .../cross_notypes/data/3D/car-normal-citrus.obj    |  2448 +++
 .../types/cross_notypes/data/3D/tl.obj.mtl         |    34 +
 .../netconvert/types/cross_notypes/data/3D/tlg.obj |  5075 +++++
 .../netconvert/types/cross_notypes/data/3D/tlr.obj |  5075 +++++
 .../netconvert/types/cross_notypes/data/3D/tlu.obj |  5075 +++++
 .../netconvert/types/cross_notypes/data/3D/tly.obj |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../cross_notypes/data/xsd/additional_file.xsd     |   354 +
 .../cross_notypes/data/xsd/amitran/linkdata.xsd    |    35 +
 .../cross_notypes/data/xsd/amitran/network.xsd     |    55 +
 .../types/cross_notypes/data/xsd/amitran/od.xsd    |    44 +
 .../cross_notypes/data/xsd/amitran/routes.xsd      |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../types/cross_notypes/data/xsd/baseTypes.xsd     |   256 +
 .../cross_notypes/data/xsd/connections_file.xsd    |    74 +
 .../types/cross_notypes/data/xsd/det_e1_file.xsd   |    40 +
 .../types/cross_notypes/data/xsd/det_e2_file.xsd   |    37 +
 .../types/cross_notypes/data/xsd/det_e3_file.xsd   |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../types/cross_notypes/data/xsd/edgediff_file.xsd |   100 +
 .../types/cross_notypes/data/xsd/edges_file.xsd    |   102 +
 .../types/cross_notypes/data/xsd/emission_file.xsd |    47 +
 .../types/cross_notypes/data/xsd/fcd_file.xsd      |    38 +
 .../types/cross_notypes/data/xsd/full_file.xsd     |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../types/cross_notypes/data/xsd/meandataTypes.xsd |    69 +
 .../types/cross_notypes/data/xsd/meandata_file.xsd |    13 +
 .../types/cross_notypes/data/xsd/net_file.xsd      |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../types/cross_notypes/data/xsd/netstate_file.xsd |    74 +
 .../types/cross_notypes/data/xsd/nodes_file.xsd    |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../types/cross_notypes/data/xsd/queue_file.xsd    |    35 +
 .../types/cross_notypes/data/xsd/routeTypes.xsd    |   593 +
 .../types/cross_notypes/data/xsd/routes_file.xsd   |    28 +
 .../types/cross_notypes/data/xsd/summary_file.xsd  |    25 +
 .../cross_notypes/data/xsd/sumoConfiguration.xsd   |   239 +
 .../types/cross_notypes/data/xsd/taz_file.xsd      |    29 +
 .../types/cross_notypes/data/xsd/tllogic_file.xsd  |    32 +
 .../types/cross_notypes/data/xsd/tripinfo_file.xsd |   125 +
 .../types/cross_notypes/data/xsd/turns_file.xsd    |    46 +
 .../types/cross_notypes/data/xsd/types_file.xsd    |    26 +
 .../cross_notypes/data/xsd/vtypeprobe_file.xsd     |    20 +
 .../data/3D/car-microcargo-citrus.mtl              |    65 +
 .../data/3D/car-microcargo-citrus.obj              |  2422 +++
 .../data/3D/car-minibus-citrus.mtl                 |    65 +
 .../data/3D/car-minibus-citrus.obj                 |  2614 +++
 .../cross_usingtypes/data/3D/car-normal-citrus.mtl |    65 +
 .../cross_usingtypes/data/3D/car-normal-citrus.obj |  2448 +++
 .../types/cross_usingtypes/data/3D/tl.obj.mtl      |    34 +
 .../types/cross_usingtypes/data/3D/tlg.obj         |  5075 +++++
 .../types/cross_usingtypes/data/3D/tlr.obj         |  5075 +++++
 .../types/cross_usingtypes/data/3D/tlu.obj         |  5075 +++++
 .../types/cross_usingtypes/data/3D/tly.obj         |  5075 +++++
 .../emissions/PHEMlight/PC_D_EU4.PHEMLight.veh     |   134 +
 .../data/emissions/PHEMlight/PC_D_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_D_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PC_G_EU4.PHEMLight.veh     |   133 +
 .../data/emissions/PHEMlight/PC_G_EU4.csv          |    35 +
 .../data/emissions/PHEMlight/PC_G_EU4_FC.csv       |    17 +
 .../emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh    |   134 +
 .../data/emissions/PHEMlight/PKW_D_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_D_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_D_EU4_FC.csv      |    17 +
 .../emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh    |   133 +
 .../data/emissions/PHEMlight/PKW_G_EU4.csv         |    35 +
 .../data/emissions/PHEMlight/PKW_G_EU4.dec.csv     |    31 +
 .../data/emissions/PHEMlight/PKW_G_EU4_FC.csv      |    17 +
 .../data/typemap/navteqPolyconvert.typ.xml         |     9 +
 .../data/typemap/opendriveNetconvert.typ.xml       |    35 +
 .../typemap/opendriveNetconvertBicycle.typ.xml     |     3 +
 .../typemap/opendriveNetconvertPedestrians.typ.xml |     3 +
 .../data/typemap/osmBidiRailNetconvert.typ.xml     |     7 +
 .../data/typemap/osmNetconvert.typ.xml             |    40 +
 .../data/typemap/osmNetconvertBicycle.typ.xml      |     6 +
 .../data/typemap/osmNetconvertPedestrians.typ.xml  |    10 +
 .../data/typemap/osmNetconvertShips.typ.xml        |     5 +
 .../data/typemap/osmNetconvertUrbanDe.typ.xml      |    12 +
 .../data/typemap/osmPolyconvert.typ.xml            |    40 +
 .../data/typemap/visumPolyconvert.typ.xml          |     8 +
 .../data/xsd/activitygenConfiguration.xsd          |    69 +
 .../cross_usingtypes/data/xsd/additional_file.xsd  |   354 +
 .../cross_usingtypes/data/xsd/amitran/linkdata.xsd |    35 +
 .../cross_usingtypes/data/xsd/amitran/network.xsd  |    55 +
 .../types/cross_usingtypes/data/xsd/amitran/od.xsd |    44 +
 .../cross_usingtypes/data/xsd/amitran/routes.xsd   |    23 +
 .../data/xsd/amitran/trajectories.xsd              |   107 +
 .../types/cross_usingtypes/data/xsd/baseTypes.xsd  |   256 +
 .../cross_usingtypes/data/xsd/connections_file.xsd |    74 +
 .../cross_usingtypes/data/xsd/det_e1_file.xsd      |    40 +
 .../cross_usingtypes/data/xsd/det_e2_file.xsd      |    37 +
 .../cross_usingtypes/data/xsd/det_e3_file.xsd      |    29 +
 .../data/xsd/dfrouterConfiguration.xsd             |   117 +
 .../data/xsd/duarouterConfiguration.xsd            |   117 +
 .../cross_usingtypes/data/xsd/edgediff_file.xsd    |   100 +
 .../types/cross_usingtypes/data/xsd/edges_file.xsd |   102 +
 .../cross_usingtypes/data/xsd/emission_file.xsd    |    47 +
 .../types/cross_usingtypes/data/xsd/fcd_file.xsd   |    38 +
 .../types/cross_usingtypes/data/xsd/full_file.xsd  |   100 +
 .../data/xsd/jtrrouterConfiguration.xsd            |   106 +
 .../data/xsd/marouterConfiguration.xsd             |   124 +
 .../cross_usingtypes/data/xsd/meandataTypes.xsd    |    69 +
 .../cross_usingtypes/data/xsd/meandata_file.xsd    |    13 +
 .../types/cross_usingtypes/data/xsd/net_file.xsd   |   210 +
 .../data/xsd/netconvertConfiguration.xsd           |   255 +
 .../data/xsd/netgenerateConfiguration.xsd          |   193 +
 .../cross_usingtypes/data/xsd/netstate_file.xsd    |    74 +
 .../types/cross_usingtypes/data/xsd/nodes_file.xsd |    58 +
 .../data/xsd/od2tripsConfiguration.xsd             |    91 +
 .../data/xsd/polyconvertConfiguration.xsd          |   106 +
 .../types/cross_usingtypes/data/xsd/queue_file.xsd |    35 +
 .../types/cross_usingtypes/data/xsd/routeTypes.xsd |   593 +
 .../cross_usingtypes/data/xsd/routes_file.xsd      |    28 +
 .../cross_usingtypes/data/xsd/summary_file.xsd     |    25 +
 .../data/xsd/sumoConfiguration.xsd                 |   239 +
 .../types/cross_usingtypes/data/xsd/taz_file.xsd   |    29 +
 .../cross_usingtypes/data/xsd/tllogic_file.xsd     |    32 +
 .../cross_usingtypes/data/xsd/tripinfo_file.xsd    |   125 +
 .../types/cross_usingtypes/data/xsd/turns_file.xsd |    46 +
 .../types/cross_usingtypes/data/xsd/types_file.xsd |    26 +
 .../cross_usingtypes/data/xsd/vtypeprobe_file.xsd  |    20 +
 .../sumo/sublane_model/input_routes.rou.xml        |     9 +
 docs/examples/sumo/sublane_model/net.net.xml       |    54 +
 .../sumo/sublane_model/sublane_model.sumocfg       |    23 +
 .../sumo/visualization/parade/input_routes.rou.xml |    83 +
 .../examples/sumo/visualization/parade/net.net.xml |   208 +
 .../sumo/visualization/parade/parade.sumocfg       |     1 +
 docs/tutorial/osm_activitygen/eichstaett.osm       |  8120 +++++++
 docs/tutorial/traci_pedestrian_crossing/runner.py  |    13 +-
 docs/tutorial/traci_tls/runner.py                  |    10 +-
 src/activitygen/AGFrame.cpp                        |     8 +-
 src/activitygen/activities/AGWorkAndSchool.cpp     |     6 +-
 src/activitygen/activitygen_main.cpp               |    17 +-
 src/activitygen/city/AGAdult.cpp                   |    32 +-
 src/activitygen/city/AGCity.cpp                    |    12 +-
 src/activitygen/city/AGHousehold.cpp               |    10 +-
 src/activitygen/city/AGHousehold.h                 |     6 +-
 src/activitygen/city/AGStreet.cpp                  |     4 +-
 src/activitygen/city/AGStreet.h                    |     4 +-
 src/config.h                                       |     6 +-
 src/dfrouter/RODFDetector.cpp                      |    94 +-
 src/dfrouter/RODFDetector.h                        |    10 +-
 src/dfrouter/RODFDetectorFlow.cpp                  |     6 +-
 src/dfrouter/RODFDetectorHandler.cpp               |     4 +-
 src/dfrouter/RODFEdge.cpp                          |     4 +-
 src/dfrouter/RODFEdge.h                            |     4 +-
 src/dfrouter/RODFFrame.cpp                         |     7 +-
 src/dfrouter/RODFNet.cpp                           |    88 +-
 src/dfrouter/RODFNet.h                             |    25 +-
 src/duarouter/duarouter_main.cpp                   |     6 +-
 src/foreign/PHEMlight/cpp/CEP.cpp                  |     3 +-
 src/foreign/PHEMlight/cpp/CEPHandler.cpp           |     2 +-
 src/foreign/tcpip/socket.cpp                       |    60 +-
 src/foreign/tcpip/socket.h                         |     4 +-
 src/gui/GUIApplicationWindow.cpp                   |   156 +-
 src/gui/GUIApplicationWindow.h                     |    16 +-
 src/gui/GUIGlobals.cpp                             |     8 +-
 src/gui/GUIGlobals.h                               |     5 +-
 src/gui/GUILoadThread.cpp                          |    16 +-
 src/gui/GUIRunThread.h                             |     6 +-
 src/gui/GUISUMOViewParent.cpp                      |     6 +-
 src/gui/GUITLLogicPhasesTrackerWindow.cpp          |    30 +-
 src/gui/GUITLLogicPhasesTrackerWindow.h            |     6 +-
 src/gui/GUIViewTraffic.cpp                         |    22 +-
 src/gui/GUIViewTraffic.h                           |     6 +-
 src/gui/TraCIServerAPI_GUI.cpp                     |    12 +-
 src/gui/dialogs/GUIDialog_AppSettings.cpp          |    61 +-
 src/gui/dialogs/GUIDialog_AppSettings.h            |    18 +-
 src/gui/dialogs/GUIDialog_Breakpoints.cpp          |   127 +-
 src/gui/dialogs/GUIDialog_Breakpoints.h            |    17 +-
 src/guinetload/GUIDetectorBuilder.cpp              |    26 +-
 src/guinetload/GUIDetectorBuilder.h                |    12 +-
 src/guinetload/GUIEdgeControlBuilder.h             |     3 +-
 src/guinetload/GUITriggerBuilder.cpp               |    16 +-
 src/guinetload/GUITriggerBuilder.h                 |    18 +-
 src/guisim/GUIBaseVehicle.cpp                      |    37 +-
 src/guisim/GUIBaseVehicle.h                        |    38 +-
 src/guisim/GUIBusStop.cpp                          |     7 +-
 src/guisim/GUICalibrator.cpp                       |     4 +-
 src/guisim/GUIChargingStation.cpp                  |   110 +-
 src/guisim/GUIChargingStation.h                    |    43 +-
 src/guisim/GUIContainer.cpp                        |     6 +-
 src/guisim/GUIContainer.h                          |     6 +-
 src/guisim/GUIContainerControl.cpp                 |    59 -
 src/guisim/GUIContainerControl.h                   |    66 -
 src/guisim/GUIContainerStop.cpp                    |     8 +-
 src/guisim/GUIE3Collector.cpp                      |     6 +-
 src/guisim/GUIE3Collector.h                        |     4 +-
 src/guisim/GUIEdge.cpp                             |   121 +-
 src/guisim/GUIEdge.h                               |    26 +-
 src/guisim/GUIInductLoop.cpp                       |    12 +-
 src/guisim/GUIInductLoop.h                         |     8 +-
 src/guisim/GUIInstantInductLoop.cpp                |     7 +-
 src/guisim/GUIInstantInductLoop.h                  |     4 +-
 src/guisim/GUIJunctionWrapper.cpp                  |    16 +-
 src/guisim/GUILane.cpp                             |   164 +-
 src/guisim/GUILane.h                               |    38 +-
 src/guisim/GUILaneSpeedTrigger.cpp                 |     6 +-
 src/guisim/GUINet.cpp                              |    66 +-
 src/guisim/GUINet.h                                |    16 +-
 src/guisim/GUIPerson.cpp                           |    11 +-
 src/guisim/GUIPerson.h                             |     6 +-
 src/guisim/GUIPersonControl.cpp                    |    69 -
 src/guisim/GUIPersonControl.h                      |    72 -
 src/guisim/GUITrafficLightLogicWrapper.cpp         |    10 +-
 src/guisim/GUITransportableControl.cpp             |    78 +
 src/guisim/GUITransportableControl.h               |    79 +
 src/guisim/GUITriggeredRerouter.cpp                |     8 +-
 src/guisim/GUIVehicle.cpp                          |   104 +-
 src/guisim/GUIVehicle.h                            |    13 +-
 src/guisim/GUI_E2_ZS_Collector.cpp                 |    23 +-
 src/guisim/GUI_E2_ZS_Collector.h                   |    44 +-
 src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp        |    13 +-
 src/guisim/GUI_E2_ZS_CollectorOverLanes.h          |     9 +-
 src/guisim/Makefile.am                             |     6 +-
 src/guisim/Makefile.in                             |    25 +-
 src/guisim_main.cpp                                |    15 +-
 src/jtrrouter/ROJTREdge.cpp                        |    15 +-
 src/jtrrouter/ROJTREdge.h                          |     4 +-
 src/jtrrouter/ROJTRRouter.cpp                      |     5 +-
 src/jtrrouter/ROJTRRouter.h                        |     6 +-
 src/jtrrouter/ROJTRTurnDefLoader.cpp               |     4 +-
 src/jtrrouter/jtrrouter_main.cpp                   |     4 +-
 src/marouter/ROMAAssignments.cpp                   |     7 +-
 src/marouter/ROMAEdge.cpp                          |     4 +-
 src/marouter/ROMAEdge.h                            |     4 +-
 src/marouter/ROMAFrame.cpp                         |     8 +-
 src/marouter/ROMARouteHandler.cpp                  |    27 +-
 src/marouter/ROMARouteHandler.h                    |   100 +
 src/marouter/marouter_main.cpp                     |    75 +-
 src/mesogui/GUIMEInductLoop.cpp                    |     6 +-
 src/mesogui/GUIMEInductLoop.h                      |     4 +-
 src/mesogui/GUIMEVehicle.cpp                       |    35 +-
 src/mesogui/GUIMEVehicle.h                         |    48 +-
 src/mesosim/MEInductLoop.cpp                       |     9 +-
 src/mesosim/MEInductLoop.h                         |     5 +-
 src/mesosim/MELoop.cpp                             |    23 +-
 src/mesosim/MELoop.h                               |     5 +-
 src/mesosim/MESegment.cpp                          |   107 +-
 src/mesosim/MESegment.h                            |    52 +-
 src/mesosim/METriggeredCalibrator.cpp              |     4 +-
 src/mesosim/MEVehicle.cpp                          |    25 +-
 src/mesosim/MEVehicle.h                            |    17 +-
 src/microsim/MSBaseVehicle.cpp                     |    76 +-
 src/microsim/MSBaseVehicle.h                       |    59 +-
 src/microsim/MSBitSetLogic.h                       |    12 +-
 src/microsim/MSContainer.cpp                       |   219 +-
 src/microsim/MSContainer.h                         |   211 +-
 src/microsim/MSContainerControl.cpp                |   239 -
 src/microsim/MSContainerControl.h                  |   138 -
 src/microsim/MSEdge.cpp                            |   165 +-
 src/microsim/MSEdge.h                              |    61 +-
 src/microsim/MSEdgeControl.cpp                     |    21 +-
 src/microsim/MSEdgeControl.h                       |     2 +-
 src/microsim/MSEventControl.cpp                    |     6 +-
 src/microsim/MSFrame.cpp                           |    82 +-
 src/microsim/MSGlobals.cpp                         |     5 +-
 src/microsim/MSGlobals.h                           |    12 +-
 src/microsim/MSInsertionControl.cpp                |   105 +-
 src/microsim/MSInsertionControl.h                  |    37 +-
 src/microsim/MSInternalJunction.cpp                |     4 +-
 src/microsim/MSJunctionLogic.cpp                   |     6 +-
 src/microsim/MSJunctionLogic.h                     |    16 +-
 src/microsim/MSLane.cpp                            |  1541 +-
 src/microsim/MSLane.h                              |   424 +-
 src/microsim/MSLaneChanger.cpp                     |   896 +-
 src/microsim/MSLaneChanger.h                       |    77 +-
 src/microsim/MSLaneChangerSublane.cpp              |   318 +
 src/microsim/MSLaneChangerSublane.h                |   102 +
 src/microsim/MSLeaderInfo.cpp                      |   368 +
 src/microsim/MSLeaderInfo.h                        |   220 +
 src/microsim/MSLink.cpp                            |   299 +-
 src/microsim/MSLink.h                              |    93 +-
 src/microsim/MSLogicJunction.cpp                   |     4 +-
 src/microsim/MSMoveReminder.cpp                    |     4 +-
 src/microsim/MSMoveReminder.h                      |    30 +-
 src/microsim/MSNet.cpp                             |    53 +-
 src/microsim/MSNet.h                               |    50 +-
 src/microsim/MSPersonControl.cpp                   |   260 -
 src/microsim/MSPersonControl.h                     |   225 -
 src/microsim/MSRightOfWayJunction.cpp              |    12 +-
 src/microsim/MSRoute.cpp                           |     8 +-
 src/microsim/MSRoute.h                             |     8 +-
 src/microsim/MSRouteHandler.cpp                    |    74 +-
 src/microsim/MSStateHandler.cpp                    |     7 +-
 src/microsim/MSStateHandler.h                      |     4 +-
 src/microsim/MSStoppingPlace.cpp                   |    15 +-
 src/microsim/MSStoppingPlace.h                     |    14 +-
 src/microsim/MSTransportable.cpp                   |   237 +-
 src/microsim/MSTransportable.h                     |   174 +-
 src/microsim/MSTransportableControl.cpp            |   276 +
 src/microsim/MSTransportableControl.h              |   232 +
 src/microsim/MSVehicle.cpp                         |  1469 +-
 src/microsim/MSVehicle.h                           |   305 +-
 src/microsim/MSVehicleContainer.cpp                |    39 +-
 src/microsim/MSVehicleContainer.h                  |     9 +-
 src/microsim/MSVehicleControl.cpp                  |    22 +-
 src/microsim/MSVehicleControl.h                    |    48 +-
 src/microsim/MSVehicleTransfer.cpp                 |    11 +-
 src/microsim/MSVehicleType.cpp                     |    62 +-
 src/microsim/MSVehicleType.h                       |    36 +-
 src/microsim/Makefile.am                           |     7 +-
 src/microsim/Makefile.in                           |    30 +-
 src/microsim/actions/Command_SaveTLSSwitches.cpp   |     4 +-
 src/microsim/cfmodels/MSCFModel.cpp                |   498 +-
 src/microsim/cfmodels/MSCFModel.h                  |   198 +-
 src/microsim/cfmodels/MSCFModel_Krauss.cpp         |    26 +-
 src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp    |    70 +-
 src/microsim/cfmodels/MSCFModel_SmartSK.cpp        |    14 +-
 src/microsim/cfmodels/MSCFModel_Wiedemann.cpp      |     5 +-
 src/microsim/cfmodels/MSCFModel_Wiedemann.h        |     5 +-
 src/microsim/devices/MSDevice.cpp                  |    10 +-
 src/microsim/devices/MSDevice.h                    |     7 +-
 src/microsim/devices/MSDevice_BTsender.h           |     6 +-
 src/microsim/devices/MSDevice_Battery.cpp          |   684 +-
 src/microsim/devices/MSDevice_Battery.h            |   309 +-
 src/microsim/devices/MSDevice_Routing.cpp          |    91 +-
 src/microsim/devices/MSDevice_Routing.h            |    24 +-
 src/microsim/devices/MSDevice_Transportable.cpp    |     5 +-
 src/microsim/devices/MSDevice_Transportable.h      |     6 +-
 src/microsim/devices/MSDevice_Tripinfo.cpp         |    42 +-
 src/microsim/devices/MSDevice_Tripinfo.h           |    26 +-
 src/microsim/devices/MSDevice_Vehroutes.cpp        |    31 +-
 src/microsim/devices/MSDevice_Vehroutes.h          |    10 +-
 .../lcmodels/MSAbstractLaneChangeModel.cpp         |   310 +-
 src/microsim/lcmodels/MSAbstractLaneChangeModel.h  |   258 +-
 src/microsim/lcmodels/MSLCM_DK2008.cpp             |    15 +-
 src/microsim/lcmodels/MSLCM_DK2008.h               |     4 +-
 src/microsim/lcmodels/MSLCM_JE2013.cpp             |  1262 --
 src/microsim/lcmodels/MSLCM_JE2013.h               |   197 -
 src/microsim/lcmodels/MSLCM_LC2013.cpp             |  1435 +-
 src/microsim/lcmodels/MSLCM_LC2013.h               |    74 +-
 src/microsim/lcmodels/MSLCM_SL2015.cpp             |  2145 ++
 src/microsim/lcmodels/MSLCM_SL2015.h               |   336 +
 src/microsim/lcmodels/Makefile.am                  |     2 +-
 src/microsim/lcmodels/Makefile.in                  |     6 +-
 src/microsim/logging/FuncBinding_IntParam.h        |     4 +-
 src/microsim/output/MSBatteryExport.cpp            |     8 +-
 src/microsim/output/MSDetectorFileOutput.h         |    42 +-
 src/microsim/output/MSE2Collector.cpp              |   366 +-
 src/microsim/output/MSE2Collector.h                |   166 +-
 src/microsim/output/MSE3Collector.cpp              |    79 +-
 src/microsim/output/MSE3Collector.h                |    39 +-
 src/microsim/output/MSFCDExport.cpp                |    11 +-
 src/microsim/output/MSFullExport.cpp               |     4 +-
 src/microsim/output/MSInductLoop.cpp               |   178 +-
 src/microsim/output/MSInductLoop.h                 |    21 +-
 src/microsim/output/MSInstantInductLoop.cpp        |    56 +-
 src/microsim/output/MSInstantInductLoop.h          |     5 +-
 src/microsim/output/MSMeanData.cpp                 |   104 +-
 src/microsim/output/MSMeanData.h                   |    66 +-
 src/microsim/output/MSMeanData_Amitran.cpp         |    25 +-
 src/microsim/output/MSMeanData_Amitran.h           |    23 +-
 src/microsim/output/MSMeanData_Emissions.cpp       |    25 +-
 src/microsim/output/MSMeanData_Emissions.h         |    22 +-
 src/microsim/output/MSMeanData_Harmonoise.cpp      |    23 +-
 src/microsim/output/MSMeanData_Harmonoise.h        |    38 +-
 src/microsim/output/MSMeanData_Net.cpp             |    42 +-
 src/microsim/output/MSMeanData_Net.h               |    38 +-
 src/microsim/output/MSRouteProbe.cpp               |     9 +-
 src/microsim/output/MSRouteProbe.h                 |     5 +-
 src/microsim/output/MSVTKExport.cpp                |     4 +-
 src/microsim/output/MSXMLRawOut.cpp                |    10 +-
 .../output/MS_E2_ZS_CollectorOverLanes.cpp         |    24 +-
 src/microsim/output/MS_E2_ZS_CollectorOverLanes.h  |    12 +-
 src/microsim/pedestrians/MSPModel_Striping.cpp     |    18 +-
 src/microsim/pedestrians/MSPerson.cpp              |   244 +-
 src/microsim/pedestrians/MSPerson.h                |   171 +-
 .../traffic_lights/MSActuatedTrafficLightLogic.cpp |    18 +-
 .../traffic_lights/MSActuatedTrafficLightLogic.h   |     6 +-
 .../MSDeterministicHiLevelTrafficLightLogic.cpp    |    10 +-
 .../MSDeterministicHiLevelTrafficLightLogic.h      |     4 +-
 .../traffic_lights/MSOffTrafficLightLogic.cpp      |    10 +-
 .../traffic_lights/MSOffTrafficLightLogic.h        |     8 +-
 .../traffic_lights/MSPhasedTrafficLightLogic.cpp   |    28 +-
 .../traffic_lights/MSPhasedTrafficLightLogic.h     |    10 +-
 src/microsim/traffic_lights/MSRailCrossing.cpp     |    10 +-
 src/microsim/traffic_lights/MSRailCrossing.h       |     8 +-
 src/microsim/traffic_lights/MSRailSignal.cpp       |    10 +-
 src/microsim/traffic_lights/MSRailSignal.h         |    10 +-
 src/microsim/traffic_lights/MSSOTLE2Sensors.cpp    |    50 +-
 src/microsim/traffic_lights/MSSOTLE2Sensors.h      |     4 +-
 .../MSSOTLHiLevelTrafficLightLogic.cpp             |     8 +-
 .../MSSOTLHiLevelTrafficLightLogic.h               |    12 +-
 .../MSSOTLPhaseTrafficLightLogic.cpp               |     6 +-
 .../traffic_lights/MSSOTLPhaseTrafficLightLogic.h  |     6 +-
 .../MSSOTLPlatoonTrafficLightLogic.cpp             |     6 +-
 .../MSSOTLPlatoonTrafficLightLogic.h               |     6 +-
 .../MSSOTLPolicy5DFamilyStimulus.cpp               |     6 +-
 .../MSSOTLPolicyBasedTrafficLightLogic.cpp         |     6 +-
 .../MSSOTLPolicyBasedTrafficLightLogic.h           |     6 +-
 .../MSSOTLRequestTrafficLightLogic.cpp             |     6 +-
 .../MSSOTLRequestTrafficLightLogic.h               |     6 +-
 src/microsim/traffic_lights/MSSOTLSensors.h        |     4 +-
 .../traffic_lights/MSSOTLTrafficLightLogic.cpp     |    24 +-
 .../traffic_lights/MSSOTLTrafficLightLogic.h       |    10 +-
 .../traffic_lights/MSSOTLWaveTrafficLightLogic.cpp |     6 +-
 .../traffic_lights/MSSOTLWaveTrafficLightLogic.h   |     6 +-
 .../traffic_lights/MSSimpleTrafficLightLogic.cpp   |    28 +-
 .../traffic_lights/MSSimpleTrafficLightLogic.h     |    12 +-
 .../traffic_lights/MSSwarmTrafficLightLogic.cpp    |    24 +-
 .../traffic_lights/MSSwarmTrafficLightLogic.h      |     6 +-
 src/microsim/traffic_lights/MSTLLogicControl.cpp   |    36 +-
 src/microsim/traffic_lights/MSTLLogicControl.h     |    14 +-
 .../traffic_lights/MSTrafficLightLogic.cpp         |    18 +-
 src/microsim/traffic_lights/MSTrafficLightLogic.h  |    14 +-
 src/microsim/trigger/MSCalibrator.cpp              |    18 +-
 src/microsim/trigger/MSCalibrator.h                |     8 +-
 src/microsim/trigger/MSChargingStation.cpp         |   125 +-
 src/microsim/trigger/MSChargingStation.h           |    81 +-
 src/microsim/trigger/MSContainerTerminal.cpp       |   111 -
 src/microsim/trigger/MSContainerTerminal.h         |   179 -
 src/microsim/trigger/MSTriggeredRerouter.cpp       |    91 +-
 src/microsim/trigger/MSTriggeredRerouter.h         |    12 +-
 src/microsim/trigger/Makefile.am                   |     1 -
 src/microsim/trigger/Makefile.in                   |     7 +-
 src/netbuild/Makefile.am                           |     4 +-
 src/netbuild/Makefile.in                           |     7 +-
 src/netbuild/NBAlgorithms.cpp                      |     6 +-
 src/netbuild/NBAlgorithms.h                        |     8 +-
 src/netbuild/NBAlgorithms_Ramps.cpp                |     6 +-
 src/netbuild/NBConnection.cpp                      |     6 +-
 src/netbuild/NBConnection.h                        |    66 +-
 src/netbuild/NBCont.h                              |     4 +-
 src/netbuild/NBContHelper.cpp                      |    71 +-
 src/netbuild/NBContHelper.h                        |    32 +-
 src/netbuild/NBDistrict.cpp                        |     8 +-
 src/netbuild/NBDistrictCont.cpp                    |     6 +-
 src/netbuild/NBDistrictCont.h                      |     4 +-
 src/netbuild/NBEdge.cpp                            |   723 +-
 src/netbuild/NBEdge.h                              |   591 +-
 src/netbuild/NBEdgeCont.cpp                        |   130 +-
 src/netbuild/NBEdgeCont.h                          |    49 +-
 src/netbuild/NBFrame.cpp                           |    40 +-
 src/netbuild/NBHeightMapper.cpp                    |    23 +-
 src/netbuild/NBJoinedEdgesMap.cpp                  |    92 -
 src/netbuild/NBJoinedEdgesMap.h                    |    94 -
 src/netbuild/NBLoadedSUMOTLDef.cpp                 |    24 +-
 src/netbuild/NBLoadedSUMOTLDef.h                   |     4 +-
 src/netbuild/NBLoadedTLDef.cpp                     |    62 +-
 src/netbuild/NBLoadedTLDef.h                       |    18 +-
 src/netbuild/NBNetBuilder.cpp                      |    49 +-
 src/netbuild/NBNetBuilder.h                        |    13 +-
 src/netbuild/NBNode.cpp                            |   342 +-
 src/netbuild/NBNode.h                              |    51 +-
 src/netbuild/NBNodeCont.cpp                        |    47 +-
 src/netbuild/NBNodeCont.h                          |    19 +-
 src/netbuild/NBNodeShapeComputer.cpp               |   157 +-
 src/netbuild/NBNodeShapeComputer.h                 |     6 +-
 src/netbuild/NBOwnTLDef.cpp                        |    88 +-
 src/netbuild/NBOwnTLDef.h                          |     8 +-
 src/netbuild/NBRequest.cpp                         |    87 +-
 src/netbuild/NBRequest.h                           |    10 +-
 src/netbuild/NBTrafficLightDefinition.cpp          |    17 +-
 src/netbuild/NBTrafficLightDefinition.h            |    19 +-
 src/netbuild/NBTrafficLightLogic.cpp               |    26 +-
 src/netbuild/NBTrafficLightLogic.h                 |    14 +-
 src/netbuild/NBTrafficLightLogicCont.cpp           |     8 +-
 src/netbuild/NBTrafficLightLogicCont.h             |     8 +-
 src/netbuild/NBTypeCont.cpp                        |     8 +-
 src/netbuild/NBTypeCont.h                          |    13 +-
 src/netedit/GNEAdditional.cpp                      |   394 +
 src/netedit/GNEAdditional.h                        |   325 +
 src/netedit/GNEAdditionalDialog.cpp                |    76 +
 src/netedit/GNEAdditionalDialog.h                  |   104 +
 src/netedit/GNEAdditionalFrame.cpp                 |  1496 ++
 src/netedit/GNEAdditionalFrame.h                   |   623 +
 src/netedit/GNEAdditionalHandler.cpp               |  1369 ++
 src/netedit/GNEAdditionalHandler.h                 |   407 +
 src/netedit/GNEAdditionalSet.cpp                   |   388 +
 src/netedit/GNEAdditionalSet.h                     |   240 +
 src/netedit/GNEApplicationWindow.cpp               |   301 +-
 src/netedit/GNEApplicationWindow.h                 |   178 +-
 src/netedit/GNEAttributeCarrier.cpp                |   800 +-
 src/netedit/GNEAttributeCarrier.h                  |   143 +-
 src/netedit/GNEBusStop.cpp                         |   434 +
 src/netedit/GNEBusStop.h                           |   133 +
 src/netedit/GNECalibrator.cpp                      |   404 +
 src/netedit/GNECalibrator.h                        |   183 +
 src/netedit/GNECalibratorDialog.cpp                |   425 +
 src/netedit/GNECalibratorDialog.h                  |   161 +
 src/netedit/GNEChange.cpp                          |    32 +-
 src/netedit/GNEChange.h                            |    35 +-
 src/netedit/GNEChange_Additional.cpp               |    99 +
 src/netedit/GNEChange_Additional.h                 |    85 +
 src/netedit/GNEChange_Attribute.cpp                |    20 +-
 src/netedit/GNEChange_Attribute.h                  |    22 +-
 src/netedit/GNEChange_Connection.cpp               |    30 +-
 src/netedit/GNEChange_Connection.h                 |    53 +-
 src/netedit/GNEChange_Edge.cpp                     |   113 +-
 src/netedit/GNEChange_Edge.h                       |    37 +-
 src/netedit/GNEChange_Junction.h                   |    17 +-
 src/netedit/GNEChange_Lane.cpp                     |    55 +-
 src/netedit/GNEChange_Lane.h                       |    35 +-
 src/netedit/GNEChange_Selection.cpp                |    43 +-
 src/netedit/GNEChange_Selection.h                  |    18 +-
 src/netedit/GNEChange_TLS.h                        |    16 +-
 src/netedit/GNEChargingStation.cpp                 |   512 +
 src/netedit/GNEChargingStation.h                   |   172 +
 src/netedit/GNEConnection.cpp                      |   394 +
 src/netedit/GNEConnection.h                        |   197 +
 src/netedit/GNEConnector.cpp                       |   568 -
 src/netedit/GNEConnector.h                         |   182 -
 src/netedit/GNEConnectorFrame.cpp                  |   531 +
 src/netedit/GNEConnectorFrame.h                    |   158 +
 src/netedit/GNEContainerStop.cpp                   |   434 +
 src/netedit/GNEContainerStop.h                     |   133 +
 src/netedit/GNECrossing.cpp                        |    26 +-
 src/netedit/GNECrossing.h                          |    65 +-
 src/netedit/GNEDetector.cpp                        |   182 +
 src/netedit/GNEDetector.h                          |   175 +
 src/netedit/GNEDetectorE1.cpp                      |   324 +
 src/netedit/GNEDetectorE1.h                        |   124 +
 src/netedit/GNEDetectorE2.cpp                      |   360 +
 src/netedit/GNEDetectorE2.h                        |   141 +
 src/netedit/GNEDetectorE3.cpp                      |   316 +
 src/netedit/GNEDetectorE3.h                        |   147 +
 src/netedit/GNEDetectorEntry.cpp                   |   282 +
 src/netedit/GNEDetectorEntry.h                     |   137 +
 src/netedit/GNEDetectorExit.cpp                    |   284 +
 src/netedit/GNEDetectorExit.h                      |   137 +
 src/netedit/GNEDialog_About.cpp                    |     6 +-
 src/netedit/GNEDialog_About.h                      |    12 +-
 src/netedit/GNEDialog_Wizard.cpp                   |     6 +-
 src/netedit/GNEDialog_Wizard.h                     |    52 +-
 src/netedit/GNEEdge.cpp                            |   382 +-
 src/netedit/GNEEdge.h                              |   218 +-
 src/netedit/GNEEvent_NetworkLoaded.h               |    20 +-
 src/netedit/GNEFrame.cpp                           |   109 +
 src/netedit/GNEFrame.h                             |   116 +
 src/netedit/GNEInspector.cpp                       |   353 -
 src/netedit/GNEInspector.h                         |   169 -
 src/netedit/GNEInspectorFrame.cpp                  |   794 +
 src/netedit/GNEInspectorFrame.h                    |   329 +
 src/netedit/GNEInternalLane.cpp                    |    30 +-
 src/netedit/GNEInternalLane.h                      |    69 +-
 src/netedit/GNEJunction.cpp                        |   323 +-
 src/netedit/GNEJunction.h                          |   158 +-
 src/netedit/GNELane.cpp                            |   451 +-
 src/netedit/GNELane.h                              |   221 +-
 src/netedit/GNELoadThread.cpp                      |   103 +-
 src/netedit/GNELoadThread.h                        |    41 +-
 src/netedit/GNENet.cpp                             |   503 +-
 src/netedit/GNENet.h                               |   332 +-
 src/netedit/GNENetElement.cpp                      |    81 +
 src/netedit/GNENetElement.h                        |   155 +
 src/netedit/GNEPOI.h                               |    39 +-
 src/netedit/GNEPoly.h                              |    56 +-
 src/netedit/GNEProhibition.cpp                     |    65 +
 src/netedit/GNEProhibition.h                       |    47 +
 src/netedit/GNEReferenceCounter.h                  |     6 +-
 src/netedit/GNERerouter.cpp                        |   707 +
 src/netedit/GNERerouter.h                          |   346 +
 src/netedit/GNERerouterDialog.cpp                  |    95 +
 src/netedit/GNERerouterDialog.h                    |    92 +
 src/netedit/GNERouteProbe.cpp                      |   368 +
 src/netedit/GNERouteProbe.h                        |   169 +
 src/netedit/GNESelector.cpp                        |   530 -
 src/netedit/GNESelector.h                          |   200 -
 src/netedit/GNESelectorFrame.cpp                   |   564 +
 src/netedit/GNESelectorFrame.h                     |   164 +
 src/netedit/GNEStoppingPlace.cpp                   |   164 +
 src/netedit/GNEStoppingPlace.h                     |   169 +
 src/netedit/GNETLSEditor.cpp                       |   686 -
 src/netedit/GNETLSEditor.h                         |   216 -
 src/netedit/GNETLSEditorFrame.cpp                  |   692 +
 src/netedit/GNETLSEditorFrame.h                    |   225 +
 src/netedit/GNEUndoList.cpp                        |    43 +-
 src/netedit/GNEUndoList.h                          |    77 +-
 src/netedit/GNEVaporizer.cpp                       |   345 +
 src/netedit/GNEVaporizer.h                         |   153 +
 src/netedit/GNEVariableSpeedSignal.cpp             |   439 +
 src/netedit/GNEVariableSpeedSignal.h               |   156 +
 src/netedit/GNEVariableSpeedSignalDialog.cpp       |   210 +
 src/netedit/GNEVariableSpeedSignalDialog.h         |   117 +
 src/netedit/GNEViewNet.cpp                         |   748 +-
 src/netedit/GNEViewNet.h                           |   274 +-
 src/netedit/GNEViewParent.cpp                      |   116 +-
 src/netedit/GNEViewParent.h                        |    74 +-
 src/netedit/Makefile.am                            |    38 +-
 src/netedit/Makefile.in                            |   154 +-
 src/netedit/netedit.rc                             |     1 +
 src/netedit/netedit_main.cpp                       |    36 +-
 src/netedit/tlslogo.cpp                            |   159 -
 src/netgen/NGFrame.cpp                             |     4 +-
 src/netgen/NGNet.cpp                               |    11 +-
 src/netgen/NGNet.h                                 |     7 +-
 src/netgen/NGRandomNetBuilder.cpp                  |     4 +-
 src/netgen/netgen_main.cpp                         |    10 +-
 src/netimport/NIFrame.cpp                          |    15 +-
 src/netimport/NIImporter_ArcView.cpp               |    21 +-
 src/netimport/NIImporter_ArcView.h                 |     6 +-
 src/netimport/NIImporter_DlrNavteq.cpp             |    52 +-
 src/netimport/NIImporter_DlrNavteq.h               |     8 +-
 src/netimport/NIImporter_ITSUMO.cpp                |     6 +-
 src/netimport/NIImporter_ITSUMO.h                  |     6 +-
 src/netimport/NIImporter_MATSim.cpp                |     4 +-
 src/netimport/NIImporter_OpenDrive.cpp             |   133 +-
 src/netimport/NIImporter_OpenDrive.h               |    47 +-
 src/netimport/NIImporter_OpenStreetMap.cpp         |   214 +-
 src/netimport/NIImporter_OpenStreetMap.h           |    14 +-
 src/netimport/NIImporter_RobocupRescue.cpp         |    36 +-
 src/netimport/NIImporter_SUMO.cpp                  |    48 +-
 src/netimport/NIImporter_SUMO.h                    |    12 +-
 src/netimport/NIImporter_VISUM.cpp                 |    38 +-
 src/netimport/NILoader.cpp                         |     5 +-
 src/netimport/NINavTeqHelper.cpp                   |     4 +-
 src/netimport/NINavTeqHelper.h                     |     6 +-
 src/netimport/NIVisumTL.cpp                        |     4 +-
 src/netimport/NIXMLConnectionsHandler.cpp          |     9 +-
 src/netimport/NIXMLEdgesHandler.cpp                |    57 +-
 src/netimport/NIXMLTrafficLightsHandler.cpp        |     4 +-
 src/netimport/typemap.h                            |    43 +-
 src/netimport/vissim/NIImporter_Vissim.cpp         |     4 +-
 .../vissim/tempstructs/NIVissimConnection.cpp      |    14 +-
 .../vissim/tempstructs/NIVissimConnection.h        |     4 +-
 .../tempstructs/NIVissimConnectionCluster.cpp      |    14 +-
 .../vissim/tempstructs/NIVissimConnectionCluster.h |     6 +-
 .../vissim/tempstructs/NIVissimDisturbance.cpp     |     4 +-
 src/netimport/vissim/tempstructs/NIVissimEdge.cpp  |    19 +-
 src/netimport/vissim/tempstructs/NIVissimEdge.h    |     6 +-
 .../vissim/tempstructs/NIVissimNodeCluster.cpp     |     6 +-
 .../vissim/tempstructs/NIVissimNodeCluster.h       |     4 +-
 .../vissim/tempstructs/NIVissimNodeDef.cpp         |     6 +-
 src/netimport/vissim/tempstructs/NIVissimNodeDef.h |     4 +-
 src/netimport/vissim/tempstructs/NIVissimTL.cpp    |    22 +-
 src/netload/NLBuilder.cpp                          |    23 +-
 src/netload/NLDetectorBuilder.cpp                  |   144 +-
 src/netload/NLDetectorBuilder.h                    |    51 +-
 src/netload/NLEdgeControlBuilder.cpp               |    11 +-
 src/netload/NLEdgeControlBuilder.h                 |    19 +-
 src/netload/NLHandler.cpp                          |    45 +-
 src/netload/NLHandler.h                            |     9 +-
 src/netload/NLJunctionControlBuilder.cpp           |     9 +-
 src/netload/NLJunctionControlBuilder.h             |     6 +-
 src/netload/NLTriggerBuilder.cpp                   |    22 +-
 src/netload/NLTriggerBuilder.h                     |    13 +-
 src/netwrite/NWFrame.cpp                           |    10 +-
 src/netwrite/NWFrame.h                             |    19 +-
 src/netwrite/NWWriter_DlrNavteq.cpp                |    52 +-
 src/netwrite/NWWriter_DlrNavteq.h                  |     4 +-
 src/netwrite/NWWriter_OpenDrive.cpp                |   482 +-
 src/netwrite/NWWriter_OpenDrive.h                  |    19 +-
 src/netwrite/NWWriter_SUMO.cpp                     |    98 +-
 src/netwrite/NWWriter_SUMO.h                       |    15 +-
 src/netwrite/NWWriter_XML.cpp                      |    15 +-
 src/od/ODDistrict.cpp                              |    10 +-
 src/od/ODDistrict.h                                |     6 +-
 src/od/ODMatrix.cpp                                |   106 +-
 src/od/ODMatrix.h                                  |    43 +-
 src/od2trips_main.cpp                              |    10 +-
 src/osgview/GUIOSGBoundingBoxCalculator.h          |    10 +-
 src/osgview/GUIOSGBuilder.cpp                      |     9 +-
 src/osgview/GUIOSGView.cpp                         |    35 +-
 src/osgview/GUIOSGView.h                           |     9 +-
 src/polyconvert/PCLoaderArcView.cpp                |    37 +-
 src/polyconvert/PCLoaderDlrNavteq.cpp              |    24 +-
 src/polyconvert/PCLoaderOSM.cpp                    |    11 +-
 src/polyconvert/PCLoaderVisum.cpp                  |    24 +-
 src/polyconvert/PCLoaderXML.cpp                    |   144 +-
 src/polyconvert/PCLoaderXML.h                      |    32 +-
 src/polyconvert/PCPolyContainer.cpp                |    86 +-
 src/polyconvert/PCPolyContainer.h                  |    76 +-
 src/polyconvert/PCTypeDefHandler.cpp               |    14 +-
 src/polyconvert/PCTypeMap.cpp                      |     6 +-
 src/polyconvert/PCTypeMap.h                        |     6 +-
 src/polyconvert/polyconvert_main.cpp               |    25 +-
 src/router/ROAbstractEdgeBuilder.h                 |     6 +-
 src/router/ROEdge.cpp                              |    14 +-
 src/router/ROEdge.h                                |    36 +-
 src/router/ROHelper.cpp                            |    22 +-
 src/router/ROLoader.cpp                            |     4 +-
 src/router/ROLoader.h                              |     4 +-
 src/router/RONet.cpp                               |    42 +-
 src/router/RONet.h                                 |    15 +-
 src/router/RONetHandler.cpp                        |     6 +-
 src/router/ROPerson.cpp                            |     3 +-
 src/router/ROPerson.h                              |    11 +-
 src/router/RORoute.h                               |     6 +-
 src/router/RORouteDef.cpp                          |    32 +-
 src/router/RORouteDef.h                            |     6 +-
 src/router/RORouteHandler.cpp                      |    13 +-
 src/router/ROVehicle.cpp                           |    11 +-
 src/tools/TrajectoriesHandler.cpp                  |    10 +-
 src/tools/TrajectoriesHandler.h                    |     6 +-
 src/tools/emissionsDrivingCycle_main.cpp           |    52 +-
 src/traci-server/TraCIConstants.h                  |    36 +-
 src/traci-server/TraCIServer.cpp                   |    44 +-
 src/traci-server/TraCIServer.h                     |     6 +-
 src/traci-server/TraCIServerAPI_Edge.cpp           |    26 +-
 src/traci-server/TraCIServerAPI_InductionLoop.cpp  |     8 +-
 src/traci-server/TraCIServerAPI_Junction.cpp       |     6 +-
 src/traci-server/TraCIServerAPI_Lane.cpp           |    25 +-
 src/traci-server/TraCIServerAPI_Person.cpp         |    14 +-
 src/traci-server/TraCIServerAPI_Polygon.cpp        |    18 +-
 src/traci-server/TraCIServerAPI_Polygon.h          |     4 +-
 src/traci-server/TraCIServerAPI_Simulation.cpp     |     4 +-
 src/traci-server/TraCIServerAPI_TLS.cpp            |    22 +-
 src/traci-server/TraCIServerAPI_Vehicle.cpp        |   179 +-
 src/traci-server/TraCIServerAPI_Vehicle.h          |     4 +-
 src/traci-server/TraCIServerAPI_VehicleType.cpp    |    22 +-
 src/traci_testclient/TraCITestClient.cpp           |   100 +-
 src/traci_testclient/TraCITestClient.h             |     8 +-
 src/utils/common/FileHelpers.cpp                   |    16 +-
 src/utils/common/FileHelpers.h                     |    38 +-
 src/utils/common/IDSupplier.cpp                    |     4 +-
 src/utils/common/Makefile.am                       |     3 +-
 src/utils/common/Makefile.in                       |     3 +-
 src/utils/common/Named.h                           |     5 +-
 src/utils/common/NamedObjectCont.h                 |     6 +-
 src/utils/common/RandHelper.cpp                    |     4 +-
 src/utils/common/RandHelper.h                      |    11 +-
 src/utils/common/RandomDistributor.h               |     6 +-
 src/utils/common/SUMOVehicleClass.cpp              |    18 +-
 src/utils/common/StdDefs.cpp                       |     4 +-
 src/utils/common/StdDefs.h                         |     4 +-
 src/utils/common/StringBijection.h                 |     6 +-
 src/utils/common/StringTokenizer.cpp               |    46 +-
 src/utils/common/StringTokenizer.h                 |    10 +-
 src/utils/common/StringUtils.cpp                   |    20 +-
 src/utils/common/ToString.h                        |    33 +-
 src/utils/common/TplCheck.h                        |   126 +
 src/utils/common/TplConvert.h                      |   275 +-
 src/utils/common/UtilExceptions.h                  |    33 +-
 src/utils/distribution/Distribution_Points.cpp     |    33 +-
 src/utils/distribution/Distribution_Points.h       |    10 +-
 src/utils/emissions/HelpersHarmonoise.cpp          |     4 +-
 src/utils/emissions/HelpersPHEMlight.cpp           |     4 +-
 src/utils/emissions/PollutantsInterface.cpp        |     4 +-
 src/utils/foxtools/FXLinkLabel.cpp                 |     4 +-
 src/utils/foxtools/FXSevenSegment.cpp              |    18 +-
 src/utils/foxtools/FXSevenSegment.h                |    10 +-
 src/utils/foxtools/FXWorkerThread.h                |     4 +-
 src/utils/foxtools/MFXAddEditTypedTable.cpp        |    30 +-
 src/utils/foxtools/MFXAddEditTypedTable.h          |    16 +-
 src/utils/foxtools/MFXEventQue.h                   |     6 +-
 src/utils/geom/Boundary.cpp                        |    49 +-
 src/utils/geom/Boundary.h                          |    22 +-
 src/utils/geom/Bresenham.cpp                       |    14 +-
 src/utils/geom/Bresenham.h                         |     6 +-
 src/utils/geom/PositionVector.cpp                  |   133 +-
 src/utils/geom/PositionVector.h                    |   233 +-
 src/utils/geom/bezier.cpp                          |    28 +-
 src/utils/geom/bezier.h                            |     7 +-
 src/utils/gui/div/GLHelper.cpp                     |    16 +-
 src/utils/gui/div/GLHelper.h                       |     4 +-
 src/utils/gui/div/GUIParameterTableWindow.cpp      |     4 +-
 src/utils/gui/div/GUIParameterTableWindow.h        |     4 +-
 src/utils/gui/div/GUISelectedStorage.cpp           |     4 +-
 src/utils/gui/div/GUIVideoEncoder.h                |     4 +-
 src/utils/gui/events/GUIEvent.h                    |     5 +-
 src/utils/gui/events/GUIEvent_Message.h            |     7 +-
 src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp   |    37 +-
 src/utils/gui/globjects/GUIGLObjectPopupMenu.h     |    14 +-
 src/utils/gui/globjects/GUIGlObject.cpp            |    74 +-
 src/utils/gui/globjects/GUIGlObject.h              |   153 +-
 src/utils/gui/globjects/GUIGlObjectStorage.cpp     |     4 +-
 src/utils/gui/globjects/GUIGlObjectTypes.h         |     6 +-
 src/utils/gui/globjects/GUIPolygon.cpp             |     4 +-
 src/utils/gui/globjects/GUIShapeContainer.cpp      |     6 +-
 src/utils/gui/globjects/GUIShapeContainer.h        |     6 +-
 src/utils/gui/images/GNETexture_E1.cpp             |    93 +
 src/utils/gui/images/GNETexture_E2.cpp             |    94 +
 src/utils/gui/images/GNETexture_E3.cpp             |   138 +
 src/utils/gui/images/GNETexture_E3Selected.cpp     |   138 +
 src/utils/gui/images/GNETexture_Empty.cpp          |    90 +
 src/utils/gui/images/GNETexture_EmptySelected.cpp  |    90 +
 src/utils/gui/images/GNETexture_Entry.cpp          |   102 +
 src/utils/gui/images/GNETexture_Exit.cpp           |   100 +
 src/utils/gui/images/GNETexture_LaneBike.cpp       |   250 +
 src/utils/gui/images/GNETexture_LaneBus.cpp        |   195 +
 src/utils/gui/images/GNETexture_LanePedestrian.cpp |   217 +
 src/utils/gui/images/GNETexture_Lock.cpp           |   156 +
 src/utils/gui/images/GNETexture_LockSelected.cpp   |   157 +
 src/utils/gui/images/GNETexture_NotMoving.cpp      |   113 +
 .../gui/images/GNETexture_NotMovingSelected.cpp    |   113 +
 src/utils/gui/images/GNETexture_Rerouter.cpp       |   149 +
 .../gui/images/GNETexture_RerouterSelected.cpp     |   150 +
 src/utils/gui/images/GNETexture_RouteProbe.cpp     |   143 +
 .../gui/images/GNETexture_RouteProbeSelected.cpp   |   143 +
 src/utils/gui/images/GNETexture_TLS.cpp            |   159 +
 src/utils/gui/images/GNETexture_Vaporizer.cpp      |   143 +
 .../gui/images/GNETexture_VaporizerSelected.cpp    |   142 +
 .../gui/images/GNETexture_VariableSpeedSignal.cpp  |   149 +
 .../GNETexture_VariableSpeedSignalSelected.cpp     |   149 +
 src/utils/gui/images/GUIIconSubSys.cpp             |    38 +-
 src/utils/gui/images/GUIIconSubSys.h               |    21 +-
 src/utils/gui/images/GUIIcons.h                    |    19 +-
 src/utils/gui/images/GUITextureSubSys.cpp          |   225 +
 src/utils/gui/images/GUITextureSubSys.h            |    80 +
 src/utils/gui/images/GUITextures.h                 |    73 +
 src/utils/gui/images/GUITexturesHelper.cpp         |    10 +-
 src/utils/gui/images/GUITexturesHelper.h           |     8 +-
 src/utils/gui/images/Makefile.am                   |    25 +-
 src/utils/gui/images/Makefile.in                   |    28 +-
 src/utils/gui/images/add.xpm                       |    30 +
 src/utils/gui/images/green_edge.xpm                |    23 +
 src/utils/gui/images/green_person.xpm              |    23 +
 src/utils/gui/images/green_vehicle.xpm             |    23 +
 src/utils/gui/images/lanebike.xpm                  |    24 +
 src/utils/gui/images/lanebus.xpm                   |    56 +
 src/utils/gui/images/lanepedestrian.xpm            |    62 +
 src/utils/gui/images/lock.xpm                      |   223 +
 src/utils/gui/images/neteditarrow.xpm              |    23 +
 src/utils/gui/images/remove.xpm                    |    29 +
 src/utils/gui/images/yellow_edge.xpm               |    23 +
 src/utils/gui/images/yellow_person.xpm             |    23 +
 src/utils/gui/images/yellow_vehicle.xpm            |    23 +
 .../gui/settings/GUICompleteSchemeStorage.cpp      |    19 +-
 src/utils/gui/settings/GUICompleteSchemeStorage.h  |    10 +-
 src/utils/gui/settings/GUIPropertyScheme.h         |    14 +-
 src/utils/gui/settings/GUIPropertySchemeStorage.h  |    14 +-
 src/utils/gui/settings/GUISettingsHandler.cpp      |    22 +-
 src/utils/gui/settings/GUISettingsHandler.h        |    12 +-
 .../gui/settings/GUIVisualizationSettings.cpp      |   104 +-
 src/utils/gui/settings/GUIVisualizationSettings.h  |    33 +-
 src/utils/gui/tracker/GUIParameterTracker.cpp      |    12 +-
 src/utils/gui/tracker/TrackerValueDesc.cpp         |     6 +-
 src/utils/gui/tracker/TrackerValueDesc.h           |     4 +-
 src/utils/gui/windows/GUIAppEnum.h                 |   128 +-
 .../gui/windows/GUIDanielPerspectiveChanger.cpp    |    26 +-
 .../gui/windows/GUIDanielPerspectiveChanger.h      |    15 +-
 src/utils/gui/windows/GUIDialog_EditViewport.cpp   |    42 +-
 src/utils/gui/windows/GUIDialog_EditViewport.h     |     4 +-
 src/utils/gui/windows/GUIDialog_ViewSettings.cpp   |    82 +-
 src/utils/gui/windows/GUIDialog_ViewSettings.h     |     9 +-
 src/utils/gui/windows/GUIMainWindow.cpp            |    14 +-
 src/utils/gui/windows/GUIMainWindow.h              |     7 +-
 src/utils/gui/windows/GUIPerspectiveChanger.cpp    |    47 +-
 src/utils/gui/windows/GUIPerspectiveChanger.h      |    96 +-
 src/utils/gui/windows/GUISUMOAbstractView.cpp      |   322 +-
 src/utils/gui/windows/GUISUMOAbstractView.h        |   335 +-
 src/utils/importio/LineReader.cpp                  |    16 +-
 src/utils/importio/LineReader.h                    |     8 +-
 src/utils/importio/NamedColumnsParser.cpp          |    10 +-
 src/utils/importio/NamedColumnsParser.h            |     4 +-
 src/utils/iodevices/BinaryFormatter.cpp            |     9 +-
 src/utils/iodevices/BinaryFormatter.h              |    11 +-
 src/utils/iodevices/BinaryInputDevice.cpp          |    38 +-
 src/utils/iodevices/BinaryInputDevice.h            |    23 +-
 src/utils/iodevices/OutputDevice.cpp               |    10 +-
 src/utils/iodevices/OutputDevice.h                 |     6 +-
 src/utils/iodevices/OutputDevice_String.cpp        |     6 +-
 src/utils/iodevices/OutputDevice_String.h          |     6 +-
 src/utils/iodevices/PlainXMLFormatter.cpp          |     4 +-
 src/utils/iodevices/PlainXMLFormatter.h            |     6 +-
 src/utils/options/Option.cpp                       |    20 +-
 src/utils/options/Option.h                         |    25 +-
 src/utils/options/OptionsCont.cpp                  |    26 +-
 src/utils/options/OptionsCont.h                    |    13 +-
 src/utils/options/OptionsIO.cpp                    |    20 +-
 src/utils/options/OptionsIO.h                      |     4 +-
 src/utils/options/OptionsLoader.cpp                |     4 +-
 src/utils/options/OptionsParser.cpp                |     4 +-
 src/utils/shapes/PointOfInterest.h                 |    27 +-
 src/utils/shapes/Polygon.h                         |     7 +-
 src/utils/shapes/ShapeContainer.cpp                |    43 +-
 src/utils/shapes/ShapeContainer.h                  |    20 +-
 src/utils/shapes/ShapeHandler.cpp                  |   103 +-
 src/utils/shapes/ShapeHandler.h                    |    25 +-
 src/utils/traci/TraCIAPI.cpp                       |   632 +-
 src/utils/traci/TraCIAPI.h                         |   261 +-
 src/utils/vehicle/AStarRouter.h                    |     6 +-
 src/utils/vehicle/CHRouter.h                       |    10 +-
 src/utils/vehicle/CarEdge.h                        |    10 +-
 src/utils/vehicle/DijkstraRouterEffort.h           |     6 +-
 src/utils/vehicle/DijkstraRouterTT.h               |     8 +-
 src/utils/vehicle/IntermodalEdge.h                 |    10 +-
 src/utils/vehicle/IntermodalNetwork.h              |     6 +-
 src/utils/vehicle/IntermodalRouter.h               |     6 +-
 src/utils/vehicle/PedestrianRouter.h               |     6 +-
 src/utils/vehicle/RouteCostCalculator.h            |     6 +-
 src/utils/vehicle/SUMOVTypeParameter.cpp           |    49 +-
 src/utils/vehicle/SUMOVTypeParameter.h             |    34 +-
 src/utils/vehicle/SUMOVehicle.h                    |    61 +-
 src/utils/vehicle/SUMOVehicleParameter.cpp         |   113 +-
 src/utils/vehicle/SUMOVehicleParameter.h           |    91 +-
 src/utils/xml/GenericSAXHandler.cpp                |    21 +-
 src/utils/xml/SAXWeightsHandler.h                  |     4 +-
 src/utils/xml/SUMORouteHandler.cpp                 |    10 +-
 src/utils/xml/SUMOSAXReader.cpp                    |     4 +-
 src/utils/xml/SUMOVehicleParserHelper.cpp          |    88 +-
 src/utils/xml/SUMOVehicleParserHelper.h            |     7 +-
 src/utils/xml/SUMOXMLDefinitions.cpp               |   990 +-
 src/utils/xml/SUMOXMLDefinitions.h                 |   134 +-
 src/utils/xml/XMLSubSys.cpp                        |     6 +-
 src/utils/xml/XMLSubSys.h                          |     4 +-
 src/version.h                                      |     2 +-
 src/windows_config.h                               |     6 +-
 tools/assign/cadytsIterate.py                      |    11 +-
 tools/assign/duaIterate.py                         |     7 +-
 tools/assign/network.py                            |     6 +-
 tools/build/apply_astyle.py                        |    13 +-
 tools/build/checkImages.py                         |    41 +
 tools/build/dailyBuildMSVC.py                      |    44 +-
 tools/build/dailyUpdateMakeGCC.sh                  |    16 +-
 tools/contributed/sumopy/__init__.py               |     2 +
 tools/contributed/sumopy/agilepy/__init__.py       |     2 +
 .../sumopy/agilepy/lib_base/__init__.py            |     2 +
 .../sumopy/agilepy/lib_base/arrayman.py            |  1160 +
 tools/contributed/sumopy/agilepy/lib_base/base.py  |  3726 ++++
 .../sumopy/agilepy/lib_base/classman.py            |  2979 +++
 .../sumopy/agilepy/lib_base/geometry.py            |   401 +
 .../contributed/sumopy/agilepy/lib_base/logger.py  |    42 +
 tools/contributed/sumopy/agilepy/lib_base/misc.py  |    72 +
 .../sumopy/agilepy/lib_base/processes.py           |   793 +
 .../agilepy/lib_base/test_classman_classes.py      |   704 +
 .../sumopy/agilepy/lib_base/test_classman_misc.py  |     9 +
 .../sumopy/agilepy/lib_base/test_classman_save.py  |   755 +
 .../agilepy/lib_base/test_classman_tables.py       |   568 +
 .../contributed/sumopy/agilepy/lib_base/xmlman.py  |   149 +
 .../contributed/sumopy/agilepy/lib_wx/__init__.py  |     2 +
 .../agilepy/lib_wx/images/Document_Export_24px.png |   Bin 0 -> 1199 bytes
 .../agilepy/lib_wx/images/Document_Import_24px.png |   Bin 0 -> 1198 bytes
 .../lib_wx/images/arrow_cursor_drag_16px.png       |   Bin 0 -> 988 bytes
 .../lib_wx/images/arrow_cursor_drag_24px.png       |   Bin 0 -> 1187 bytes
 .../lib_wx/images/arrow_cursor_drag_32px.png       |   Bin 0 -> 1316 bytes
 .../agilepy/lib_wx/images/circle_empty_16px.png    |   Bin 0 -> 918 bytes
 .../agilepy/lib_wx/images/circle_empty_24px.png    |   Bin 0 -> 1050 bytes
 .../sumopy/agilepy/lib_wx/images/gtk-zoom-fit.png  |   Bin 0 -> 2318 bytes
 .../agilepy/lib_wx/images/gtk_2fit_zoom_16px.png   |   Bin 0 -> 1532 bytes
 .../agilepy/lib_wx/images/gtk_2fit_zoom_24px.png   |   Bin 0 -> 1891 bytes
 .../agilepy/lib_wx/images/gtk_2fit_zoom_32px.png   |   Bin 0 -> 2402 bytes
 .../agilepy/lib_wx/images/gtk_2fit_zoom_48px.png   |   Bin 0 -> 3544 bytes
 .../agilepy/lib_wx/images/gtk_2in_zoom_16px.png    |   Bin 0 -> 1445 bytes
 .../agilepy/lib_wx/images/gtk_2in_zoom_24px.png    |   Bin 0 -> 1909 bytes
 .../agilepy/lib_wx/images/gtk_2in_zoom_32px.png    |   Bin 0 -> 2530 bytes
 .../agilepy/lib_wx/images/gtk_2out_zoom_16px.png   |   Bin 0 -> 1441 bytes
 .../agilepy/lib_wx/images/gtk_2out_zoom_24px.png   |   Bin 0 -> 1867 bytes
 .../agilepy/lib_wx/images/gtk_2out_zoom_32px.png   |   Bin 0 -> 2481 bytes
 .../agilepy/lib_wx/images/gtk_configure_24px.png   |   Bin 0 -> 2527 bytes
 .../agilepy/lib_wx/images/gtk_fit_zoom_24px.png    |   Bin 0 -> 2400 bytes
 .../agilepy/lib_wx/images/gtk_in_zoom_24px.png     |   Bin 0 -> 2367 bytes
 .../agilepy/lib_wx/images/gtk_out_zoom_24px.png    |   Bin 0 -> 2344 bytes
 .../agilepy/lib_wx/images/gtk_print_16px.png       |   Bin 0 -> 987 bytes
 .../agilepy/lib_wx/images/gtk_print_24px.png       |   Bin 0 -> 1186 bytes
 .../sumopy/agilepy/lib_wx/images/gtk_sort_16px.png |   Bin 0 -> 1536 bytes
 .../sumopy/agilepy/lib_wx/images/gtk_sort_24px.png |   Bin 0 -> 1820 bytes
 .../sumopy/agilepy/lib_wx/images/gtk_sort_32px.png |   Bin 0 -> 2260 bytes
 .../agilepy/lib_wx/images/gtk_sortdown_16px.png    |   Bin 0 -> 1545 bytes
 .../agilepy/lib_wx/images/gtk_sortdown_24px.png    |   Bin 0 -> 1851 bytes
 .../agilepy/lib_wx/images/gtk_sortdown_32px.png    |   Bin 0 -> 2277 bytes
 .../lib_wx/images/icon_select_components.png       |   Bin 0 -> 1184 bytes
 .../sumopy/agilepy/lib_wx/images/line_16px.png     |   Bin 0 -> 757 bytes
 .../sumopy/agilepy/lib_wx/images/line_24px.png     |   Bin 0 -> 849 bytes
 .../agilepy/lib_wx/images/magnifier-zoom-in.png    |   Bin 0 -> 1226 bytes
 .../agilepy/lib_wx/images/move_vertex_24px.png     |   Bin 0 -> 1192 bytes
 .../sumopy/agilepy/lib_wx/images/polygon2_24px.png |   Bin 0 -> 917 bytes
 .../sumopy/agilepy/lib_wx/images/polygon_24px.png  |   Bin 0 -> 382 bytes
 .../sumopy/agilepy/lib_wx/images/polyline_24px.png |   Bin 0 -> 1082 bytes
 .../contributed/sumopy/agilepy/lib_wx/mainframe.py |   417 +
 .../contributed/sumopy/agilepy/lib_wx/modulegui.py |   220 +
 .../contributed/sumopy/agilepy/lib_wx/objpanel.py  |  4500 ++++
 .../contributed/sumopy/agilepy/lib_wx/ogleditor.py |  4859 +++++
 .../sumopy/agilepy/lib_wx/processdialog.py         |   158 +
 .../contributed/sumopy/agilepy/lib_wx/test_app.py  |   233 +
 .../sumopy/agilepy/lib_wx/test_glcanvas.py         |  2107 ++
 .../sumopy/agilepy/lib_wx/test_notebook.py         |   131 +
 tools/contributed/sumopy/agilepy/lib_wx/toolbox.py |   534 +
 tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py  |   928 +
 tools/contributed/sumopy/coremodules/__init__.py   |     2 +
 .../sumopy/coremodules/demand/__init__.py          |    15 +
 .../sumopy/coremodules/demand/demand.py            |  1082 +
 .../demand/images/Document_Export_24px.png         |   Bin 0 -> 1199 bytes
 .../demand/images/Document_Import_24px.png         |   Bin 0 -> 1198 bytes
 .../demand/images/add_user_group_new_24px.png      |   Bin 0 -> 1650 bytes
 .../images/client_male_man_person_user_24px.png    |   Bin 0 -> 1180 bytes
 .../demand/images/gtk_configure_24px.png           |   Bin 0 -> 2527 bytes
 .../sumopy/coremodules/demand/images/icon_odm.png  |   Bin 0 -> 630 bytes
 .../sumopy/coremodules/demand/images/icon_sumo.png |   Bin 0 -> 2054 bytes
 .../coremodules/demand/images/icon_turnratio.png   |   Bin 0 -> 1257 bytes
 .../demand/images/icon_virtualpopulation.jpg       |   Bin 0 -> 2389 bytes
 .../coremodules/demand/images/route3_24px.png      |   Bin 0 -> 685 bytes
 .../coremodules/demand/images/trip3_24px.png       |   Bin 0 -> 1524 bytes
 .../coremodules/demand/images/vehicle_24px.png     |   Bin 0 -> 1347 bytes
 .../coremodules/demand/origin_to_destination.py    |   549 +
 .../demand/origin_to_destination_wxgui.py          |   364 +
 .../sumopy/coremodules/demand/turnflows.py         |   728 +
 .../sumopy/coremodules/demand/turnflows_wxgui.py   |   245 +
 .../sumopy/coremodules/demand/vehicles.py          |   922 +
 .../sumopy/coremodules/demand/virtualpop.py        |  1056 +
 .../contributed/sumopy/coremodules/demand/wxgui.py |   839 +
 .../sumopy/coremodules/landuse/__init__.py         |    15 +
 .../landuse/images/Document_Export_24px.png        |   Bin 0 -> 1199 bytes
 .../landuse/images/Document_Import_24px.png        |   Bin 0 -> 1198 bytes
 .../landuse/images/Files-Osm-icon_16px.png         |   Bin 0 -> 369 bytes
 .../landuse/images/Files-Osm-icon_24.png           |   Bin 0 -> 575 bytes
 .../landuse/images/Files-Osm-icon_32px.png         |   Bin 0 -> 743 bytes
 .../landuse/images/building-icon_24px.png          |   Bin 0 -> 680 bytes
 .../coremodules/landuse/images/city-icon_24px.png  |   Bin 0 -> 1641 bytes
 .../coremodules/landuse/images/fig_facility.png    |   Bin 0 -> 5093 bytes
 .../sumopy/coremodules/landuse/images/fig_zone.png |   Bin 0 -> 473 bytes
 .../coremodules/landuse/images/fig_zone_24px.png   |   Bin 0 -> 559 bytes
 .../landuse/images/gtk_configure_24px.png          |   Bin 0 -> 2527 bytes
 .../coremodules/landuse/images/icon_sumo_24px.png  |   Bin 0 -> 1578 bytes
 .../coremodules/landuse/images/icon_sumo_32px.png  |   Bin 0 -> 2054 bytes
 .../sumopy/coremodules/landuse/images/map_24px.png |   Bin 0 -> 1162 bytes
 .../coremodules/landuse/images/map_add_24px.png    |   Bin 0 -> 1255 bytes
 .../coremodules/landuse/images/map_del_24px.png    |   Bin 0 -> 1250 bytes
 .../sumopy/coremodules/landuse/landuse.py          |  1296 ++
 .../contributed/sumopy/coremodules/landuse/maps.py |   518 +
 .../sumopy/coremodules/landuse/wxgui.py            |   816 +
 .../sumopy/coremodules/modules_common.py           |     1 +
 .../sumopy/coremodules/network/__init__.py         |    15 +
 .../network/images/Document_Export_24px.png        |   Bin 0 -> 1199 bytes
 .../network/images/Document_Import_24px.png        |   Bin 0 -> 1198 bytes
 .../network/images/Files-Osm-icon_16px.png         |   Bin 0 -> 369 bytes
 .../network/images/Files-Osm-icon_24.png           |   Bin 0 -> 575 bytes
 .../network/images/Files-Osm-icon_32px.png         |   Bin 0 -> 743 bytes
 .../coremodules/network/images/fig_connection.png  |   Bin 0 -> 1460 bytes
 .../sumopy/coremodules/network/images/fig_link.png |   Bin 0 -> 296 bytes
 .../sumopy/coremodules/network/images/fig_node.png |   Bin 0 -> 210 bytes
 .../network/images/gtk_configure_24px.png          |   Bin 0 -> 2527 bytes
 .../coremodules/network/images/icon_graph.png      |   Bin 0 -> 1133 bytes
 .../coremodules/network/images/icon_sumo_24px.png  |   Bin 0 -> 1578 bytes
 .../coremodules/network/images/icon_sumo_32px.png  |   Bin 0 -> 2054 bytes
 .../coremodules/network/images/icon_turnratio.png  |   Bin 0 -> 1348 bytes
 .../sumopy/coremodules/network/images/netedit.png  |   Bin 0 -> 1570 bytes
 .../sumopy/coremodules/network/netedit_config.xml  |   504 +
 .../sumopy/coremodules/network/network.py          |  3903 ++++
 .../sumopy/coremodules/network/network_editor.py   |   995 +
 .../sumopy/coremodules/network/routing.py          |   171 +
 .../sumopy/coremodules/network/wxgui.py            |   335 +
 .../sumopy/coremodules/scenario/__init__.py        |    15 +
 .../coremodules/scenario/images/city-icon_24px.png |   Bin 0 -> 1641 bytes
 .../scenario/images/gtk_configure_24px.png         |   Bin 0 -> 2527 bytes
 .../sumopy/coremodules/scenario/scenario.py        |   249 +
 .../sumopy/coremodules/scenario/wxgui.py           |   296 +
 .../sumopy/coremodules/simulation/__init__.py      |    15 +
 .../simulation/images/gtk_configure_24px.png       |   Bin 0 -> 2527 bytes
 .../coremodules/simulation/images/icon_mpl.png     |   Bin 0 -> 4966 bytes
 .../coremodules/simulation/images/icon_sumo.png    |   Bin 0 -> 2054 bytes
 .../coremodules/simulation/result_oglviewer.py     |   983 +
 .../sumopy/coremodules/simulation/results.py       |   448 +
 .../sumopy/coremodules/simulation/results_mpl.py   |   320 +
 .../sumopy/coremodules/simulation/sumo.py          |   669 +
 .../sumopy/coremodules/simulation/wxgui.py         |   439 +
 tools/contributed/sumopy/images/icon_sumopy.png    |   Bin 0 -> 2344 bytes
 tools/contributed/sumopy/sumopy_gui.py             |   117 +
 tools/contributed/sumopy/testscenario/demo.net.xml |  3271 +++
 tools/contributed/sumopy/testscenario/demo.osm.xml | 21555 +++++++++++++++++++
 .../contributed/sumopy/testscenario/demo.poly.xml  |   446 +
 .../sumopy/testscenario/demo_dem_od_bikes.csv      |     8 +
 .../sumopy/testscenario/demo_dem_tf_car.csv        |     5 +
 .../sumopy/typemap/osmBidiRailNetconvert.typ.xml   |     7 +
 .../sumopy}/typemap/osmNetconvert.typ.xml          |     0
 .../sumopy}/typemap/osmNetconvertBicycle.typ.xml   |     0
 .../typemap/osmNetconvertPedestrians.typ.xml       |    10 +
 .../sumopy}/typemap/osmNetconvertShips.typ.xml     |     0
 .../sumopy/typemap/osmNetconvertUrbanDe.typ.xml    |    12 +
 .../sumopy/typemap/osmPolyconvert.typ.xml          |    40 +
 .../.settings/org.eclipse.core.resources.prefs     |     2 +
 tools/contributed/traas/build.xml                  |     2 +-
 .../traas/examples/java_wsclient/Main.java         |     4 +-
 .../java_wsclient/de/tudresden/ws/AddOption.java   |    12 +-
 .../de/tudresden/ws/AddOptionResponse.java         |     4 +-
 .../de/tudresden/ws/ArealDetectorGetIDCount.java   |     4 +-
 .../ws/ArealDetectorGetIDCountResponse.java        |     8 +-
 .../de/tudresden/ws/ArealDetectorGetIDList.java    |     4 +-
 .../ws/ArealDetectorGetIDListResponse.java         |     4 +-
 .../ws/ArealDetectorGetJamLengthMeters.java        |     8 +-
 .../ArealDetectorGetJamLengthMetersResponse.java   |     8 +-
 .../ws/ArealDetectorGetJamLengthVehicle.java       |     8 +-
 .../ArealDetectorGetJamLengthVehicleResponse.java  |     8 +-
 .../ws/ArealDetectorGetLastStepMeanSpeed.java      |    60 +
 .../ArealDetectorGetLastStepMeanSpeedResponse.java |    54 +
 .../ws/ArealDetectorGetLastStepOccupancy.java      |    60 +
 .../ArealDetectorGetLastStepOccupancyResponse.java |    54 +
 .../java_wsclient/de/tudresden/ws/DoTimestep.java  |     4 +-
 .../de/tudresden/ws/DoTimestepResponse.java        |     4 +-
 .../de/tudresden/ws/EdgeAdaptTraveltime.java       |    12 +-
 .../tudresden/ws/EdgeAdaptTraveltimeResponse.java  |     4 +-
 .../de/tudresden/ws/EdgeGetAdaptedTraveltime.java  |    20 +-
 .../ws/EdgeGetAdaptedTraveltimeResponse.java       |     8 +-
 .../de/tudresden/ws/EdgeGetCO2Emission.java        |     8 +-
 .../tudresden/ws/EdgeGetCO2EmissionResponse.java   |     8 +-
 .../de/tudresden/ws/EdgeGetCOEmission.java         |     8 +-
 .../de/tudresden/ws/EdgeGetCOEmissionResponse.java |     8 +-
 .../de/tudresden/ws/EdgeGetEffort.java             |    20 +-
 .../de/tudresden/ws/EdgeGetEffortResponse.java     |     8 +-
 .../ws/EdgeGetElectricityConsumption.java          |    60 +
 .../ws/EdgeGetElectricityConsumptionResponse.java  |    54 +
 .../de/tudresden/ws/EdgeGetFuelConsumption.java    |     8 +-
 .../ws/EdgeGetFuelConsumptionResponse.java         |     8 +-
 .../de/tudresden/ws/EdgeGetHCEmission.java         |     8 +-
 .../de/tudresden/ws/EdgeGetHCEmissionResponse.java |     8 +-
 .../de/tudresden/ws/EdgeGetIDCount.java            |     4 +-
 .../de/tudresden/ws/EdgeGetIDCountResponse.java    |     8 +-
 .../de/tudresden/ws/EdgeGetIDList.java             |     4 +-
 .../de/tudresden/ws/EdgeGetIDListResponse.java     |     4 +-
 .../tudresden/ws/EdgeGetLastStepHaltingNumber.java |     8 +-
 .../ws/EdgeGetLastStepHaltingNumberResponse.java   |     8 +-
 .../de/tudresden/ws/EdgeGetLastStepLength.java     |     8 +-
 .../ws/EdgeGetLastStepLengthResponse.java          |     8 +-
 .../de/tudresden/ws/EdgeGetLastStepMeanSpeed.java  |     8 +-
 .../ws/EdgeGetLastStepMeanSpeedResponse.java       |     8 +-
 .../de/tudresden/ws/EdgeGetLastStepOccupancy.java  |     8 +-
 .../ws/EdgeGetLastStepOccupancyResponse.java       |     8 +-
 .../de/tudresden/ws/EdgeGetLastStepVehicleIDs.java |     8 +-
 .../ws/EdgeGetLastStepVehicleIDsResponse.java      |     4 +-
 .../tudresden/ws/EdgeGetLastStepVehicleNumber.java |     8 +-
 .../ws/EdgeGetLastStepVehicleNumberResponse.java   |     8 +-
 .../de/tudresden/ws/EdgeGetNOxEmission.java        |     8 +-
 .../tudresden/ws/EdgeGetNOxEmissionResponse.java   |     8 +-
 .../de/tudresden/ws/EdgeGetNoiseEmission.java      |     8 +-
 .../tudresden/ws/EdgeGetNoiseEmissionResponse.java |     8 +-
 .../de/tudresden/ws/EdgeGetPMxEmission.java        |     8 +-
 .../tudresden/ws/EdgeGetPMxEmissionResponse.java   |     8 +-
 .../de/tudresden/ws/EdgeGetTraveltime.java         |     8 +-
 .../de/tudresden/ws/EdgeGetTraveltimeResponse.java |     8 +-
 .../de/tudresden/ws/EdgeGetWaitingTime.java        |     8 +-
 .../tudresden/ws/EdgeGetWaitingTimeResponse.java   |     8 +-
 .../de/tudresden/ws/EdgeSetEffort.java             |    12 +-
 .../de/tudresden/ws/EdgeSetEffortResponse.java     |     4 +-
 .../de/tudresden/ws/EdgeSetMaxSpeed.java           |    12 +-
 .../de/tudresden/ws/EdgeSetMaxSpeedResponse.java   |     4 +-
 .../de/tudresden/ws/GUIClearPending.java           |    60 +
 .../de/tudresden/ws/GUIClearPendingResponse.java   |    32 +
 .../de/tudresden/ws/GUIGetBoundary.java            |     8 +-
 .../de/tudresden/ws/GUIGetBoundaryResponse.java    |     8 +-
 .../de/tudresden/ws/GUIGetIDList.java              |     4 +-
 .../de/tudresden/ws/GUIGetIDListResponse.java      |     4 +-
 .../de/tudresden/ws/GUIGetOffset.java              |     8 +-
 .../de/tudresden/ws/GUIGetOffsetResponse.java      |     8 +-
 .../de/tudresden/ws/GUIGetSchema.java              |     8 +-
 .../de/tudresden/ws/GUIGetSchemaResponse.java      |     8 +-
 .../java_wsclient/de/tudresden/ws/GUIGetZoom.java  |     8 +-
 .../de/tudresden/ws/GUIGetZoomResponse.java        |     8 +-
 .../de/tudresden/ws/GUIScreenshot.java             |    12 +-
 .../de/tudresden/ws/GUIScreenshotResponse.java     |     4 +-
 .../de/tudresden/ws/GUISetBoundary.java            |    24 +-
 .../de/tudresden/ws/GUISetBoundaryResponse.java    |     4 +-
 .../de/tudresden/ws/GUISetOffset.java              |    16 +-
 .../de/tudresden/ws/GUISetOffsetResponse.java      |     4 +-
 .../de/tudresden/ws/GUISetSchema.java              |    12 +-
 .../de/tudresden/ws/GUISetSchemaResponse.java      |     4 +-
 .../java_wsclient/de/tudresden/ws/GUISetZoom.java  |    12 +-
 .../de/tudresden/ws/GUISetZoomResponse.java        |     4 +-
 .../de/tudresden/ws/GUITrackVehicle.java           |    12 +-
 .../de/tudresden/ws/GUITrackVehicleResponse.java   |     4 +-
 .../java_wsclient/de/tudresden/ws/GetStatus.java   |     8 +-
 .../de/tudresden/ws/GetStatusResponse.java         |     8 +-
 .../de/tudresden/ws/InductionloopGetIDCount.java   |     4 +-
 .../ws/InductionloopGetIDCountResponse.java        |     8 +-
 .../de/tudresden/ws/InductionloopGetIDList.java    |     4 +-
 .../ws/InductionloopGetIDListResponse.java         |     4 +-
 .../de/tudresden/ws/InductionloopGetLaneID.java    |     8 +-
 .../ws/InductionloopGetLaneIDResponse.java         |     8 +-
 .../ws/InductionloopGetLastStepMeanLength.java     |     8 +-
 ...InductionloopGetLastStepMeanLengthResponse.java |     8 +-
 .../ws/InductionloopGetLastStepMeanSpeed.java      |     8 +-
 .../InductionloopGetLastStepMeanSpeedResponse.java |     8 +-
 .../ws/InductionloopGetLastStepOccupancy.java      |     8 +-
 .../InductionloopGetLastStepOccupancyResponse.java |     8 +-
 .../ws/InductionloopGetLastStepVehicleIDs.java     |     8 +-
 ...InductionloopGetLastStepVehicleIDsResponse.java |     4 +-
 .../ws/InductionloopGetLastStepVehicleNumber.java  |     8 +-
 ...uctionloopGetLastStepVehicleNumberResponse.java |     8 +-
 .../de/tudresden/ws/InductionloopGetPosition.java  |     8 +-
 .../ws/InductionloopGetPositionResponse.java       |     8 +-
 .../ws/InductionloopGetTimeSinceDetection.java     |     8 +-
 ...InductionloopGetTimeSinceDetectionResponse.java |     8 +-
 .../tudresden/ws/InductionloopGetVehicleData.java  |    51 +-
 .../ws/InductionloopGetVehicleDataResponse.java    |    24 +-
 .../de/tudresden/ws/JunctionGetIDCount.java        |     4 +-
 .../tudresden/ws/JunctionGetIDCountResponse.java   |     8 +-
 .../de/tudresden/ws/JunctionGetIDList.java         |     4 +-
 .../de/tudresden/ws/JunctionGetIDListResponse.java |     4 +-
 .../de/tudresden/ws/JunctionGetPosition.java       |     8 +-
 .../tudresden/ws/JunctionGetPositionResponse.java  |     8 +-
 .../de/tudresden/ws/JunctionGetShape.java          |     8 +-
 .../de/tudresden/ws/JunctionGetShapeResponse.java  |     8 +-
 .../de/tudresden/ws/LaneGetAllowed.java            |     8 +-
 .../de/tudresden/ws/LaneGetAllowedResponse.java    |     4 +-
 .../de/tudresden/ws/LaneGetCO2Emission.java        |     8 +-
 .../tudresden/ws/LaneGetCO2EmissionResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetCOEmission.java         |     8 +-
 .../de/tudresden/ws/LaneGetCOEmissionResponse.java |     8 +-
 .../de/tudresden/ws/LaneGetDisallowed.java         |     8 +-
 .../de/tudresden/ws/LaneGetDisallowedResponse.java |     4 +-
 .../de/tudresden/ws/LaneGetEdgeID.java             |     8 +-
 .../de/tudresden/ws/LaneGetEdgeIDResponse.java     |     8 +-
 .../ws/LaneGetElectricityConsumption.java          |    60 +
 .../ws/LaneGetElectricityConsumptionResponse.java  |    62 +
 .../de/tudresden/ws/LaneGetFuelConsumption.java    |     8 +-
 .../ws/LaneGetFuelConsumptionResponse.java         |     8 +-
 .../de/tudresden/ws/LaneGetHCEmission.java         |     8 +-
 .../de/tudresden/ws/LaneGetHCEmissionResponse.java |     8 +-
 .../de/tudresden/ws/LaneGetIDCount.java            |     4 +-
 .../de/tudresden/ws/LaneGetIDCountResponse.java    |     8 +-
 .../de/tudresden/ws/LaneGetIDList.java             |     4 +-
 .../de/tudresden/ws/LaneGetIDListResponse.java     |     4 +-
 .../tudresden/ws/LaneGetLastStepHaltingNumber.java |     8 +-
 .../ws/LaneGetLastStepHaltingNumberResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetLastStepLength.java     |     8 +-
 .../ws/LaneGetLastStepLengthResponse.java          |     8 +-
 .../de/tudresden/ws/LaneGetLastStepMeanSpeed.java  |     8 +-
 .../ws/LaneGetLastStepMeanSpeedResponse.java       |     8 +-
 .../de/tudresden/ws/LaneGetLastStepOccupancy.java  |     8 +-
 .../ws/LaneGetLastStepOccupancyResponse.java       |     8 +-
 .../de/tudresden/ws/LaneGetLastStepVehicleIDs.java |     8 +-
 .../ws/LaneGetLastStepVehicleIDsResponse.java      |     4 +-
 .../tudresden/ws/LaneGetLastStepVehicleNumber.java |     8 +-
 .../ws/LaneGetLastStepVehicleNumberResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetLength.java             |     8 +-
 .../de/tudresden/ws/LaneGetLengthResponse.java     |     8 +-
 .../de/tudresden/ws/LaneGetLinkNumber.java         |     8 +-
 .../de/tudresden/ws/LaneGetLinkNumberResponse.java |    16 +-
 .../de/tudresden/ws/LaneGetLinks.java              |     8 +-
 .../de/tudresden/ws/LaneGetLinksResponse.java      |    14 +-
 .../de/tudresden/ws/LaneGetMaxSpeed.java           |     8 +-
 .../de/tudresden/ws/LaneGetMaxSpeedResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetNOxEmission.java        |     8 +-
 .../tudresden/ws/LaneGetNOxEmissionResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetNoiseEmission.java      |     8 +-
 .../tudresden/ws/LaneGetNoiseEmissionResponse.java |     8 +-
 .../de/tudresden/ws/LaneGetPMxEmission.java        |     8 +-
 .../tudresden/ws/LaneGetPMxEmissionResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetShape.java              |     8 +-
 .../de/tudresden/ws/LaneGetShapeResponse.java      |     8 +-
 .../de/tudresden/ws/LaneGetTraveltime.java         |     8 +-
 .../de/tudresden/ws/LaneGetTraveltimeResponse.java |     8 +-
 .../de/tudresden/ws/LaneGetWaitingTime.java        |     8 +-
 .../tudresden/ws/LaneGetWaitingTimeResponse.java   |     8 +-
 .../de/tudresden/ws/LaneGetWidth.java              |     8 +-
 .../de/tudresden/ws/LaneGetWidthResponse.java      |     8 +-
 .../de/tudresden/ws/LaneSetAllowed.java            |     8 +-
 .../de/tudresden/ws/LaneSetAllowedResponse.java    |     4 +-
 .../de/tudresden/ws/LaneSetDisallowed.java         |     8 +-
 .../de/tudresden/ws/LaneSetDisallowedResponse.java |     4 +-
 .../de/tudresden/ws/LaneSetLength.java             |    12 +-
 .../de/tudresden/ws/LaneSetLengthResponse.java     |     4 +-
 .../de/tudresden/ws/LaneSetMaxSpeed.java           |    12 +-
 .../de/tudresden/ws/LaneSetMaxSpeedResponse.java   |     4 +-
 .../de/tudresden/ws/LastActionTime.java            |     4 +-
 .../de/tudresden/ws/LastActionTimeResponse.java    |     8 +-
 .../de/tudresden/ws/MultientryexitGetIDCount.java  |     4 +-
 .../ws/MultientryexitGetIDCountResponse.java       |     8 +-
 .../de/tudresden/ws/MultientryexitGetIDList.java   |     4 +-
 .../ws/MultientryexitGetIDListResponse.java        |     4 +-
 .../ws/MultientryexitGetLastStepHaltingNumber.java |     8 +-
 ...ientryexitGetLastStepHaltingNumberResponse.java |     8 +-
 .../ws/MultientryexitGetLastStepMeanSpeed.java     |     8 +-
 ...MultientryexitGetLastStepMeanSpeedResponse.java |     8 +-
 .../ws/MultientryexitGetLastStepVehicleIDs.java    |     8 +-
 ...ultientryexitGetLastStepVehicleIDsResponse.java |     4 +-
 .../ws/MultientryexitGetLastStepVehicleNumber.java |     8 +-
 ...ientryexitGetLastStepVehicleNumberResponse.java |     8 +-
 .../de/tudresden/ws/ObjectFactory.java             |  9632 +++++----
 .../de/tudresden/ws/PersonGetAngle.java            |    60 +
 .../de/tudresden/ws/PersonGetAngleResponse.java    |    54 +
 .../de/tudresden/ws/PersonGetColor.java            |    60 +
 .../de/tudresden/ws/PersonGetColorResponse.java    |    62 +
 .../de/tudresden/ws/PersonGetIDCount.java          |    32 +
 .../de/tudresden/ws/PersonGetIDCountResponse.java  |    54 +
 .../de/tudresden/ws/PersonGetIDList.java           |    32 +
 .../de/tudresden/ws/PersonGetIDListResponse.java   |    69 +
 .../de/tudresden/ws/PersonGetLanePosition.java     |    60 +
 .../ws/PersonGetLanePositionResponse.java          |    54 +
 .../de/tudresden/ws/PersonGetLength.java           |    60 +
 .../de/tudresden/ws/PersonGetLengthResponse.java   |    54 +
 .../de/tudresden/ws/PersonGetMinGap.java           |    60 +
 .../de/tudresden/ws/PersonGetMinGapResponse.java   |    54 +
 .../de/tudresden/ws/PersonGetPersonNumber.java     |    60 +
 .../ws/PersonGetPersonNumberResponse.java          |    54 +
 .../de/tudresden/ws/PersonGetPosition.java         |    60 +
 .../de/tudresden/ws/PersonGetPosition3D.java       |    60 +
 .../tudresden/ws/PersonGetPosition3DResponse.java  |    62 +
 .../de/tudresden/ws/PersonGetPositionResponse.java |    62 +
 .../de/tudresden/ws/PersonGetRoadID.java           |    60 +
 .../de/tudresden/ws/PersonGetRoadIDResponse.java   |    62 +
 .../de/tudresden/ws/PersonGetSpeed.java            |    60 +
 .../de/tudresden/ws/PersonGetSpeedResponse.java    |    54 +
 .../de/tudresden/ws/PersonGetTypeID.java           |    60 +
 .../de/tudresden/ws/PersonGetTypeIDResponse.java   |    62 +
 .../de/tudresden/ws/PersonGetWaitingTime.java      |    60 +
 .../tudresden/ws/PersonGetWaitingTimeResponse.java |    54 +
 .../java_wsclient/de/tudresden/ws/PoiAdd.java      |    28 +-
 .../de/tudresden/ws/PoiAddResponse.java            |    28 +-
 .../java_wsclient/de/tudresden/ws/PoiGetColor.java |     8 +-
 .../de/tudresden/ws/PoiGetColorResponse.java       |     8 +-
 .../de/tudresden/ws/PoiGetIDCount.java             |     4 +-
 .../de/tudresden/ws/PoiGetIDCountResponse.java     |     8 +-
 .../de/tudresden/ws/PoiGetIDList.java              |     4 +-
 .../de/tudresden/ws/PoiGetIDListResponse.java      |     4 +-
 .../de/tudresden/ws/PoiGetPosition.java            |     8 +-
 .../de/tudresden/ws/PoiGetPositionResponse.java    |     8 +-
 .../java_wsclient/de/tudresden/ws/PoiGetType.java  |     8 +-
 .../de/tudresden/ws/PoiGetTypeResponse.java        |     8 +-
 .../java_wsclient/de/tudresden/ws/PoiRemove.java   |    12 +-
 .../de/tudresden/ws/PoiRemoveResponse.java         |     4 +-
 .../java_wsclient/de/tudresden/ws/PoiSetColor.java |    12 +-
 .../de/tudresden/ws/PoiSetColorResponse.java       |     4 +-
 .../de/tudresden/ws/PoiSetPosition.java            |    16 +-
 .../de/tudresden/ws/PoiSetPositionResponse.java    |     4 +-
 .../java_wsclient/de/tudresden/ws/PoiSetType.java  |    12 +-
 .../de/tudresden/ws/PoiSetTypeResponse.java        |     4 +-
 .../java_wsclient/de/tudresden/ws/PolygonAdd.java  |    28 +-
 .../de/tudresden/ws/PolygonAddResponse.java        |     4 +-
 .../de/tudresden/ws/PolygonGetColor.java           |     8 +-
 .../de/tudresden/ws/PolygonGetColorResponse.java   |     8 +-
 .../de/tudresden/ws/PolygonGetIDCount.java         |     4 +-
 .../de/tudresden/ws/PolygonGetIDCountResponse.java |     8 +-
 .../de/tudresden/ws/PolygonGetIDList.java          |     4 +-
 .../de/tudresden/ws/PolygonGetIDListResponse.java  |     4 +-
 .../de/tudresden/ws/PolygonGetShape.java           |     8 +-
 .../de/tudresden/ws/PolygonGetShapeResponse.java   |     8 +-
 .../de/tudresden/ws/PolygonGetType.java            |     8 +-
 .../de/tudresden/ws/PolygonGetTypeResponse.java    |     8 +-
 .../de/tudresden/ws/PolygonRemove.java             |    12 +-
 .../de/tudresden/ws/PolygonRemoveResponse.java     |     4 +-
 .../de/tudresden/ws/PolygonSetColor.java           |    12 +-
 .../de/tudresden/ws/PolygonSetColorResponse.java   |     4 +-
 .../de/tudresden/ws/PolygonSetShape.java           |     8 +-
 .../de/tudresden/ws/PolygonSetShapeResponse.java   |     4 +-
 .../de/tudresden/ws/PolygonSetType.java            |    12 +-
 .../de/tudresden/ws/PolygonSetTypeResponse.java    |     4 +-
 .../java_wsclient/de/tudresden/ws/RouteAdd.java    |     8 +-
 .../de/tudresden/ws/RouteAddResponse.java          |     4 +-
 .../de/tudresden/ws/RouteGetEdges.java             |     8 +-
 .../de/tudresden/ws/RouteGetEdgesResponse.java     |     4 +-
 .../de/tudresden/ws/RouteGetIDCount.java           |     4 +-
 .../de/tudresden/ws/RouteGetIDCountResponse.java   |     8 +-
 .../de/tudresden/ws/RouteGetIDList.java            |     4 +-
 .../de/tudresden/ws/RouteGetIDListResponse.java    |     4 +-
 .../java_wsclient/de/tudresden/ws/ServiceImpl.java |  5334 ++---
 .../java_wsclient/de/tudresden/ws/SetConfig.java   |     8 +-
 .../de/tudresden/ws/SetConfigResponse.java         |     4 +-
 .../de/tudresden/ws/SetSumoBinary.java             |     8 +-
 .../de/tudresden/ws/SetSumoBinaryResponse.java     |     4 +-
 .../de/tudresden/ws/SimulationConvert2D.java       |    20 +-
 .../tudresden/ws/SimulationConvert2DResponse.java  |     4 +-
 .../de/tudresden/ws/SimulationConvert3D.java       |   125 +
 .../tudresden/ws/SimulationConvert3DResponse.java  |    69 +
 .../de/tudresden/ws/SimulationConvertGeo.java      |    16 +-
 .../tudresden/ws/SimulationConvertGeoResponse.java |     4 +-
 .../de/tudresden/ws/SimulationConvertRoad.java     |    16 +-
 .../ws/SimulationConvertRoadResponse.java          |     8 +-
 .../tudresden/ws/SimulationGetArrivedIDList.java   |     4 +-
 .../ws/SimulationGetArrivedIDListResponse.java     |     4 +-
 .../tudresden/ws/SimulationGetArrivedNumber.java   |     4 +-
 .../ws/SimulationGetArrivedNumberResponse.java     |     8 +-
 .../tudresden/ws/SimulationGetBusStopWaiting.java  |     4 +-
 .../ws/SimulationGetBusStopWaitingResponse.java    |     8 +-
 .../de/tudresden/ws/SimulationGetCurrentTime.java  |     4 +-
 .../ws/SimulationGetCurrentTimeResponse.java       |     8 +-
 .../de/tudresden/ws/SimulationGetDeltaT.java       |     4 +-
 .../tudresden/ws/SimulationGetDeltaTResponse.java  |     8 +-
 .../tudresden/ws/SimulationGetDepartedIDList.java  |     4 +-
 .../ws/SimulationGetDepartedIDListResponse.java    |     4 +-
 .../tudresden/ws/SimulationGetDepartedNumber.java  |     4 +-
 .../ws/SimulationGetDepartedNumberResponse.java    |     8 +-
 .../de/tudresden/ws/SimulationGetDistance2D.java   |    60 +-
 .../ws/SimulationGetDistance2DResponse.java        |     8 +-
 .../de/tudresden/ws/SimulationGetDistanceRoad.java |    40 +-
 .../ws/SimulationGetDistanceRoadResponse.java      |     8 +-
 .../ws/SimulationGetEndingTeleportIDList.java      |     4 +-
 .../SimulationGetEndingTeleportIDListResponse.java |     4 +-
 .../ws/SimulationGetEndingTeleportNumber.java      |     4 +-
 .../SimulationGetEndingTeleportNumberResponse.java |     8 +-
 .../de/tudresden/ws/SimulationGetLoadedIDList.java |     4 +-
 .../ws/SimulationGetLoadedIDListResponse.java      |     4 +-
 .../de/tudresden/ws/SimulationGetLoadedNumber.java |     4 +-
 .../ws/SimulationGetLoadedNumberResponse.java      |     8 +-
 .../ws/SimulationGetMinExpectedNumber.java         |     4 +-
 .../ws/SimulationGetMinExpectedNumberResponse.java |     8 +-
 .../de/tudresden/ws/SimulationGetNetBoundary.java  |     4 +-
 .../ws/SimulationGetNetBoundaryResponse.java       |     4 +-
 .../SimulationGetParkingEndingVehiclesIDList.java  |     4 +-
 ...tionGetParkingEndingVehiclesIDListResponse.java |     4 +-
 .../SimulationGetParkingEndingVehiclesNumber.java  |     4 +-
 ...tionGetParkingEndingVehiclesNumberResponse.java |     8 +-
 ...SimulationGetParkingStartingVehiclesIDList.java |     4 +-
 ...onGetParkingStartingVehiclesIDListResponse.java |     4 +-
 ...SimulationGetParkingStartingVehiclesNumber.java |     4 +-
 ...onGetParkingStartingVehiclesNumberResponse.java |     8 +-
 .../ws/SimulationGetStartingTeleportIDList.java    |     4 +-
 ...imulationGetStartingTeleportIDListResponse.java |     4 +-
 .../ws/SimulationGetStartingTeleportNumber.java    |     4 +-
 ...imulationGetStartingTeleportNumberResponse.java |     8 +-
 .../ws/SimulationGetStopEndingVehiclesIDList.java  |     4 +-
 ...ulationGetStopEndingVehiclesIDListResponse.java |     4 +-
 .../ws/SimulationGetStopEndingVehiclesNumber.java  |     4 +-
 ...ulationGetStopEndingVehiclesNumberResponse.java |     8 +-
 .../SimulationGetStopStartingVehiclesIDList.java   |     4 +-
 ...ationGetStopStartingVehiclesIDListResponse.java |     4 +-
 .../SimulationGetStopStartingVehiclesNumber.java   |     4 +-
 ...ationGetStopStartingVehiclesNumberResponse.java |     8 +-
 .../java_wsclient/de/tudresden/ws/Start.java       |     8 +-
 .../de/tudresden/ws/StartResponse.java             |     8 +-
 .../java_wsclient/de/tudresden/ws/Stop.java        |     8 +-
 .../de/tudresden/ws/StopResponse.java              |     8 +-
 .../de/tudresden/ws/SumoBoundingBox.java           |    20 +-
 .../java_wsclient/de/tudresden/ws/SumoColor.java   |    20 +-
 .../de/tudresden/ws/SumoGeometry.java              |     4 +-
 .../java_wsclient/de/tudresden/ws/SumoLink.java    |   298 +
 .../de/tudresden/ws/SumoPosition2D.java            |    12 +-
 .../de/tudresden/ws/SumoPosition3D.java            |    90 +
 .../de/tudresden/ws/SumoStopFlags.java             |   147 +
 .../de/tudresden/ws/SumoTLSController.java         |   236 +
 .../de/tudresden/ws/SumoTLSLogic.java              |   153 -
 .../de/tudresden/ws/SumoTLSPhase.java              |    20 +-
 .../de/tudresden/ws/SumoTLSProgram.java            |   153 +
 .../de/tudresden/ws/SumoVehicleData.java           |    69 +
 .../de/tudresden/ws/SumoWebservice.java            |    94 -
 .../java_wsclient/de/tudresden/ws/TXTOutput.java   |     8 +-
 .../de/tudresden/ws/TXTOutputResponse.java         |     8 +-
 .../java_wsclient/de/tudresden/ws/TraasWS.java     |    94 +
 ...clightsGetCompleteRedYellowGreenDefinition.java |     8 +-
 ...etCompleteRedYellowGreenDefinitionResponse.java |    20 +-
 .../ws/TrafficlightsGetControlledLanes.java        |     8 +-
 .../TrafficlightsGetControlledLanesResponse.java   |     4 +-
 .../ws/TrafficlightsGetControlledLinks.java        |     8 +-
 .../TrafficlightsGetControlledLinksResponse.java   |     4 +-
 .../de/tudresden/ws/TrafficlightsGetIDCount.java   |     4 +-
 .../ws/TrafficlightsGetIDCountResponse.java        |     8 +-
 .../de/tudresden/ws/TrafficlightsGetIDList.java    |     4 +-
 .../ws/TrafficlightsGetIDListResponse.java         |     4 +-
 .../tudresden/ws/TrafficlightsGetNextSwitch.java   |     8 +-
 .../ws/TrafficlightsGetNextSwitchResponse.java     |     8 +-
 .../de/tudresden/ws/TrafficlightsGetPhase.java     |     8 +-
 .../ws/TrafficlightsGetPhaseDuration.java          |     8 +-
 .../ws/TrafficlightsGetPhaseDurationResponse.java  |     8 +-
 .../ws/TrafficlightsGetPhaseResponse.java          |     8 +-
 .../de/tudresden/ws/TrafficlightsGetProgram.java   |     8 +-
 .../ws/TrafficlightsGetProgramResponse.java        |     8 +-
 .../ws/TrafficlightsGetRedYellowGreenState.java    |     8 +-
 ...rafficlightsGetRedYellowGreenStateResponse.java |     8 +-
 ...clightsSetCompleteRedYellowGreenDefinition.java |    24 +-
 ...etCompleteRedYellowGreenDefinitionResponse.java |     4 +-
 .../de/tudresden/ws/TrafficlightsSetPhase.java     |    12 +-
 .../ws/TrafficlightsSetPhaseDuration.java          |    12 +-
 .../ws/TrafficlightsSetPhaseDurationResponse.java  |     4 +-
 .../ws/TrafficlightsSetPhaseResponse.java          |     4 +-
 .../de/tudresden/ws/TrafficlightsSetProgram.java   |    12 +-
 .../ws/TrafficlightsSetProgramResponse.java        |     4 +-
 .../ws/TrafficlightsSetRedYellowGreenState.java    |    12 +-
 ...rafficlightsSetRedYellowGreenStateResponse.java |     4 +-
 .../java_wsclient/de/tudresden/ws/VehicleAdd.java  |    32 +-
 .../de/tudresden/ws/VehicleAddResponse.java        |     4 +-
 .../de/tudresden/ws/VehicleChangeLane.java         |    16 +-
 .../de/tudresden/ws/VehicleChangeLaneResponse.java |     4 +-
 .../de/tudresden/ws/VehicleChangeTarget.java       |    12 +-
 .../tudresden/ws/VehicleChangeTargetResponse.java  |     4 +-
 .../java_wsclient/de/tudresden/ws/VehicleData.java |   147 +
 .../de/tudresden/ws/VehicleGetAccel.java           |     8 +-
 .../de/tudresden/ws/VehicleGetAccelResponse.java   |     8 +-
 .../tudresden/ws/VehicleGetAdaptedTraveltime.java  |    24 +-
 .../ws/VehicleGetAdaptedTraveltimeResponse.java    |     8 +-
 .../de/tudresden/ws/VehicleGetAllowedSpeed.java    |     8 +-
 .../ws/VehicleGetAllowedSpeedResponse.java         |     8 +-
 .../de/tudresden/ws/VehicleGetAngle.java           |     8 +-
 .../de/tudresden/ws/VehicleGetAngleResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleGetBestLanes.java       |     8 +-
 .../tudresden/ws/VehicleGetBestLanesResponse.java  |     4 +-
 .../de/tudresden/ws/VehicleGetCO2Emission.java     |     8 +-
 .../ws/VehicleGetCO2EmissionResponse.java          |     8 +-
 .../de/tudresden/ws/VehicleGetCOEmission.java      |     8 +-
 .../tudresden/ws/VehicleGetCOEmissionResponse.java |     8 +-
 .../de/tudresden/ws/VehicleGetColor.java           |     8 +-
 .../de/tudresden/ws/VehicleGetColorResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleGetDecel.java           |     8 +-
 .../de/tudresden/ws/VehicleGetDecelResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleGetDistance.java        |     8 +-
 .../tudresden/ws/VehicleGetDistanceResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleGetDrivingDistance.java |    28 +-
 .../tudresden/ws/VehicleGetDrivingDistance2D.java  |    16 +-
 .../ws/VehicleGetDrivingDistance2DResponse.java    |     8 +-
 .../ws/VehicleGetDrivingDistanceResponse.java      |     8 +-
 .../de/tudresden/ws/VehicleGetEffort.java          |    24 +-
 .../de/tudresden/ws/VehicleGetEffortResponse.java  |     8 +-
 .../ws/VehicleGetElectricityConsumption.java       |    60 +
 .../VehicleGetElectricityConsumptionResponse.java  |    54 +
 .../de/tudresden/ws/VehicleGetEmissionClass.java   |     8 +-
 .../ws/VehicleGetEmissionClassResponse.java        |     8 +-
 .../de/tudresden/ws/VehicleGetFuelConsumption.java |     8 +-
 .../ws/VehicleGetFuelConsumptionResponse.java      |     8 +-
 .../de/tudresden/ws/VehicleGetHCEmission.java      |     8 +-
 .../tudresden/ws/VehicleGetHCEmissionResponse.java |     8 +-
 .../de/tudresden/ws/VehicleGetIDCount.java         |     4 +-
 .../de/tudresden/ws/VehicleGetIDCountResponse.java |     8 +-
 .../de/tudresden/ws/VehicleGetIDList.java          |     4 +-
 .../de/tudresden/ws/VehicleGetIDListResponse.java  |     4 +-
 .../de/tudresden/ws/VehicleGetImperfection.java    |     8 +-
 .../ws/VehicleGetImperfectionResponse.java         |     8 +-
 .../de/tudresden/ws/VehicleGetLaneID.java          |     8 +-
 .../de/tudresden/ws/VehicleGetLaneIDResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleGetLaneIndex.java       |     8 +-
 .../tudresden/ws/VehicleGetLaneIndexResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleGetLanePosition.java    |     8 +-
 .../ws/VehicleGetLanePositionResponse.java         |     8 +-
 .../de/tudresden/ws/VehicleGetLeader.java          |    79 +
 .../de/tudresden/ws/VehicleGetLeaderResponse.java  |    62 +
 .../de/tudresden/ws/VehicleGetLength.java          |     8 +-
 .../de/tudresden/ws/VehicleGetLengthResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleGetMaxSpeed.java        |     8 +-
 .../tudresden/ws/VehicleGetMaxSpeedResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleGetMinGap.java          |     8 +-
 .../de/tudresden/ws/VehicleGetMinGapResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleGetNOxEmission.java     |     8 +-
 .../ws/VehicleGetNOxEmissionResponse.java          |     8 +-
 .../de/tudresden/ws/VehicleGetNoiseEmission.java   |     8 +-
 .../ws/VehicleGetNoiseEmissionResponse.java        |     8 +-
 .../de/tudresden/ws/VehicleGetPMxEmission.java     |     8 +-
 .../ws/VehicleGetPMxEmissionResponse.java          |     8 +-
 .../de/tudresden/ws/VehicleGetPersonNumber.java    |     8 +-
 .../ws/VehicleGetPersonNumberResponse.java         |     8 +-
 .../de/tudresden/ws/VehicleGetPosition.java        |     8 +-
 .../de/tudresden/ws/VehicleGetPosition3D.java      |    60 +
 .../tudresden/ws/VehicleGetPosition3DResponse.java |    62 +
 .../tudresden/ws/VehicleGetPositionResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleGetRoadID.java          |     8 +-
 .../de/tudresden/ws/VehicleGetRoadIDResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleGetRoute.java           |     8 +-
 .../de/tudresden/ws/VehicleGetRouteID.java         |     8 +-
 .../de/tudresden/ws/VehicleGetRouteIDResponse.java |     8 +-
 .../de/tudresden/ws/VehicleGetRouteResponse.java   |     4 +-
 .../de/tudresden/ws/VehicleGetShapeClass.java      |     8 +-
 .../tudresden/ws/VehicleGetShapeClassResponse.java |     8 +-
 .../de/tudresden/ws/VehicleGetSignals.java         |     8 +-
 .../de/tudresden/ws/VehicleGetSignalsResponse.java |     8 +-
 .../de/tudresden/ws/VehicleGetSlope.java           |    60 +
 .../de/tudresden/ws/VehicleGetSlopeResponse.java   |    54 +
 .../de/tudresden/ws/VehicleGetSpeed.java           |     8 +-
 .../de/tudresden/ws/VehicleGetSpeedDeviation.java  |     8 +-
 .../ws/VehicleGetSpeedDeviationResponse.java       |     8 +-
 .../de/tudresden/ws/VehicleGetSpeedFactor.java     |     8 +-
 .../ws/VehicleGetSpeedFactorResponse.java          |     8 +-
 .../de/tudresden/ws/VehicleGetSpeedMode.java       |    60 +
 .../tudresden/ws/VehicleGetSpeedModeResponse.java  |    54 +
 .../de/tudresden/ws/VehicleGetSpeedResponse.java   |     8 +-
 .../tudresden/ws/VehicleGetSpeedWithoutTraCI.java  |     8 +-
 .../ws/VehicleGetSpeedWithoutTraCIResponse.java    |     8 +-
 .../de/tudresden/ws/VehicleGetTau.java             |     8 +-
 .../de/tudresden/ws/VehicleGetTauResponse.java     |     8 +-
 .../de/tudresden/ws/VehicleGetTypeID.java          |     8 +-
 .../de/tudresden/ws/VehicleGetTypeIDResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleGetVehicleClass.java    |     8 +-
 .../ws/VehicleGetVehicleClassResponse.java         |     8 +-
 .../de/tudresden/ws/VehicleGetWaitingTime.java     |     8 +-
 .../ws/VehicleGetWaitingTimeResponse.java          |     8 +-
 .../de/tudresden/ws/VehicleGetWidth.java           |     8 +-
 .../de/tudresden/ws/VehicleGetWidthResponse.java   |     8 +-
 .../de/tudresden/ws/VehicleIsRouteValid.java       |     8 +-
 .../tudresden/ws/VehicleIsRouteValidResponse.java  |     8 +-
 .../de/tudresden/ws/VehicleMoveTo.java             |    16 +-
 .../de/tudresden/ws/VehicleMoveToResponse.java     |     4 +-
 .../de/tudresden/ws/VehicleMoveToVTD.java          |   144 -
 .../de/tudresden/ws/VehicleMoveToVTDResponse.java  |    32 -
 .../de/tudresden/ws/VehicleRemove.java             |    12 +-
 .../de/tudresden/ws/VehicleRemoveResponse.java     |     4 +-
 .../de/tudresden/ws/VehicleRerouteEffort.java      |     8 +-
 .../tudresden/ws/VehicleRerouteEffortResponse.java |     4 +-
 .../de/tudresden/ws/VehicleRerouteTraveltime.java  |     8 +-
 .../ws/VehicleRerouteTraveltimeResponse.java       |     4 +-
 .../de/tudresden/ws/VehicleResume.java             |    60 +
 .../de/tudresden/ws/VehicleResumeResponse.java     |    32 +
 .../de/tudresden/ws/VehicleSetAccel.java           |    12 +-
 .../de/tudresden/ws/VehicleSetAccelResponse.java   |     4 +-
 .../tudresden/ws/VehicleSetAdaptedTraveltime.java  |    24 +-
 .../ws/VehicleSetAdaptedTraveltimeResponse.java    |     4 +-
 .../de/tudresden/ws/VehicleSetColor.java           |    12 +-
 .../de/tudresden/ws/VehicleSetColorResponse.java   |     4 +-
 .../de/tudresden/ws/VehicleSetDecel.java           |    12 +-
 .../de/tudresden/ws/VehicleSetDecelResponse.java   |     4 +-
 .../de/tudresden/ws/VehicleSetEffort.java          |    24 +-
 .../de/tudresden/ws/VehicleSetEffortResponse.java  |     4 +-
 .../de/tudresden/ws/VehicleSetEmissionClass.java   |    12 +-
 .../ws/VehicleSetEmissionClassResponse.java        |     4 +-
 .../de/tudresden/ws/VehicleSetImperfection.java    |    12 +-
 .../ws/VehicleSetImperfectionResponse.java         |     4 +-
 .../de/tudresden/ws/VehicleSetLaneChangeMode.java  |    12 +-
 .../ws/VehicleSetLaneChangeModeResponse.java       |    28 +-
 .../de/tudresden/ws/VehicleSetLength.java          |    12 +-
 .../de/tudresden/ws/VehicleSetLengthResponse.java  |     4 +-
 .../de/tudresden/ws/VehicleSetMaxSpeed.java        |    12 +-
 .../tudresden/ws/VehicleSetMaxSpeedResponse.java   |     4 +-
 .../de/tudresden/ws/VehicleSetMinGap.java          |    12 +-
 .../de/tudresden/ws/VehicleSetMinGapResponse.java  |     4 +-
 .../de/tudresden/ws/VehicleSetRoute.java           |     8 +-
 .../de/tudresden/ws/VehicleSetRouteID.java         |    12 +-
 .../de/tudresden/ws/VehicleSetRouteIDResponse.java |     4 +-
 .../de/tudresden/ws/VehicleSetRouteResponse.java   |    28 +-
 .../de/tudresden/ws/VehicleSetShapeClass.java      |    12 +-
 .../tudresden/ws/VehicleSetShapeClassResponse.java |     4 +-
 .../de/tudresden/ws/VehicleSetSignals.java         |    28 +-
 .../de/tudresden/ws/VehicleSetSignalsResponse.java |     4 +-
 .../de/tudresden/ws/VehicleSetSpeed.java           |    12 +-
 .../de/tudresden/ws/VehicleSetSpeedDeviation.java  |    12 +-
 .../ws/VehicleSetSpeedDeviationResponse.java       |     4 +-
 .../de/tudresden/ws/VehicleSetSpeedFactor.java     |    12 +-
 .../ws/VehicleSetSpeedFactorResponse.java          |     4 +-
 .../de/tudresden/ws/VehicleSetSpeedResponse.java   |     4 +-
 .../de/tudresden/ws/VehicleSetStop.java            |    53 +-
 .../de/tudresden/ws/VehicleSetStopResponse.java    |     4 +-
 .../de/tudresden/ws/VehicleSetTau.java             |    12 +-
 .../de/tudresden/ws/VehicleSetTauResponse.java     |     4 +-
 .../de/tudresden/ws/VehicleSetType.java            |    12 +-
 .../de/tudresden/ws/VehicleSetTypeResponse.java    |    28 +-
 .../de/tudresden/ws/VehicleSetVehicleClass.java    |    12 +-
 .../ws/VehicleSetVehicleClassResponse.java         |     4 +-
 .../de/tudresden/ws/VehicleSetWidth.java           |    12 +-
 .../de/tudresden/ws/VehicleSetWidthResponse.java   |     4 +-
 .../de/tudresden/ws/VehicleSlowDown.java           |    16 +-
 .../de/tudresden/ws/VehicleSlowDownResponse.java   |    28 +-
 .../de/tudresden/ws/VehicletypeGetAccel.java       |     8 +-
 .../tudresden/ws/VehicletypeGetAccelResponse.java  |     8 +-
 .../de/tudresden/ws/VehicletypeGetColor.java       |     8 +-
 .../tudresden/ws/VehicletypeGetColorResponse.java  |     8 +-
 .../de/tudresden/ws/VehicletypeGetDecel.java       |     8 +-
 .../tudresden/ws/VehicletypeGetDecelResponse.java  |     8 +-
 .../tudresden/ws/VehicletypeGetEmissionClass.java  |     8 +-
 .../ws/VehicletypeGetEmissionClassResponse.java    |     8 +-
 .../de/tudresden/ws/VehicletypeGetIDCount.java     |     4 +-
 .../ws/VehicletypeGetIDCountResponse.java          |     8 +-
 .../de/tudresden/ws/VehicletypeGetIDList.java      |     4 +-
 .../tudresden/ws/VehicletypeGetIDListResponse.java |     4 +-
 .../tudresden/ws/VehicletypeGetImperfection.java   |     8 +-
 .../ws/VehicletypeGetImperfectionResponse.java     |     8 +-
 .../de/tudresden/ws/VehicletypeGetLength.java      |     8 +-
 .../tudresden/ws/VehicletypeGetLengthResponse.java |     8 +-
 .../de/tudresden/ws/VehicletypeGetMaxSpeed.java    |     8 +-
 .../ws/VehicletypeGetMaxSpeedResponse.java         |     8 +-
 .../de/tudresden/ws/VehicletypeGetMinGap.java      |     8 +-
 .../tudresden/ws/VehicletypeGetMinGapResponse.java |     8 +-
 .../de/tudresden/ws/VehicletypeGetShapeClass.java  |     8 +-
 .../ws/VehicletypeGetShapeClassResponse.java       |     8 +-
 .../tudresden/ws/VehicletypeGetSpeedDeviation.java |     8 +-
 .../ws/VehicletypeGetSpeedDeviationResponse.java   |     8 +-
 .../de/tudresden/ws/VehicletypeGetSpeedFactor.java |     8 +-
 .../ws/VehicletypeGetSpeedFactorResponse.java      |     8 +-
 .../de/tudresden/ws/VehicletypeGetTau.java         |     8 +-
 .../de/tudresden/ws/VehicletypeGetTauResponse.java |     8 +-
 .../tudresden/ws/VehicletypeGetVehicleClass.java   |     8 +-
 .../ws/VehicletypeGetVehicleClassResponse.java     |     8 +-
 .../de/tudresden/ws/VehicletypeGetWidth.java       |     8 +-
 .../tudresden/ws/VehicletypeGetWidthResponse.java  |     8 +-
 .../de/tudresden/ws/VehicletypeSetAccel.java       |    12 +-
 .../tudresden/ws/VehicletypeSetAccelResponse.java  |     4 +-
 .../de/tudresden/ws/VehicletypeSetColor.java       |    12 +-
 .../tudresden/ws/VehicletypeSetColorResponse.java  |     4 +-
 .../de/tudresden/ws/VehicletypeSetDecel.java       |    12 +-
 .../tudresden/ws/VehicletypeSetDecelResponse.java  |     4 +-
 .../tudresden/ws/VehicletypeSetEmissionClass.java  |    12 +-
 .../ws/VehicletypeSetEmissionClassResponse.java    |     4 +-
 .../tudresden/ws/VehicletypeSetImperfection.java   |    12 +-
 .../ws/VehicletypeSetImperfectionResponse.java     |     4 +-
 .../de/tudresden/ws/VehicletypeSetLength.java      |    12 +-
 .../tudresden/ws/VehicletypeSetLengthResponse.java |     4 +-
 .../de/tudresden/ws/VehicletypeSetMaxSpeed.java    |    12 +-
 .../ws/VehicletypeSetMaxSpeedResponse.java         |     4 +-
 .../de/tudresden/ws/VehicletypeSetMinGap.java      |    12 +-
 .../tudresden/ws/VehicletypeSetMinGapResponse.java |     4 +-
 .../de/tudresden/ws/VehicletypeSetShapeClass.java  |    12 +-
 .../ws/VehicletypeSetShapeClassResponse.java       |     4 +-
 .../tudresden/ws/VehicletypeSetSpeedDeviation.java |    12 +-
 .../ws/VehicletypeSetSpeedDeviationResponse.java   |     4 +-
 .../de/tudresden/ws/VehicletypeSetSpeedFactor.java |    12 +-
 .../ws/VehicletypeSetSpeedFactorResponse.java      |     4 +-
 .../de/tudresden/ws/VehicletypeSetTau.java         |    12 +-
 .../de/tudresden/ws/VehicletypeSetTauResponse.java |     4 +-
 .../tudresden/ws/VehicletypeSetVehicleClass.java   |    12 +-
 .../ws/VehicletypeSetVehicleClassResponse.java     |     4 +-
 .../de/tudresden/ws/VehicletypeSetWidth.java       |    12 +-
 .../tudresden/ws/VehicletypeSetWidthResponse.java  |     4 +-
 .../java_wsclient/de/tudresden/ws/Version.java     |     4 +-
 .../de/tudresden/ws/VersionResponse.java           |     8 +-
 .../src/de/tudresden/sumo/cmd/ArealDetector.java   |    67 +-
 .../traas/src/de/tudresden/sumo/cmd/Edge.java      |    57 +-
 .../traas/src/de/tudresden/sumo/cmd/Gui.java       |     2 +-
 .../src/de/tudresden/sumo/cmd/Inductionloop.java   |     4 +-
 .../traas/src/de/tudresden/sumo/cmd/Junction.java  |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Lane.java      |    28 +-
 .../src/de/tudresden/sumo/cmd/Multientryexit.java  |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Person.java    |   156 +-
 .../traas/src/de/tudresden/sumo/cmd/Poi.java       |    16 +-
 .../traas/src/de/tudresden/sumo/cmd/Polygon.java   |    29 +-
 .../traas/src/de/tudresden/sumo/cmd/Route.java     |    14 +-
 .../src/de/tudresden/sumo/cmd/Simulation.java      |     4 +-
 .../src/de/tudresden/sumo/cmd/Trafficlight.java    |   232 +
 .../src/de/tudresden/sumo/cmd/Trafficlights.java   |   208 -
 .../traas/src/de/tudresden/sumo/cmd/Vehicle.java   |   102 +-
 .../src/de/tudresden/sumo/cmd/Vehicletype.java     |    16 +-
 .../src/de/tudresden/sumo/config/Constants.java    |    32 +-
 .../sumo/subscription/ContextSubscription.java     |    61 +
 .../tudresden/sumo/subscription/ResponseType.java  |    97 +
 .../sumo/subscription/SubscribtionVariable.java    |    29 +
 .../tudresden/sumo/subscription/Subscription.java  |     9 +
 .../sumo/subscription/SubscriptionContext.java     |    28 +
 .../sumo/subscription/SubscriptionObject.java      |    39 +
 .../de/tudresden/sumo/subscription/SumoDomain.java |    21 +
 .../sumo/subscription/VariableSubscription.java    |    51 +
 .../de/tudresden/sumo/util/CommandProcessor.java   |   420 +-
 .../src/de/tudresden/sumo/util/ConvertHelper.java  |    58 +-
 .../traas/src/de/tudresden/sumo/util/Query.java    |   133 +-
 .../traas/src/de/tudresden/sumo/util/Sumo.java     |     2 +-
 .../src/de/tudresden/sumo/util/SumoCommand.java    |     9 +-
 .../traas/src/de/tudresden/ws/Service.java         |     2 +-
 .../traas/src/de/tudresden/ws/ServiceImpl.java     |   150 +
 .../traas/src/de/tudresden/ws/Service_Impl.java    |   150 -
 .../traas/src/de/tudresden/ws/ShutdownHook.java    |     2 +-
 .../traas/src/de/tudresden/ws/Traci.java           |    88 +-
 .../traas/src/de/tudresden/ws/WebService.java      |     4 +-
 .../traas/src/de/tudresden/ws/conf/Config.java     |     2 +-
 .../de/tudresden/ws/container/SumoBestLanes.java   |    61 +
 .../de/tudresden/ws/container/SumoBoundingBox.java |     4 +-
 .../src/de/tudresden/ws/container/SumoColor.java   |     4 +-
 .../de/tudresden/ws/container/SumoGeometry.java    |     4 +-
 .../src/de/tudresden/ws/container/SumoLeader.java  |    43 +
 .../src/de/tudresden/ws/container/SumoLink.java    |     4 +-
 .../de/tudresden/ws/container/SumoLinkList.java    |     4 +-
 .../src/de/tudresden/ws/container/SumoNextTLS.java |    63 +
 .../src/de/tudresden/ws/container/SumoObject.java  |     5 +
 .../de/tudresden/ws/container/SumoPosition2D.java  |     4 +-
 .../de/tudresden/ws/container/SumoPosition3D.java  |     4 +-
 .../de/tudresden/ws/container/SumoPrimitive.java   |    23 +
 .../de/tudresden/ws/container/SumoStopFlags.java   |     4 +-
 .../de/tudresden/ws/container/SumoStringList.java  |     4 +-
 .../tudresden/ws/container/SumoTLSController.java  |    56 +
 .../de/tudresden/ws/container/SumoTLSLogic.java    |    72 -
 .../de/tudresden/ws/container/SumoTLSPhase.java    |     4 +-
 .../de/tudresden/ws/container/SumoTLSProgram.java  |    72 +
 .../de/tudresden/ws/container/SumoVehicleData.java |    54 +
 .../tudresden/ws/container/SumoVehicleSignal.java  |     4 +-
 .../ws/container/SumoVehicleSignalState.java       |     4 +-
 .../traas/src/de/tudresden/ws/log/Log.java         |     2 +-
 .../traas/src/de/tudresden/ws/log/Log_txt.java     |     4 +-
 .../polito/appeal/traci/SumoTraciConnection.java   |    71 +-
 .../appeal/traci/examples/OpenStepsClose.java      |     2 +-
 tools/contributed/traci4j/pom.xml                  |     1 +
 .../+traci/+areal/getContextSubscriptionResults.m  |     4 +-
 .../traci4matlab/+traci/+areal/getIDCount.m        |     4 +-
 .../traci4matlab/+traci/+areal/getIDList.m         |     4 +-
 .../+traci/+areal/getJamLengthMeters.m             |     4 +-
 .../+traci/+areal/getJamLengthVehicle.m            |     4 +-
 .../+traci/+areal/getLastStepMeanSpeed.m           |     4 +-
 .../+traci/+areal/getLastStepOccupancy.m           |     4 +-
 .../+traci/+areal/getSubscriptionResults.m         |     4 +-
 .../traci4matlab/+traci/+areal/getUniversal.m      |     4 +-
 .../traci4matlab/+traci/+areal/subscribe.m         |     4 +-
 .../traci4matlab/+traci/+areal/subscribeContext.m  |     4 +-
 .../traci4matlab/+traci/+edge/adaptTraveltime.m    |     4 +-
 .../+traci/+edge/getAdaptedTraveltime.m            |     4 +-
 .../traci4matlab/+traci/+edge/getCO2Emission.m     |     4 +-
 .../traci4matlab/+traci/+edge/getCOEmission.m      |     4 +-
 .../+traci/+edge/getContextSubscriptionResults.m   |     4 +-
 .../traci4matlab/+traci/+edge/getEffort.m          |     4 +-
 .../traci4matlab/+traci/+edge/getFuelConsumption.m |     4 +-
 .../traci4matlab/+traci/+edge/getHCEmission.m      |     4 +-
 .../traci4matlab/+traci/+edge/getIDCount.m         |     4 +-
 .../traci4matlab/+traci/+edge/getIDList.m          |     4 +-
 .../+traci/+edge/getLastStepHaltingNumber.m        |     4 +-
 .../traci4matlab/+traci/+edge/getLastStepLength.m  |     4 +-
 .../+traci/+edge/getLastStepMeanSpeed.m            |     4 +-
 .../+traci/+edge/getLastStepOccupancy.m            |     4 +-
 .../+traci/+edge/getLastStepPersonIDs.m            |     4 +-
 .../+traci/+edge/getLastStepVehicleIDs.m           |     4 +-
 .../+traci/+edge/getLastStepVehicleNumber.m        |     4 +-
 .../traci4matlab/+traci/+edge/getNOxEmission.m     |     4 +-
 .../traci4matlab/+traci/+edge/getNoiseEmission.m   |     4 +-
 .../traci4matlab/+traci/+edge/getPmxEmission.m     |     4 +-
 .../+traci/+edge/getSubscriptionResults.m          |     4 +-
 .../traci4matlab/+traci/+edge/getTraveltime.m      |     4 +-
 .../traci4matlab/+traci/+edge/getUniversal.m       |     4 +-
 .../traci4matlab/+traci/+edge/setEffort.m          |     4 +-
 .../traci4matlab/+traci/+edge/setMaxSpeed.m        |     4 +-
 .../traci4matlab/+traci/+edge/subscribe.m          |     4 +-
 .../traci4matlab/+traci/+edge/subscribeContext.m   |     4 +-
 .../traci4matlab/+traci/+gui/getBoundary.m         |     4 +-
 .../+traci/+gui/getContextSubscriptionResults.m    |     4 +-
 .../traci4matlab/+traci/+gui/getIDList.m           |     4 +-
 .../traci4matlab/+traci/+gui/getOffset.m           |     4 +-
 .../traci4matlab/+traci/+gui/getSchema.m           |     4 +-
 .../+traci/+gui/getSubscriptionResults.m           |     4 +-
 .../traci4matlab/+traci/+gui/getUniversal.m        |     4 +-
 .../contributed/traci4matlab/+traci/+gui/getZoom.m |     4 +-
 .../traci4matlab/+traci/+gui/screenshot.m          |     4 +-
 .../traci4matlab/+traci/+gui/setBoundary.m         |     4 +-
 .../traci4matlab/+traci/+gui/setOffset.m           |     4 +-
 .../traci4matlab/+traci/+gui/setSchema.m           |     4 +-
 .../contributed/traci4matlab/+traci/+gui/setZoom.m |     4 +-
 .../traci4matlab/+traci/+gui/subscribe.m           |     4 +-
 .../traci4matlab/+traci/+gui/subscribeContext.m    |     4 +-
 .../traci4matlab/+traci/+gui/trackVehicle.m        |     4 +-
 .../+inductionloop/getContextSubscriptionResults.m |     4 +-
 .../traci4matlab/+traci/+inductionloop/getIDList.m |     4 +-
 .../traci4matlab/+traci/+inductionloop/getLaneID.m |     4 +-
 .../+traci/+inductionloop/getLastStepMeanLength.m  |     4 +-
 .../+traci/+inductionloop/getLastStepMeanSpeed.m   |     4 +-
 .../+traci/+inductionloop/getLastStepOccupancy.m   |     4 +-
 .../+traci/+inductionloop/getLastStepVehicleIDs.m  |     4 +-
 .../+inductionloop/getLastStepVehicleNumber.m      |     4 +-
 .../+traci/+inductionloop/getPosition.m            |     4 +-
 .../+traci/+inductionloop/getSubscriptionResults.m |     4 +-
 .../+traci/+inductionloop/getTimeSinceDetection.m  |     4 +-
 .../+traci/+inductionloop/getUniversal.m           |     4 +-
 .../+traci/+inductionloop/getVehicleData.m         |     4 +-
 .../+traci/+inductionloop/readVehicleData.m        |     4 +-
 .../traci4matlab/+traci/+inductionloop/subscribe.m |     4 +-
 .../+traci/+inductionloop/subscribeContext.m       |     4 +-
 .../+junction/getContextSubscriptionResults.m      |     4 +-
 .../traci4matlab/+traci/+junction/getIDList.m      |     4 +-
 .../traci4matlab/+traci/+junction/getPosition.m    |     4 +-
 .../+traci/+junction/getSubscriptionResults.m      |     4 +-
 .../traci4matlab/+traci/+junction/getUniversal.m   |     4 +-
 .../traci4matlab/+traci/+junction/subscribe.m      |     4 +-
 .../+traci/+junction/subscribeContext.m            |     4 +-
 .../traci4matlab/+traci/+lane/getAllowed.m         |     4 +-
 .../traci4matlab/+traci/+lane/getCO2Emission.m     |     4 +-
 .../traci4matlab/+traci/+lane/getCOEmission.m      |     4 +-
 .../+traci/+lane/getContextSubscriptionResults.m   |     4 +-
 .../traci4matlab/+traci/+lane/getDisallowed.m      |     4 +-
 .../traci4matlab/+traci/+lane/getEdgeID.m          |     4 +-
 .../traci4matlab/+traci/+lane/getFuelConsumption.m |     4 +-
 .../traci4matlab/+traci/+lane/getHCEmission.m      |     4 +-
 .../traci4matlab/+traci/+lane/getIDList.m          |     4 +-
 .../+traci/+lane/getLastStepHaltingNumber.m        |     4 +-
 .../traci4matlab/+traci/+lane/getLastStepLength.m  |     4 +-
 .../+traci/+lane/getLastStepMeanSpeed.m            |     4 +-
 .../+traci/+lane/getLastStepOccupancy.m            |     4 +-
 .../+traci/+lane/getLastStepVehicleIDs.m           |     4 +-
 .../+traci/+lane/getLastStepVehicleNumber.m        |     4 +-
 .../traci4matlab/+traci/+lane/getLength.m          |     4 +-
 .../traci4matlab/+traci/+lane/getLinkNumber.m      |     4 +-
 .../traci4matlab/+traci/+lane/getLinks.m           |     4 +-
 .../traci4matlab/+traci/+lane/getMaxSpeed.m        |     4 +-
 .../traci4matlab/+traci/+lane/getNOxEmission.m     |     4 +-
 .../traci4matlab/+traci/+lane/getNoiseEmission.m   |     4 +-
 .../traci4matlab/+traci/+lane/getPMxEmission.m     |     4 +-
 .../traci4matlab/+traci/+lane/getShape.m           |     4 +-
 .../+traci/+lane/getSubscriptionResults.m          |     4 +-
 .../traci4matlab/+traci/+lane/getTraveltime.m      |     4 +-
 .../traci4matlab/+traci/+lane/getUniversal.m       |     4 +-
 .../traci4matlab/+traci/+lane/getWidth.m           |     4 +-
 .../traci4matlab/+traci/+lane/readLinks.m          |     4 +-
 .../traci4matlab/+traci/+lane/setAllowed.m         |     4 +-
 .../traci4matlab/+traci/+lane/setDisallowed.m      |     4 +-
 .../traci4matlab/+traci/+lane/setLength.m          |     4 +-
 .../traci4matlab/+traci/+lane/setMaxSpeed.m        |     4 +-
 .../traci4matlab/+traci/+lane/subscribe.m          |     4 +-
 .../traci4matlab/+traci/+lane/subscribeContext.m   |     4 +-
 .../getContextSubscriptionResults.m                |     4 +-
 .../+traci/+multientryexit/getIDList.m             |     4 +-
 .../+multientryexit/getLastStepHaltingNumber.m     |     4 +-
 .../+traci/+multientryexit/getLastStepMeanSpeed.m  |     4 +-
 .../+traci/+multientryexit/getLastStepVehicleIDs.m |     4 +-
 .../+multientryexit/getLastStepVehicleNumber.m     |     4 +-
 .../+multientryexit/getSubscriptionResults.m       |     4 +-
 .../+traci/+multientryexit/getUniversal.m          |     4 +-
 .../+traci/+multientryexit/subscribe.m             |     4 +-
 .../+traci/+multientryexit/subscribeContext.m      |     4 +-
 .../traci4matlab/+traci/+person/getAngle.m         |     4 +-
 .../traci4matlab/+traci/+person/getColor.m         |     4 +-
 .../+traci/+person/getContextSubscriptionResults.m |     4 +-
 .../traci4matlab/+traci/+person/getIDCount.m       |     4 +-
 .../traci4matlab/+traci/+person/getIDList.m        |     4 +-
 .../traci4matlab/+traci/+person/getLanePosition.m  |     4 +-
 .../traci4matlab/+traci/+person/getLength.m        |     4 +-
 .../traci4matlab/+traci/+person/getMinGap.m        |     4 +-
 .../traci4matlab/+traci/+person/getNextEdge.m      |     4 +-
 .../traci4matlab/+traci/+person/getPosition.m      |     4 +-
 .../traci4matlab/+traci/+person/getPosition3D.m    |     4 +-
 .../traci4matlab/+traci/+person/getRoadID.m        |     4 +-
 .../traci4matlab/+traci/+person/getSpeed.m         |     4 +-
 .../+traci/+person/getSubscriptionResults.m        |     4 +-
 .../traci4matlab/+traci/+person/getTypeID.m        |     4 +-
 .../traci4matlab/+traci/+person/getUniversal.m     |     4 +-
 .../traci4matlab/+traci/+person/getWaitingTime.m   |     4 +-
 .../traci4matlab/+traci/+person/getWidth.m         |     4 +-
 .../traci4matlab/+traci/+person/subscribe.m        |     4 +-
 .../traci4matlab/+traci/+person/subscribeContext.m |     4 +-
 tools/contributed/traci4matlab/+traci/+poi/add.m   |     4 +-
 .../traci4matlab/+traci/+poi/getColor.m            |     4 +-
 .../+traci/+poi/getContextSubscriptionResults.m    |     4 +-
 .../traci4matlab/+traci/+poi/getIDList.m           |     4 +-
 .../traci4matlab/+traci/+poi/getPosition.m         |     4 +-
 .../+traci/+poi/getSubscriptionResults.m           |     4 +-
 .../contributed/traci4matlab/+traci/+poi/getType.m |     4 +-
 .../traci4matlab/+traci/+poi/getUniversal.m        |     4 +-
 .../contributed/traci4matlab/+traci/+poi/remove.m  |     4 +-
 .../traci4matlab/+traci/+poi/setColor.m            |     4 +-
 .../traci4matlab/+traci/+poi/setPosition.m         |     4 +-
 .../contributed/traci4matlab/+traci/+poi/setType.m |     4 +-
 .../traci4matlab/+traci/+poi/subscribe.m           |     4 +-
 .../traci4matlab/+traci/+poi/subscribeContext.m    |     4 +-
 .../contributed/traci4matlab/+traci/+polygon/add.m |     4 +-
 .../traci4matlab/+traci/+polygon/getColor.m        |     4 +-
 .../+polygon/getContextSubscriptionResults.m       |     4 +-
 .../traci4matlab/+traci/+polygon/getIDList.m       |     4 +-
 .../traci4matlab/+traci/+polygon/getShape.m        |     4 +-
 .../+traci/+polygon/getSubscriptionResults.m       |     4 +-
 .../traci4matlab/+traci/+polygon/getType.m         |     4 +-
 .../traci4matlab/+traci/+polygon/getUniversal.m    |     4 +-
 .../traci4matlab/+traci/+polygon/remove.m          |     4 +-
 .../traci4matlab/+traci/+polygon/setColor.m        |     4 +-
 .../traci4matlab/+traci/+polygon/setShape.m        |     4 +-
 .../traci4matlab/+traci/+polygon/setType.m         |     4 +-
 .../traci4matlab/+traci/+polygon/subscribe.m       |     4 +-
 .../+traci/+polygon/subscribeContext.m             |     4 +-
 tools/contributed/traci4matlab/+traci/+route/add.m |     4 +-
 .../+traci/+route/getContextSubscriptionResults.m  |     4 +-
 .../traci4matlab/+traci/+route/getEdges.m          |     4 +-
 .../traci4matlab/+traci/+route/getIDList.m         |     4 +-
 .../+traci/+route/getSubscriptionResults.m         |     4 +-
 .../traci4matlab/+traci/+route/getUniversal.m      |     4 +-
 .../traci4matlab/+traci/+route/subscribe.m         |     4 +-
 .../traci4matlab/+traci/+route/subscribeContext.m  |     4 +-
 .../traci4matlab/+traci/+simulation/convert2D.m    |     4 +-
 .../traci4matlab/+traci/+simulation/convertGeo.m   |     4 +-
 .../traci4matlab/+traci/+simulation/convertRoad.m  |     4 +-
 .../+traci/+simulation/getArrivedIDList.m          |     4 +-
 .../+traci/+simulation/getArrivedNumber.m          |     4 +-
 .../+traci/+simulation/getCurrentTime.m            |     4 +-
 .../traci4matlab/+traci/+simulation/getDeltaT.m    |     4 +-
 .../+traci/+simulation/getDepartedIDList.m         |     4 +-
 .../+traci/+simulation/getDepartedNumber.m         |     4 +-
 .../+traci/+simulation/getDistance2D.m             |     4 +-
 .../+traci/+simulation/getDistanceRoad.m           |     4 +-
 .../+traci/+simulation/getEndingTeleportIDList.m   |     4 +-
 .../+traci/+simulation/getEndingTeleportNumber.m   |     4 +-
 .../+traci/+simulation/getLoadedIDList.m           |     4 +-
 .../+traci/+simulation/getLoadedNumber.m           |     4 +-
 .../+traci/+simulation/getMinExpectedNumber.m      |     4 +-
 .../+traci/+simulation/getNetBoundary.m            |     4 +-
 .../+traci/+simulation/getStartingTeleportIDList.m |     4 +-
 .../+traci/+simulation/getStartingTeleportNumber.m |     4 +-
 .../+traci/+simulation/getSubscriptionResults.m    |     4 +-
 .../traci4matlab/+traci/+simulation/getUniversal.m |     4 +-
 .../traci4matlab/+traci/+simulation/subscribe.m    |     4 +-
 .../traci4matlab/+traci/+trafficlights/Logic.m     |     4 +-
 .../traci4matlab/+traci/+trafficlights/Phase.m     |     4 +-
 .../getCompleteRedYellowGreenDefinition.m          |     4 +-
 .../+trafficlights/getContextSubscriptionResults.m |     4 +-
 .../+traci/+trafficlights/getControlledLanes.m     |     4 +-
 .../+traci/+trafficlights/getControlledLinks.m     |     4 +-
 .../traci4matlab/+traci/+trafficlights/getIDList.m |     4 +-
 .../+traci/+trafficlights/getNextSwitch.m          |     4 +-
 .../traci4matlab/+traci/+trafficlights/getPhase.m  |     4 +-
 .../+traci/+trafficlights/getProgram.m             |     4 +-
 .../+traci/+trafficlights/getRedYellowGreenState.m |     4 +-
 .../+traci/+trafficlights/getSubscriptionResults.m |     4 +-
 .../+traci/+trafficlights/getUniversal.m           |     4 +-
 .../traci4matlab/+traci/+trafficlights/readLinks.m |     4 +-
 .../+traci/+trafficlights/readLogics.m             |     4 +-
 .../setCompleteRedYellowGreenDefinition.m          |     4 +-
 .../traci4matlab/+traci/+trafficlights/setPhase.m  |     4 +-
 .../+traci/+trafficlights/setPhaseDuration.m       |     4 +-
 .../+traci/+trafficlights/setProgram.m             |     4 +-
 .../+traci/+trafficlights/setRedYellowGreenState.m |     4 +-
 .../traci4matlab/+traci/+trafficlights/subscribe.m |     4 +-
 .../+traci/+trafficlights/subscribeContext.m       |     4 +-
 .../contributed/traci4matlab/+traci/+vehicle/add.m |     4 +-
 .../traci4matlab/+traci/+vehicle/changeLane.m      |     4 +-
 .../traci4matlab/+traci/+vehicle/changeTarget.m    |     4 +-
 .../traci4matlab/+traci/+vehicle/getAccel.m        |     4 +-
 .../+traci/+vehicle/getAdaptedTraveltime.m         |     4 +-
 .../traci4matlab/+traci/+vehicle/getAngle.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/getBestLanes.m    |     4 +-
 .../traci4matlab/+traci/+vehicle/getCO2Emission.m  |     4 +-
 .../traci4matlab/+traci/+vehicle/getCOEmission.m   |     4 +-
 .../traci4matlab/+traci/+vehicle/getColor.m        |     4 +-
 .../+vehicle/getContextSubscriptionResults.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getDecel.m        |     4 +-
 .../+traci/+vehicle/getDrivingDistance.m           |     4 +-
 .../+traci/+vehicle/getDrivingDistance2D.m         |     4 +-
 .../traci4matlab/+traci/+vehicle/getEffort.m       |     4 +-
 .../+traci/+vehicle/getEmissionClass.m             |     4 +-
 .../+traci/+vehicle/getFuelConsumption.m           |     4 +-
 .../traci4matlab/+traci/+vehicle/getHCEmission.m   |     4 +-
 .../traci4matlab/+traci/+vehicle/getIDList.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getImperfection.m |     4 +-
 .../traci4matlab/+traci/+vehicle/getLaneID.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getLaneIndex.m    |     4 +-
 .../traci4matlab/+traci/+vehicle/getLanePosition.m |     4 +-
 .../traci4matlab/+traci/+vehicle/getLeader.m       |     2 +-
 .../traci4matlab/+traci/+vehicle/getLength.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getMaxSpeed.m     |     4 +-
 .../traci4matlab/+traci/+vehicle/getMinGap.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getNOxEmission.m  |     4 +-
 .../+traci/+vehicle/getNoiseEmission.m             |     4 +-
 .../traci4matlab/+traci/+vehicle/getPMxEmission.m  |     4 +-
 .../traci4matlab/+traci/+vehicle/getPosition.m     |     4 +-
 .../traci4matlab/+traci/+vehicle/getRoadID.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getRoute.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/getRouteID.m      |     4 +-
 .../traci4matlab/+traci/+vehicle/getShapeClass.m   |     4 +-
 .../traci4matlab/+traci/+vehicle/getSignals.m      |     4 +-
 .../traci4matlab/+traci/+vehicle/getSpeed.m        |     4 +-
 .../+traci/+vehicle/getSpeedDeviation.m            |     4 +-
 .../traci4matlab/+traci/+vehicle/getSpeedFactor.m  |     4 +-
 .../+traci/+vehicle/getSpeedWithoutTraCI.m         |     4 +-
 .../traci4matlab/+traci/+vehicle/getStopState.m    |    14 +
 .../+traci/+vehicle/getSubscriptionResults.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getTau.m          |     4 +-
 .../traci4matlab/+traci/+vehicle/getTypeID.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/getUniversal.m    |     4 +-
 .../traci4matlab/+traci/+vehicle/getVehicleClass.m |     4 +-
 .../traci4matlab/+traci/+vehicle/getWidth.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/isRouteValid.m    |     4 +-
 .../traci4matlab/+traci/+vehicle/moveTo.m          |     4 +-
 .../traci4matlab/+traci/+vehicle/moveToVTD.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/readBestLanes.m   |     4 +-
 .../traci4matlab/+traci/+vehicle/readLeader.m      |     6 +
 .../traci4matlab/+traci/+vehicle/remove.m          |     4 +-
 .../traci4matlab/+traci/+vehicle/rerouteEffort.m   |     4 +-
 .../+traci/+vehicle/rerouteTraveltime.m            |     4 +-
 .../traci4matlab/+traci/+vehicle/resume.m          |    18 +
 .../traci4matlab/+traci/+vehicle/setAccel.m        |     4 +-
 .../+traci/+vehicle/setAdaptedTraveltime.m         |     4 +-
 .../traci4matlab/+traci/+vehicle/setColor.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/setDecel.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/setEffort.m       |     4 +-
 .../+traci/+vehicle/setEmissionClass.m             |     4 +-
 .../traci4matlab/+traci/+vehicle/setImperfection.m |     4 +-
 .../+traci/+vehicle/setLaneChangeMode.m            |     2 +-
 .../traci4matlab/+traci/+vehicle/setLength.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/setMaxSpeed.m     |     4 +-
 .../traci4matlab/+traci/+vehicle/setMinGap.m       |     4 +-
 .../traci4matlab/+traci/+vehicle/setRoute.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/setRouteID.m      |     4 +-
 .../traci4matlab/+traci/+vehicle/setShapeClass.m   |     4 +-
 .../traci4matlab/+traci/+vehicle/setSignals.m      |     4 +-
 .../traci4matlab/+traci/+vehicle/setSpeed.m        |     4 +-
 .../+traci/+vehicle/setSpeedDeviation.m            |     4 +-
 .../traci4matlab/+traci/+vehicle/setSpeedFactor.m  |     4 +-
 .../traci4matlab/+traci/+vehicle/setSpeedMode.m    |     2 +-
 .../traci4matlab/+traci/+vehicle/setStop.m         |    65 +-
 .../traci4matlab/+traci/+vehicle/setTau.m          |     4 +-
 .../traci4matlab/+traci/+vehicle/setVehicleClass.m |     4 +-
 .../traci4matlab/+traci/+vehicle/setWidth.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/slowDown.m        |     4 +-
 .../traci4matlab/+traci/+vehicle/subscribe.m       |     4 +-
 .../+traci/+vehicle/subscribeContext.m             |     4 +-
 .../traci4matlab/+traci/+vehicletype/getAccel.m    |     4 +-
 .../traci4matlab/+traci/+vehicletype/getColor.m    |     4 +-
 .../+vehicletype/getContextSubscriptionResults.m   |     4 +-
 .../traci4matlab/+traci/+vehicletype/getDecel.m    |     4 +-
 .../+traci/+vehicletype/getEmissionClass.m         |     4 +-
 .../traci4matlab/+traci/+vehicletype/getIDList.m   |     4 +-
 .../+traci/+vehicletype/getImperfection.m          |     4 +-
 .../traci4matlab/+traci/+vehicletype/getLength.m   |     4 +-
 .../traci4matlab/+traci/+vehicletype/getMaxSpeed.m |     4 +-
 .../traci4matlab/+traci/+vehicletype/getMinGap.m   |     4 +-
 .../+traci/+vehicletype/getShapeClass.m            |     4 +-
 .../+traci/+vehicletype/getSpeedDeviation.m        |     4 +-
 .../+traci/+vehicletype/getSpeedFactor.m           |     4 +-
 .../+traci/+vehicletype/getSubscriptionResults.m   |     4 +-
 .../traci4matlab/+traci/+vehicletype/getTau.m      |     4 +-
 .../+traci/+vehicletype/getUniversal.m             |     4 +-
 .../+traci/+vehicletype/getVehicleClass.m          |     4 +-
 .../traci4matlab/+traci/+vehicletype/getWidth.m    |     4 +-
 .../traci4matlab/+traci/+vehicletype/setAccel.m    |     4 +-
 .../traci4matlab/+traci/+vehicletype/setColor.m    |     4 +-
 .../traci4matlab/+traci/+vehicletype/setDecel.m    |     4 +-
 .../+traci/+vehicletype/setEmissionClass.m         |     4 +-
 .../+traci/+vehicletype/setImperfection.m          |     4 +-
 .../traci4matlab/+traci/+vehicletype/setLength.m   |     4 +-
 .../traci4matlab/+traci/+vehicletype/setMaxSpeed.m |     4 +-
 .../traci4matlab/+traci/+vehicletype/setMinGap.m   |     4 +-
 .../+traci/+vehicletype/setShapeClass.m            |     4 +-
 .../+traci/+vehicletype/setSpeedDeviation.m        |     4 +-
 .../+traci/+vehicletype/setSpeedFactor.m           |     4 +-
 .../traci4matlab/+traci/+vehicletype/setTau.m      |     4 +-
 .../+traci/+vehicletype/setVehicleClass.m          |     4 +-
 .../traci4matlab/+traci/+vehicletype/setWidth.m    |     4 +-
 .../traci4matlab/+traci/+vehicletype/subscribe.m   |     4 +-
 .../+traci/+vehicletype/subscribeContext.m         |     4 +-
 tools/contributed/traci4matlab/+traci/Message.m    |     4 +-
 .../traci4matlab/+traci/RETURN_VALUE_FUNC.m        |    19 +-
 tools/contributed/traci4matlab/+traci/Socket.m     |     4 +-
 tools/contributed/traci4matlab/+traci/Storage.m    |     4 +-
 .../traci4matlab/+traci/SubscriptionResults.m      |     4 +-
 .../contributed/traci4matlab/+traci/beginMessage.m |     4 +-
 .../contributed/traci4matlab/+traci/checkResult.m  |     4 +-
 tools/contributed/traci4matlab/+traci/close.m      |    58 +-
 tools/contributed/traci4matlab/+traci/constants.m  |    20 +-
 tools/contributed/traci4matlab/+traci/getVersion.m |     4 +-
 tools/contributed/traci4matlab/+traci/init.m       |     6 +-
 tools/contributed/traci4matlab/+traci/packInt32.m  |     4 +-
 tools/contributed/traci4matlab/+traci/packInt64.m  |    10 +-
 .../traci4matlab/+traci/readSubscription.m         |     4 +-
 tools/contributed/traci4matlab/+traci/recvExact.m  |     4 +-
 .../contributed/traci4matlab/+traci/sendByteCmd.m  |     4 +-
 .../traci4matlab/+traci/sendDoubleCmd.m            |     4 +-
 tools/contributed/traci4matlab/+traci/sendExact.m  |     4 +-
 tools/contributed/traci4matlab/+traci/sendIntCmd.m |     4 +-
 .../traci4matlab/+traci/sendReadOneStringCmd.m     |     4 +-
 .../traci4matlab/+traci/sendStringCmd.m            |     4 +-
 .../traci4matlab/+traci/simulationStep.m           |     4 +-
 tools/contributed/traci4matlab/+traci/subscribe.m  |     4 +-
 .../traci4matlab/+traci/subscribeContext.m         |     4 +-
 .../traci4matlab/+traci/switchConnection.m         |     4 +-
 tools/contributed/traci4matlab/+traci/time2steps.m |     4 +-
 .../traci4matlab/examples/inter_palmas/analisis.m  |   111 +
 .../inter_palmas/inter_palmas_notls.net.xml        |   326 +
 .../inter_palmas/notls/inter_palmas_notls.net.xml  |   326 +
 .../inter_palmas/notls/inter_palmas_notls.sumocfg  |    25 +
 .../notls/inter_palmas_pedestrians.trip.xml        |   366 +
 .../examples/inter_palmas/tls/inter_palmas.m       |    51 +
 .../examples/inter_palmas/tls/inter_palmas.net.xml |   323 +
 .../examples/inter_palmas/tls/inter_palmas.sumocfg |    29 +
 .../tls/inter_palmas_joined_con.net.xml            |   323 +
 .../tls_actuated/checkWaitingPersons.m             |     4 +-
 .../tls_actuated/inter_palmas_actuated.m           |     7 +-
 .../contributed/traci4matlab/examples/traci_test.m |    38 +-
 .../traci4matlab/examples/traci_test2.m            |    39 +-
 .../trafficmodeler/src/resources/icons/Thumbs.db   |   Bin 54784 -> 0 bytes
 tools/createVehTypeDistribution.py                 |   248 +
 tools/detector/validate.py                         |     4 +-
 tools/emissions/findMinDiffModel.py                |    65 +
 tools/extractTest.py                               |    58 +-
 tools/game/bs3d/bs3d.settings.xml                  |    10 +-
 tools/game/cross/cross.net.xml                     |   102 +-
 tools/import/vissim/vissim_parseRoutes.py          |     2 +-
 tools/net/netmatch.py                              |     6 +-
 tools/osmBuild.py                                  |    10 +-
 tools/osmGet.py                                    |     2 +-
 tools/osmWebWizard.py                              |     5 +-
 tools/output/tripinfoDiff.py                       |    76 +
 tools/projects/vehicles2d/main.py                  |    18 +-
 tools/randomTrips.py                               |     8 +-
 tools/route/cutRoutes.py                           |     6 +-
 tools/route/route2poly.py                          |    27 +-
 tools/route/route_1htoDay.py                       |     9 +-
 tools/route/route_departOffset.py                  |   167 +-
 tools/route/tracegenerator.py                      |     6 +-
 tools/route/tracemapper.py                         |     6 +-
 tools/showDepartsAndArrivalsPerEdge.py             |   109 +
 tools/sumolib/geomhelper.py                        |    13 +-
 tools/sumolib/miscutils.py                         |     8 +-
 tools/sumolib/net/__init__.py                      |    63 +-
 tools/sumolib/net/connection.py                    |    11 +-
 tools/sumolib/net/edge.py                          |    19 +-
 tools/sumolib/net/lane.py                          |     7 +-
 tools/sumolib/net/node.py                          |    26 +-
 tools/sumolib/net/roundabout.py                    |     8 +-
 tools/sumolib/output/__init__.py                   |    99 +-
 tools/traci/__init__.py                            |    41 +-
 tools/traci/_edge.py                               |    69 +-
 tools/traci/_lane.py                               |    10 +-
 tools/traci/_vehicle.py                            |   134 +-
 tools/traci/_vehicletype.py                        |    18 +-
 tools/traci/connection.py                          |    17 +-
 tools/traci/constants.py                           |    39 +-
 tools/traci/simulation.py                          |   374 -
 tools/visualization/plot_net_dump.py               |   124 +-
 tools_filelist                                     |   Bin 128742 -> 146161 bytes
 unittest/src/microsim/MSCFModelTest.cpp            |    19 +-
 unittest/src/utils/geom/PositionVectorTest.cpp     |    50 +-
 3014 files changed, 578472 insertions(+), 29260 deletions(-)

diff --cc debian/changelog
index 56a2d05,a26d770..6e1dada
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,26 @@@
+ sumo (0.28.0+dfsg1-1) unstable; urgency=medium
+ 
+   * [ca1e1eb] Exclude some bimary files.
+   * [e4f942c] New upstream version 0.28.0+dfsg1
+   * [66fa6c3] Refresh patches.
+   * [58d6734] Apply cme fix dpkg.
+ 
+  -- Anton Gladky <gladk at debian.org>  Tue, 08 Nov 2016 22:47:32 +0100
+ 
+ sumo (0.27.1+dfsg1-1) unstable; urgency=medium
+ 
+   * [0622343] Imported Upstream version 0.27.1+dfsg1
+   * [e550fac] Refresh patches.
+   * [03913ad] Apply cme fix dpkg-copytight.
+ 
+  -- Anton Gladky <gladk at debian.org>  Fri, 12 Aug 2016 20:34:54 +0200
+ 
 +sumo (0.26.0+dfsg1-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Anton Gladky <gladk at debian.org>  Sun, 29 May 2016 09:19:45 +0200
 +
  sumo (0.26.0+dfsg1-1) unstable; urgency=medium
  
    * [08a309b] Refresh patches.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git



More information about the debian-science-commits mailing list