From e1ee27e55ab6440a2ddd6542788913c4180990db Mon Sep 17 00:00:00 2001
From: Michael Behrisch <michael.behrisch@dlr.de>
Date: Mon, 5 Feb 2024 22:05:20 +0100
Subject: [PATCH] updating more tests #14295 #21

---
 .../spider__one_tls_set/net.netgen            |  13 +-
 .../junction_type_static_tls/grid/net.netgen  |  45 ++-
 .../spider/net.netgen                         |  27 +-
 .../random/random_lanenumber/net.netgen       | 268 +++++++++---------
 4 files changed, 178 insertions(+), 175 deletions(-)

diff --git a/tests/netgen/function/junction_types/explicite_tls/spider__one_tls_set/net.netgen b/tests/netgen/function/junction_types/explicite_tls/spider__one_tls_set/net.netgen
index 4def7783609a..533a427f10fd 100644
--- a/tests/netgen/function/junction_types/explicite_tls/spider__one_tls_set/net.netgen
+++ b/tests/netgen/function/junction_types/explicite_tls/spider__one_tls_set/net.netgen
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:20:28 by Eclipse SUMO netgenerate Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 21:47:43 by Eclipse SUMO netgenerate Version v1_19_0+0760-3b673ba7376
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd">
 
     <spider_network>
@@ -283,9 +288,9 @@ SPDX-License-Identifier: EPL-2.0
 
     <tlLogic id="B1" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrGGg"/>
-        <phase duration="3"  state="yyyrrryyy"/>
+        <phase duration="3"  state="yyyrrrGyy"/>
         <phase duration="42" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
 
     <junction id="A1" type="unregulated" x="100.00" y="100.00" incLanes="B2A1_0 B1A1_0 B4A1_0 B3A1_0" intLanes=":A1_0_0 :A1_1_0 :A1_2_0 :A1_3_0 :A1_4_0 :A1_5_0 :A1_6_0 :A1_7_0 :A1_8_0 :A1_9_0 :A1_10_0 :A1_11_0 :A1_12_0 :A1_13_0 :A1_14_0 :A1_15_0" shape="96.80,107.20 103.20,107.20 103.64,104.98 104.20,104.20 104.98,103.64 105.98,103.31 107.20,103.20 107.20,96.80 104.98,96.36 104.20,95.80 103.64,95.02 103.31,94.02 103.20,92.80 96.80,92.80 96.36,95.02 95.80,95.80 95.02,96.36 94.02,96.69 92.80,96.80 92.80,103.20 95.02,103.64 95.80,104.20 96.36,104.98 96.69,105.98"/>
diff --git a/tests/netgen/function/junction_types/junction_type_static_tls/grid/net.netgen b/tests/netgen/function/junction_types/junction_type_static_tls/grid/net.netgen
index 7167a72fdcae..ff7e51a45805 100644
--- a/tests/netgen/function/junction_types/junction_type_static_tls/grid/net.netgen
+++ b/tests/netgen/function/junction_types/junction_type_static_tls/grid/net.netgen
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:20:28 by Eclipse SUMO netgenerate Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 21:47:43 by Eclipse SUMO netgenerate Version v1_19_0+0760-3b673ba7376
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd">
 
     <grid_network>
@@ -362,28 +367,22 @@ SPDX-License-Identifier: EPL-2.0
     </edge>
 
     <tlLogic id="A0" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="A1" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrGGg"/>
-        <phase duration="3"  state="yyyrrryyy"/>
+        <phase duration="3"  state="yyyrrrGyy"/>
         <phase duration="42" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="A2" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="B0" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrGGgGgg"/>
-        <phase duration="3"  state="rrryyyyyy"/>
+        <phase duration="3"  state="rrrGyyyyy"/>
         <phase duration="42" state="GGgGrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrr"/>
     </tlLogic>
     <tlLogic id="B1" type="static" programID="0" offset="0">
         <phase duration="42" state="GGggrrrrGGggrrrr"/>
@@ -393,27 +392,21 @@ SPDX-License-Identifier: EPL-2.0
     </tlLogic>
     <tlLogic id="B2" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrGGg"/>
-        <phase duration="3"  state="yyyrrryyy"/>
+        <phase duration="3"  state="yyyrrrGyy"/>
         <phase duration="42" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="C0" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
     <tlLogic id="C1" type="static" programID="0" offset="0">
         <phase duration="42" state="GGgGggrrr"/>
-        <phase duration="3"  state="yyyyyyrrr"/>
+        <phase duration="3"  state="Gyyyyyrrr"/>
         <phase duration="42" state="GrrrrrGGg"/>
-        <phase duration="3"  state="yrrrrryyy"/>
+        <phase duration="3"  state="Grrrrryyy"/>
     </tlLogic>
     <tlLogic id="C2" type="static" programID="0" offset="0">
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="42" state="GG"/>
-        <phase duration="3"  state="yy"/>
+        <phase duration="90" state="GG"/>
     </tlLogic>
 
     <junction id="A0" type="traffic_light" x="0.00" y="0.00" incLanes="A1A0_0 B0A0_0" intLanes=":A0_0_0 :A0_1_0" shape="-3.20,3.20 3.20,3.20 3.20,-3.20 -0.36,-2.49 -1.60,-1.60 -2.49,-0.36 -3.02,1.24">
diff --git a/tests/netgen/function/junction_types/junction_type_static_tls/spider/net.netgen b/tests/netgen/function/junction_types/junction_type_static_tls/spider/net.netgen
index 2309c8c7bc98..fb3de8106813 100644
--- a/tests/netgen/function/junction_types/junction_type_static_tls/spider/net.netgen
+++ b/tests/netgen/function/junction_types/junction_type_static_tls/spider/net.netgen
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-01-07 16:20:28 by Eclipse SUMO netgenerate Version v1_11_0+0928-18c1b433e84
+<!-- generated on 2024-02-05 21:47:43 by Eclipse SUMO netgenerate Version v1_19_0+0760-3b673ba7376
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd">
 
     <spider_network>
@@ -289,29 +294,29 @@ SPDX-License-Identifier: EPL-2.0
 
     <tlLogic id="B1" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrGGg"/>
-        <phase duration="3"  state="yyyrrryyy"/>
+        <phase duration="3"  state="yyyrrrGyy"/>
         <phase duration="42" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="B2" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrGGg"/>
-        <phase duration="3"  state="yyyrrryyy"/>
+        <phase duration="3"  state="yyyrrrGyy"/>
         <phase duration="42" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="B3" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrGGg"/>
-        <phase duration="3"  state="yyyrrryyy"/>
+        <phase duration="3"  state="yyyrrrGyy"/>
         <phase duration="42" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="B4" type="static" programID="0" offset="0">
         <phase duration="27" state="GrrrrrGGg"/>
-        <phase duration="3"  state="yrrrrryyy"/>
+        <phase duration="3"  state="yrrrrrGyy"/>
         <phase duration="27" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrrGyyyrr"/>
         <phase duration="27" state="GGgGrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrr"/>
+        <phase duration="3"  state="Gyyyrrrrr"/>
     </tlLogic>
 
     <junction id="A1" type="unregulated" x="100.00" y="100.00" incLanes="B2A1_0 B1A1_0 B4A1_0 B3A1_0" intLanes=":A1_0_0 :A1_1_0 :A1_2_0 :A1_3_0 :A1_4_0 :A1_5_0 :A1_6_0 :A1_7_0 :A1_8_0 :A1_9_0 :A1_10_0 :A1_11_0 :A1_12_0 :A1_13_0 :A1_14_0 :A1_15_0" shape="96.80,107.20 103.20,107.20 103.64,104.98 104.20,104.20 104.98,103.64 105.98,103.31 107.20,103.20 107.20,96.80 104.98,96.36 104.20,95.80 103.64,95.02 103.31,94.02 103.20,92.80 96.80,92.80 96.36,95.02 95.80,95.80 95.02,96.36 94.02,96.69 92.80,96.80 92.80,103.20 95.02,103.64 95.80,104.20 96.36,104.98 96.69,105.98"/>
diff --git a/tests/netgen/random/random_lanenumber/net.netgen b/tests/netgen/random/random_lanenumber/net.netgen
index f2be941ff361..52dd164e7b23 100644
--- a/tests/netgen/random/random_lanenumber/net.netgen
+++ b/tests/netgen/random/random_lanenumber/net.netgen
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-07-04 13:16:44 by Eclipse SUMO netgenerate Version v1_18_0+0061-a2f1ffe04c7
+<!-- generated on 2024-02-05 21:47:43 by Eclipse SUMO netgenerate Version v1_19_0+0760-3b673ba7376
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -10132,48 +10132,48 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="1004" type="static" programID="0" offset="0">
         <phase duration="38" state="GGGGgGggrrrr"/>
-        <phase duration="3"  state="yyyyyyggrrrr"/>
+        <phase duration="3"  state="yyyyyGggrrrr"/>
         <phase duration="6"  state="rrrrrGGGrrrr"/>
         <phase duration="3"  state="rrrrryyyrrrr"/>
         <phase duration="37" state="GrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="1010" type="static" programID="0" offset="0">
         <phase duration="38" state="GGggrrrrrGGg"/>
-        <phase duration="3"  state="yyggrrrrryyy"/>
+        <phase duration="3"  state="GGggrrrrryyy"/>
         <phase duration="6"  state="GGGGrrrrrrrr"/>
         <phase duration="3"  state="yyyyrrrrrrrr"/>
         <phase duration="37" state="rrrrGGGGgGrr"/>
-        <phase duration="3"  state="rrrryyyyyyrr"/>
+        <phase duration="3"  state="rrrryyyyyGrr"/>
     </tlLogic>
     <tlLogic id="1026" type="static" programID="0" offset="0">
         <phase duration="42" state="GGgGGGggrrrr"/>
-        <phase duration="3"  state="yyyyyyyyrrrr"/>
+        <phase duration="3"  state="Gyyyyyyyrrrr"/>
         <phase duration="42" state="GrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="1092" type="static" programID="0" offset="0">
         <phase duration="26" state="GrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyyy"/>
+        <phase duration="3"  state="Grrrrrrryyyyy"/>
         <phase duration="27" state="GGGgGGrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyyGGrrrrrrr"/>
         <phase duration="27" state="rrrrGGGgGrrrr"/>
         <phase duration="3"  state="rrrryyyyyrrrr"/>
         <phase duration="1"  state="rrrrrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="115" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgGGggrrrrr"/>
-        <phase duration="3"  state="yyyyyyyyrrrrr"/>
+        <phase duration="3"  state="Gyyyyyyyrrrrr"/>
         <phase duration="42" state="GrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyyy"/>
+        <phase duration="3"  state="Grrrrrrryyyyy"/>
     </tlLogic>
     <tlLogic id="118" type="static" programID="0" offset="0">
         <phase duration="38" state="GggrrrGGg"/>
-        <phase duration="3"  state="yggrrryyy"/>
+        <phase duration="3"  state="Gggrrryyy"/>
         <phase duration="6"  state="GGGrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrr"/>
         <phase duration="37" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="12" type="static" programID="0" offset="0">
         <phase duration="19" state="rrrrrrgGgggrrrrrrrrrrrGGGGgg"/>
@@ -10194,15 +10194,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="3"  state="yyyyrrrryyyy"/>
         <phase duration="1"  state="rrrrrrrrrrrr"/>
         <phase duration="41" state="rrrrGGGgGrrr"/>
-        <phase duration="3"  state="rrrryyyyyrrr"/>
+        <phase duration="3"  state="rrrryyyyGrrr"/>
     </tlLogic>
     <tlLogic id="122" type="static" programID="0" offset="0">
         <phase duration="38" state="rrrGGGGgGgg"/>
-        <phase duration="3"  state="rrryyyyyygg"/>
+        <phase duration="3"  state="rrryyyyyGgg"/>
         <phase duration="6"  state="rrrrrrrrGGG"/>
         <phase duration="3"  state="rrrrrrrryyy"/>
         <phase duration="37" state="GGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrrrr"/>
     </tlLogic>
     <tlLogic id="124" type="static" programID="0" offset="0">
         <phase duration="38" state="GGGggrrrrGGGggrrrrr"/>
@@ -10214,37 +10214,37 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="127" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGggrrrrGGGGg"/>
-        <phase duration="3"  state="yyyyyrrrryyyyy"/>
+        <phase duration="3"  state="yyyyyrrrrGyyyy"/>
         <phase duration="42" state="rrrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="1322" type="static" programID="0" offset="0">
         <phase duration="18" state="GGGgGrrrrrrrrrrrr"/>
         <phase duration="3"  state="yyyyyrrrrrrrrrrrr"/>
         <phase duration="20" state="rrrrrrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrrrryyyyGrrrr"/>
         <phase duration="20" state="GrrrrrrrrrrrGGGGg"/>
         <phase duration="3"  state="yrrrrrrrrrrryyyyy"/>
         <phase duration="20" state="rrrrGGGgGrrrrrrrr"/>
-        <phase duration="3"  state="rrrryyyyyrrrrrrrr"/>
+        <phase duration="3"  state="rrrrGyyyyrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="1344" type="static" programID="0" offset="0">
         <phase duration="38" state="GggrrrGGg"/>
-        <phase duration="3"  state="yggrrryyy"/>
+        <phase duration="3"  state="Gggrrryyy"/>
         <phase duration="6"  state="GGGrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrr"/>
         <phase duration="37" state="rrrGGgGrr"/>
-        <phase duration="3"  state="rrryyyyrr"/>
+        <phase duration="3"  state="rrryyyGrr"/>
     </tlLogic>
     <tlLogic id="1356" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgggrrrrrGGGg"/>
-        <phase duration="3"  state="yyyyyyrrrrryyyy"/>
+        <phase duration="3"  state="yyyyyyrrrrrGyyy"/>
         <phase duration="42" state="rrrrrrGGGGgGrrr"/>
-        <phase duration="3"  state="rrrrrryyyyyyrrr"/>
+        <phase duration="3"  state="rrrrrryyyyyGrrr"/>
     </tlLogic>
     <tlLogic id="1372" type="static" programID="0" offset="0">
         <phase duration="16" state="rrrrrrrrrrrrrrrrrGGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrrrrrrrrrrrrryyyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrrrrrrrrrrrrryyyyygrrrr"/>
         <phase duration="17" state="rrrrrrGGgggrrrrrrrrrrrgGggg"/>
         <phase duration="3"  state="rrrrrryygggrrrrrrrrrrrgyggg"/>
         <phase duration="6"  state="rrrrrrrrGggrrrrrrrrrrrgrgGG"/>
@@ -10258,9 +10258,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="1424" type="static" programID="0" offset="0">
         <phase duration="42" state="GGggrrrGGGGg"/>
-        <phase duration="3"  state="yyyyrrryyyyy"/>
+        <phase duration="3"  state="yyyyrrrGyyyy"/>
         <phase duration="42" state="rrrrGGgGrrrr"/>
-        <phase duration="3"  state="rrrryyyyrrrr"/>
+        <phase duration="3"  state="rrrryyyGrrrr"/>
     </tlLogic>
     <tlLogic id="1428" type="static" programID="0" offset="0">
         <phase duration="19" state="rrrrrrrrrrGGGggrrrrrrrGGGGggg"/>
@@ -10308,17 +10308,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="6"  state="rrrrrrrGggrrrrrrrrrrgrgGG"/>
         <phase duration="3"  state="rrrrrrryyyrrrrrrrrrryryyy"/>
         <phase duration="24" state="GGgggrrrrrrrrrrGGGggrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrrrrryyyyyrrrrr"/>
+        <phase duration="3"  state="yyyyyrrrrrrrrrrGyyyyrrrrr"/>
         <phase duration="24" state="rrrrrrrrrrGGGGgGrrrrrrrrr"/>
         <phase duration="3"  state="rrrrrrrrrryyyyyyrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="1482" type="static" programID="0" offset="0">
         <phase duration="38" state="GGGgGGggrrrr"/>
-        <phase duration="3"  state="yyyyyyggrrrr"/>
+        <phase duration="3"  state="yyyyGGggrrrr"/>
         <phase duration="6"  state="rrrrGGGGrrrr"/>
         <phase duration="3"  state="rrrryyyyrrrr"/>
         <phase duration="37" state="GrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="1492" type="static" programID="0" offset="0">
         <phase duration="33" state="GGggrrrrrGGggrrrr"/>
@@ -10332,31 +10332,31 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="1500" type="static" programID="0" offset="0">
         <phase duration="24" state="GGGgggrrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yyygggrrrrrrrryyyyy"/>
+        <phase duration="3"  state="GGGgggrrrrrrrryyyyy"/>
         <phase duration="6"  state="GGGGGGrrrrrrrrrrrrr"/>
         <phase duration="3"  state="yyyyyyrrrrrrrrrrrrr"/>
         <phase duration="24" state="rrrrrrrrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrrrrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrrrrrrGyyyyrrrr"/>
         <phase duration="24" state="rrrrrrGGGgGrrrrrrrr"/>
         <phase duration="3"  state="rrrrrryyyyyrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="1516" type="static" programID="0" offset="0">
         <phase duration="24" state="GGGgggrrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yyygggrrrrrrrryyyyy"/>
+        <phase duration="3"  state="GGGgggrrrrrrrryyyyy"/>
         <phase duration="6"  state="GGGGGGrrrrrrrrrrrrr"/>
         <phase duration="3"  state="yyyyyyrrrrrrrrrrrrr"/>
         <phase duration="24" state="rrrrrrrrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrrrrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrrrrrrGyyyyrrrr"/>
         <phase duration="24" state="rrrrrrGGGgGrrrrrrrr"/>
         <phase duration="3"  state="rrrrrryyyyyrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="1522" type="static" programID="0" offset="0">
         <phase duration="18" state="rrrrrGGGgGrrrrrrr"/>
-        <phase duration="3"  state="rrrrryyyyyrrrrrrr"/>
+        <phase duration="3"  state="rrrrryyyyGrrrrrrr"/>
         <phase duration="20" state="rrrrrrrrrGGGgGrrr"/>
         <phase duration="3"  state="rrrrrrrrryyyyyrrr"/>
         <phase duration="20" state="GGGGgGrrrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyrrrrrrrrrrr"/>
+        <phase duration="3"  state="Gyyyyyrrrrrrrrrrr"/>
         <phase duration="20" state="GrrrrrrrrrrrrGGGg"/>
         <phase duration="3"  state="yrrrrrrrrrrrryyyy"/>
     </tlLogic>
@@ -10368,15 +10368,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="1772" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgggrrrrGGg"/>
-        <phase duration="3"  state="yyyyyyrrrryyy"/>
+        <phase duration="3"  state="yyyyyyrrrrGyy"/>
         <phase duration="42" state="rrrrrrGGGgGrr"/>
-        <phase duration="3"  state="rrrrrryyyyyrr"/>
+        <phase duration="3"  state="rrrrrryyyyGrr"/>
     </tlLogic>
     <tlLogic id="1782" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgGGGggrrrr"/>
-        <phase duration="3"  state="yyyyyyyyyrrrr"/>
+        <phase duration="3"  state="Gyyyyyyyyrrrr"/>
         <phase duration="42" state="GrrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="1796" type="static" programID="0" offset="0">
         <phase duration="19" state="rrrrrrGGGGgggrrrrrrrrrrrGGGGGgg"/>
@@ -10412,7 +10412,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="3"  state="rrrrrrrryyyrrrrrrrrrrrrrrrryy"/>
         <phase duration="1"  state="rrrrrrrrrrrrrrrrrrrrrrrrrrrrr"/>
         <phase duration="21" state="rrrrrrrrrrrGGGGgGrrrrrrrrrrrr"/>
-        <phase duration="3"  state="rrrrrrrrrrryyyyyyrrrrrrrrrrrr"/>
+        <phase duration="3"  state="rrrrrrrrrrryyyyyGrrrrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="1934" type="static" programID="0" offset="0">
         <phase duration="33" state="rrrrrrGGGggrrrrGGGGgg"/>
@@ -10429,17 +10429,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="3"  state="yyyyyrrrrr"/>
         <phase duration="1"  state="rrrrrrrrrr"/>
         <phase duration="27" state="GrrrrrrGGg"/>
-        <phase duration="3"  state="yrrrrrryyy"/>
+        <phase duration="3"  state="yrrrrrrGyy"/>
         <phase duration="27" state="rrrrGGgGrr"/>
-        <phase duration="3"  state="rrrryyyyrr"/>
+        <phase duration="3"  state="rrrrGyyyrr"/>
     </tlLogic>
     <tlLogic id="1949" type="static" programID="0" offset="0">
         <phase duration="24" state="GGGgggrrrrrrrrrrrGGGGGg"/>
-        <phase duration="3"  state="yyygggrrrrrrrrrrryyyyyy"/>
+        <phase duration="3"  state="GGGgggrrrrrrrrrrryyyyyy"/>
         <phase duration="6"  state="GGGGGGrrrrrrrrrrrrrrrrr"/>
         <phase duration="3"  state="yyyyyyrrrrrrrrrrrrrrrrr"/>
         <phase duration="24" state="rrrrrrrrrrrGGGGGgGrrrrr"/>
-        <phase duration="3"  state="rrrrrrrrrrryyyyyyyrrrrr"/>
+        <phase duration="3"  state="rrrrrrrrrrrGyyyyyyrrrrr"/>
         <phase duration="24" state="rrrrrrGGGGgGrrrrrrrrrrr"/>
         <phase duration="3"  state="rrrrrryyyyyyrrrrrrrrrrr"/>
     </tlLogic>
@@ -10457,40 +10457,40 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="2109" type="static" programID="0" offset="0">
         <phase duration="24" state="GGGGGgGGGgggrrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyyyygggrrrrrrrrrr"/>
+        <phase duration="3"  state="yyyyyyGGGgggrrrrrrrrrr"/>
         <phase duration="6"  state="rrrrrrGGGGGGrrrrrrrrrr"/>
         <phase duration="3"  state="rrrrrryyyyyyrrrrrrrrrr"/>
         <phase duration="24" state="rrrrrrrrrrrrGGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrrrrrrrryyyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrrrrrrrryyyyyGrrrr"/>
         <phase duration="24" state="GrrrrrrrrrrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yrrrrrrrrrrrrrrrryyyyy"/>
+        <phase duration="3"  state="Grrrrrrrrrrrrrrrryyyyy"/>
     </tlLogic>
     <tlLogic id="2111" type="static" programID="0" offset="0">
         <phase duration="26" state="GGGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrrr"/>
         <phase duration="27" state="rrrrGGGGgGrr"/>
-        <phase duration="3"  state="rrrryyyyyyrr"/>
+        <phase duration="3"  state="rrrryyyyyGrr"/>
         <phase duration="27" state="GrrrrrrrrGGg"/>
         <phase duration="3"  state="yrrrrrrrryyy"/>
         <phase duration="1"  state="rrrrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="2119" type="static" programID="0" offset="0">
         <phase duration="42" state="GGgGGGgggrrrr"/>
-        <phase duration="3"  state="yyyyyyyyyrrrr"/>
+        <phase duration="3"  state="Gyyyyyyyyrrrr"/>
         <phase duration="42" state="GrrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="2127" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGggrrrrGGg"/>
-        <phase duration="3"  state="yyyyyrrrryyy"/>
+        <phase duration="3"  state="yyyyyrrrrGyy"/>
         <phase duration="42" state="rrrrrGGGgGrr"/>
-        <phase duration="3"  state="rrrrryyyyyrr"/>
+        <phase duration="3"  state="rrrrryyyyGrr"/>
     </tlLogic>
     <tlLogic id="2157" type="static" programID="0" offset="0">
         <phase duration="42" state="GGggrrrGGg"/>
-        <phase duration="3"  state="yyyyrrryyy"/>
+        <phase duration="3"  state="yyyyrrrGyy"/>
         <phase duration="42" state="rrrrGGgGrr"/>
-        <phase duration="3"  state="rrrryyyyrr"/>
+        <phase duration="3"  state="rrrryyyGrr"/>
     </tlLogic>
     <tlLogic id="2170" type="static" programID="0" offset="0">
         <phase duration="33" state="rrrrrGGGggrrrrrrgGGgg"/>
@@ -10516,25 +10516,25 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="2182" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrrGGGgGGGgg"/>
-        <phase duration="3"  state="rrrryyyyyyyyy"/>
+        <phase duration="3"  state="rrrrGyyyyyyyy"/>
         <phase duration="42" state="GGGgGrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="2205" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrrGGGGg"/>
-        <phase duration="3"  state="yyyrrrryyyyy"/>
+        <phase duration="3"  state="yyyrrrrGyyyy"/>
         <phase duration="42" state="rrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrryyyyyrrrr"/>
+        <phase duration="3"  state="rrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="2277" type="static" programID="0" offset="0">
         <phase duration="42" state="GggrrrrGGGGg"/>
-        <phase duration="3"  state="yyyrrrryyyyy"/>
+        <phase duration="3"  state="yyyrrrrGyyyy"/>
         <phase duration="42" state="rrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrryyyyyrrrr"/>
+        <phase duration="3"  state="rrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="2288" type="static" programID="0" offset="0">
         <phase duration="22" state="GGgggrrrrrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yygggrrrrrrrrrrryyyyy"/>
+        <phase duration="3"  state="GGgggrrrrrrrrrrryyyyy"/>
         <phase duration="6"  state="GGGGGrrrrrrrrrrrrrrrr"/>
         <phase duration="3"  state="yyyyyrrrrrrrrrrrrrrrr"/>
         <phase duration="24" state="rrrrrrrrrrGGGGGgGrrrr"/>
@@ -10568,9 +10568,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="2424" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrrGGGgGGgg"/>
-        <phase duration="3"  state="rrrryyyyyyyy"/>
+        <phase duration="3"  state="rrrrGyyyyyyy"/>
         <phase duration="42" state="GGGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrrr"/>
     </tlLogic>
     <tlLogic id="2452" type="static" programID="0" offset="0">
         <phase duration="38" state="rrrrGGggrrrrrrGGGgg"/>
@@ -10582,20 +10582,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="2493" type="static" programID="0" offset="0">
         <phase duration="37" state="GggrrrGGGg"/>
-        <phase duration="3"  state="yggrrryyyy"/>
+        <phase duration="3"  state="Gggrrryyyy"/>
         <phase duration="6"  state="GGGrrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrrr"/>
         <phase duration="1"  state="rrrrrrrrrr"/>
         <phase duration="37" state="rrrGGgGrrr"/>
-        <phase duration="3"  state="rrryyyyrrr"/>
+        <phase duration="3"  state="rrryyyGrrr"/>
     </tlLogic>
     <tlLogic id="2501" type="static" programID="0" offset="0">
         <phase duration="27" state="GGGrrrrrrrGGGg"/>
-        <phase duration="3"  state="yyyrrrrrrryyyy"/>
+        <phase duration="3"  state="yyyrrrrrrrGyyy"/>
         <phase duration="27" state="rrrrrrGGGgGrrr"/>
-        <phase duration="3"  state="rrrrrryyyyyrrr"/>
+        <phase duration="3"  state="rrrrrrGyyyyrrr"/>
         <phase duration="27" state="GGGGGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyyrrrrrrr"/>
+        <phase duration="3"  state="GGGyyyyrrrrrrr"/>
     </tlLogic>
     <tlLogic id="2713" type="static" programID="0" offset="0">
         <phase duration="33" state="GGggrrrrrGGGggrrrr"/>
@@ -10609,52 +10609,52 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="2731" type="static" programID="0" offset="0">
         <phase duration="26" state="GGGgGrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrr"/>
         <phase duration="27" state="rrrrGGGgGrr"/>
         <phase duration="3"  state="rrrryyyyyrr"/>
         <phase duration="1"  state="rrrrrrrrrrr"/>
         <phase duration="27" state="GrrrrrrrGGg"/>
-        <phase duration="3"  state="yrrrrrrryyy"/>
+        <phase duration="3"  state="Grrrrrrryyy"/>
     </tlLogic>
     <tlLogic id="2755" type="static" programID="0" offset="0">
         <phase duration="18" state="GGGgGGrrrrrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyrrrrrrrrrrrrr"/>
+        <phase duration="3"  state="Gyyyyyrrrrrrrrrrrrr"/>
         <phase duration="20" state="GrrrrrrrrrrrrrrGGGg"/>
         <phase duration="3"  state="yrrrrrrrrrrrrrryyyy"/>
         <phase duration="20" state="rrrrGGGGGGgGrrrrrrr"/>
-        <phase duration="3"  state="rrrryyyyyyyyrrrrrrr"/>
+        <phase duration="3"  state="rrrryyyyyyyGrrrrrrr"/>
         <phase duration="20" state="rrrrrrrrrrrGGGgGrrr"/>
         <phase duration="3"  state="rrrrrrrrrrryyyyyrrr"/>
     </tlLogic>
     <tlLogic id="2765" type="static" programID="0" offset="0">
         <phase duration="38" state="rrrGGgGgg"/>
-        <phase duration="3"  state="rrryyyygg"/>
+        <phase duration="3"  state="rrryyyGgg"/>
         <phase duration="6"  state="rrrrrrGGG"/>
         <phase duration="3"  state="rrrrrryyy"/>
         <phase duration="37" state="GGgGrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrr"/>
     </tlLogic>
     <tlLogic id="2875" type="static" programID="0" offset="0">
         <phase duration="27" state="GrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyy"/>
+        <phase duration="3"  state="yrrrrrrrGyyy"/>
         <phase duration="27" state="rrrGGGGgGrrr"/>
-        <phase duration="3"  state="rrryyyyyyrrr"/>
+        <phase duration="3"  state="rrrGyyyyyrrr"/>
         <phase duration="27" state="GGgGrrrrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrrrrr"/>
+        <phase duration="3"  state="Gyyyrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="2894" type="static" programID="0" offset="0">
         <phase duration="38" state="GggrrrGGGg"/>
-        <phase duration="3"  state="yggrrryyyy"/>
+        <phase duration="3"  state="Gggrrryyyy"/>
         <phase duration="6"  state="GGGrrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrrr"/>
         <phase duration="37" state="rrrGGgGrrr"/>
-        <phase duration="3"  state="rrryyyyrrr"/>
+        <phase duration="3"  state="rrryyyGrrr"/>
     </tlLogic>
     <tlLogic id="2902" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrrrGGGGgGGGgg"/>
-        <phase duration="3"  state="rrrrryyyyyyyyyy"/>
+        <phase duration="3"  state="rrrrrGyyyyyyyyy"/>
         <phase duration="42" state="GGGGgGrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyrrrrrrrrr"/>
+        <phase duration="3"  state="yyyyyGrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="2960" type="static" programID="0" offset="0">
         <phase duration="33" state="GGggrrrrgGGggrrrr"/>
@@ -10669,11 +10669,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="2978" type="static" programID="0" offset="0">
         <phase duration="27" state="GGGgGrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrr"/>
+        <phase duration="3"  state="Gyyyyrrrrr"/>
         <phase duration="27" state="GrrrrrrGGg"/>
-        <phase duration="3"  state="yrrrrrryyy"/>
+        <phase duration="3"  state="yrrrrrrGyy"/>
         <phase duration="27" state="rrrrGGgGrr"/>
-        <phase duration="3"  state="rrrryyyyrr"/>
+        <phase duration="3"  state="rrrrGyyyrr"/>
     </tlLogic>
     <tlLogic id="3090" type="static" programID="0" offset="0">
         <phase duration="37" state="rrrrrrGGGggrrrrrrGGgg"/>
@@ -10689,7 +10689,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="3"  state="yyyyyyrrrryyyyy"/>
         <phase duration="1"  state="rrrrrrrrrrrrrrr"/>
         <phase duration="41" state="rrrrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="3136" type="static" programID="0" offset="0">
         <phase duration="37" state="GGggrrrrrrGGggrrrrr"/>
@@ -10717,9 +10717,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="324" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrrrGGGgGGGgg"/>
-        <phase duration="3"  state="rrrrryyyyyyyyy"/>
+        <phase duration="3"  state="rrrrrGyyyyyyyy"/>
         <phase duration="42" state="GGGGgGrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyrrrrrrrr"/>
+        <phase duration="3"  state="yyyyyGrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="329" type="static" programID="0" offset="0">
         <phase duration="38" state="GGggrrrrrrGGggrrrr"/>
@@ -10731,9 +10731,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="335" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgggrrrrGGGg"/>
-        <phase duration="3"  state="yyyyyyrrrryyyy"/>
+        <phase duration="3"  state="yyyyyyrrrrGyyy"/>
         <phase duration="42" state="rrrrrrGGGgGrrr"/>
-        <phase duration="3"  state="rrrrrryyyyyrrr"/>
+        <phase duration="3"  state="rrrrrryyyyGrrr"/>
     </tlLogic>
     <tlLogic id="360" type="static" programID="0" offset="0">
         <phase duration="41" state="GGGGgGGgggrrrr"/>
@@ -10753,7 +10753,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="3638" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgggrrrrGGGGg"/>
-        <phase duration="3"  state="yyyyyyrrrryyyyy"/>
+        <phase duration="3"  state="yyyyyyrrrrGyyyy"/>
         <phase duration="41" state="rrrrrrGGGgGrrrr"/>
         <phase duration="3"  state="rrrrrryyyyyrrrr"/>
         <phase duration="1"  state="rrrrrrrrrrrrrrr"/>
@@ -10788,32 +10788,32 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="3743" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrrGGGgGGgg"/>
-        <phase duration="3"  state="rrrryyyyyyyy"/>
+        <phase duration="3"  state="rrrrGyyyyyyy"/>
         <phase duration="42" state="GGGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrrr"/>
     </tlLogic>
     <tlLogic id="3768" type="static" programID="0" offset="0">
         <phase duration="26" state="rrrGGGGgGrrr"/>
-        <phase duration="3"  state="rrryyyyyyrrr"/>
+        <phase duration="3"  state="rrryyyyyGrrr"/>
         <phase duration="27" state="GrrrrrrrGGGg"/>
         <phase duration="3"  state="yrrrrrrryyyy"/>
         <phase duration="1"  state="rrrrrrrrrrrr"/>
         <phase duration="27" state="GGgGrrrrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="378" type="static" programID="0" offset="0">
         <phase duration="38" state="GggrrrrGGGGg"/>
-        <phase duration="3"  state="yggrrrryyyyy"/>
+        <phase duration="3"  state="Gggrrrryyyyy"/>
         <phase duration="6"  state="GGGrrrrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrrrrr"/>
         <phase duration="37" state="rrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrryyyyyrrrr"/>
+        <phase duration="3"  state="rrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="382" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrGGGgGGgg"/>
-        <phase duration="3"  state="rrryyyyyyyy"/>
+        <phase duration="3"  state="rrrGyyyyyyy"/>
         <phase duration="42" state="GGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrrrr"/>
     </tlLogic>
     <tlLogic id="522" type="static" programID="0" offset="0">
         <phase duration="21" state="rrrrrrrrrrGGGggrrrrrrGGGGggg"/>
@@ -10825,31 +10825,31 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="6"  state="rrGGGrrrrrrrrrrrrrrGGrrrrrrr"/>
         <phase duration="3"  state="rryyyrrrrrrrrrrrrrryyrrrrrrr"/>
         <phase duration="21" state="rrrrrGGGGgGrrrrrrrrrrrrrrrrr"/>
-        <phase duration="3"  state="rrrrryyyyyyrrrrrrrrrrrrrrrrr"/>
+        <phase duration="3"  state="rrrrryyyyyGrrrrrrrrrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="534" type="static" programID="0" offset="0">
         <phase duration="18" state="GrrrrrrrrrrrrGGGGg"/>
-        <phase duration="3"  state="yrrrrrrrrrrrryyyyy"/>
+        <phase duration="3"  state="Grrrrrrrrrrrryyyyy"/>
         <phase duration="20" state="GGGgGrrrrrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrrrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrrrrrrrrr"/>
         <phase duration="20" state="rrrrGGGgGrrrrrrrrr"/>
-        <phase duration="3"  state="rrrryyyyyrrrrrrrrr"/>
+        <phase duration="3"  state="rrrryyyyGrrrrrrrrr"/>
         <phase duration="20" state="rrrrrrrrGGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrrrryyyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrrrryyyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="568" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrGGgGGgg"/>
-        <phase duration="3"  state="rrryyyyyyy"/>
+        <phase duration="3"  state="rrrGyyyyyy"/>
         <phase duration="42" state="GGgGrrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrrr"/>
     </tlLogic>
     <tlLogic id="576" type="static" programID="0" offset="0">
         <phase duration="38" state="GggrrrGGGg"/>
-        <phase duration="3"  state="yggrrryyyy"/>
+        <phase duration="3"  state="Gggrrryyyy"/>
         <phase duration="6"  state="GGGrrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrrr"/>
         <phase duration="37" state="rrrGGgGrrr"/>
-        <phase duration="3"  state="rrryyyyrrr"/>
+        <phase duration="3"  state="rrryyyGrrr"/>
     </tlLogic>
     <tlLogic id="578" type="static" programID="0" offset="0">
         <phase duration="42" state="rrrrrGGGGggrrrrrGGGGgg"/>
@@ -10859,11 +10859,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="584" type="static" programID="0" offset="0">
         <phase duration="38" state="rrrGGgGGggg"/>
-        <phase duration="3"  state="rrryyyyyggg"/>
+        <phase duration="3"  state="rrryyyGGggg"/>
         <phase duration="6"  state="rrrrrrGGGGG"/>
         <phase duration="3"  state="rrrrrryyyyy"/>
         <phase duration="37" state="GGgGrrrrrrr"/>
-        <phase duration="3"  state="yyyyrrrrrrr"/>
+        <phase duration="3"  state="yyyGrrrrrrr"/>
     </tlLogic>
     <tlLogic id="591" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGGggrrrrrGGGggrrrrr"/>
@@ -10873,39 +10873,39 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="6" type="static" programID="0" offset="0">
         <phase duration="18" state="GrrrrrrrrrrrGGGGGg"/>
-        <phase duration="3"  state="yrrrrrrrrrrryyyyyy"/>
+        <phase duration="3"  state="yrrrrrrrrrrrGyyyyy"/>
         <phase duration="20" state="rrrrrrrrGGGgGrrrrr"/>
         <phase duration="3"  state="rrrrrrrryyyyyrrrrr"/>
         <phase duration="20" state="GGGgGrrrrrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyrrrrrrrrrrrrr"/>
+        <phase duration="3"  state="yyyyGrrrrrrrrrrrrr"/>
         <phase duration="20" state="rrrrGGGgGrrrrrrrrr"/>
         <phase duration="3"  state="rrrryyyyyrrrrrrrrr"/>
     </tlLogic>
     <tlLogic id="607" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGgggrrrrrGGGGg"/>
-        <phase duration="3"  state="yyyyyyrrrrryyyyy"/>
+        <phase duration="3"  state="yyyyyyrrrrrGyyyy"/>
         <phase duration="42" state="rrrrrrGGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrrryyyyyyrrrr"/>
+        <phase duration="3"  state="rrrrrryyyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="617" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGggrrrrGGg"/>
-        <phase duration="3"  state="yyyyyrrrryyy"/>
+        <phase duration="3"  state="yyyyyrrrrGyy"/>
         <phase duration="42" state="rrrrrGGGgGrr"/>
-        <phase duration="3"  state="rrrrryyyyyrr"/>
+        <phase duration="3"  state="rrrrryyyyGrr"/>
     </tlLogic>
     <tlLogic id="624" type="static" programID="0" offset="0">
         <phase duration="38" state="GGggrrrrGGGGg"/>
-        <phase duration="3"  state="yyggrrrryyyyy"/>
+        <phase duration="3"  state="GGggrrrryyyyy"/>
         <phase duration="6"  state="GGGGrrrrrrrrr"/>
         <phase duration="3"  state="yyyyrrrrrrrrr"/>
         <phase duration="37" state="rrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="63" type="static" programID="0" offset="0">
         <phase duration="42" state="GGgGGGgggrrrr"/>
-        <phase duration="3"  state="yyyyyyyyyrrrr"/>
+        <phase duration="3"  state="Gyyyyyyyyrrrr"/>
         <phase duration="42" state="GrrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="638" type="static" programID="0" offset="0">
         <phase duration="21" state="GGGggrrrrrrrGGGgggrrrrrrrrrr"/>
@@ -10921,31 +10921,31 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="641" type="static" programID="0" offset="0">
         <phase duration="38" state="GGgGGggrrrr"/>
-        <phase duration="3"  state="yyyyyggrrrr"/>
+        <phase duration="3"  state="yyyGGggrrrr"/>
         <phase duration="6"  state="rrrGGGGrrrr"/>
         <phase duration="3"  state="rrryyyyrrrr"/>
         <phase duration="37" state="GrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="649" type="static" programID="0" offset="0">
         <phase duration="38" state="GGgggrrrrGGGGg"/>
-        <phase duration="3"  state="yygggrrrryyyyy"/>
+        <phase duration="3"  state="GGgggrrrryyyyy"/>
         <phase duration="6"  state="GGGGGrrrrrrrrr"/>
         <phase duration="3"  state="yyyyyrrrrrrrrr"/>
         <phase duration="37" state="rrrrrGGGgGrrrr"/>
-        <phase duration="3"  state="rrrrryyyyyrrrr"/>
+        <phase duration="3"  state="rrrrryyyyGrrrr"/>
     </tlLogic>
     <tlLogic id="673" type="static" programID="0" offset="0">
         <phase duration="38" state="GGGGgGggrrrr"/>
-        <phase duration="3"  state="yyyyyyggrrrr"/>
+        <phase duration="3"  state="yyyyyGggrrrr"/>
         <phase duration="6"  state="rrrrrGGGrrrr"/>
         <phase duration="3"  state="rrrrryyyrrrr"/>
         <phase duration="37" state="GrrrrrrrGGGg"/>
-        <phase duration="3"  state="yrrrrrrryyyy"/>
+        <phase duration="3"  state="Grrrrrrryyyy"/>
     </tlLogic>
     <tlLogic id="683" type="static" programID="0" offset="0">
         <phase duration="37" state="GGgggrrrrGGg"/>
-        <phase duration="3"  state="yygggrrrryyy"/>
+        <phase duration="3"  state="GGgggrrrryyy"/>
         <phase duration="6"  state="GGGGGrrrrrrr"/>
         <phase duration="3"  state="yyyyyrrrrrrr"/>
         <phase duration="1"  state="rrrrrrrrrrrr"/>
@@ -10955,7 +10955,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="727" type="static" programID="0" offset="0">
         <phase duration="37" state="GggrrrGGGGg"/>
-        <phase duration="3"  state="yggrrryyyyy"/>
+        <phase duration="3"  state="Gggrrryyyyy"/>
         <phase duration="6"  state="GGGrrrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrrrr"/>
         <phase duration="1"  state="rrrrrrrrrrr"/>
@@ -10975,11 +10975,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="847" type="static" programID="0" offset="0">
         <phase duration="18" state="rrrrrrrGGGGGgGrrrrrrrrrrrrrrr"/>
-        <phase duration="3"  state="rrrrrrryyyyyyyrrrrrrrrrrrrrrr"/>
+        <phase duration="3"  state="rrrrrrryyyyyyGrrrrrrrrrrrrrrr"/>
         <phase duration="20" state="GGGGGggrrrrrrGGgggrrrrrrrrrrr"/>
-        <phase duration="3"  state="yyyyyyyrrrrrryyyyyrrrrrrrrrrr"/>
+        <phase duration="3"  state="Gyyyyyyrrrrrryyyyyrrrrrrrrrrr"/>
         <phase duration="20" state="GrrrrrrrrrrrrrrrrrrrrrrGGGGGg"/>
-        <phase duration="3"  state="yrrrrrrrrrrrrrrrrrrrrrryyyyyy"/>
+        <phase duration="3"  state="yrrrrrrrrrrrrrrrrrrrrrrGyyyyy"/>
         <phase duration="20" state="rrrrrrrrrrrrrrrrrrGGGGgGrrrrr"/>
         <phase duration="3"  state="rrrrrrrrrrrrrrrrrryyyyyyrrrrr"/>
     </tlLogic>
@@ -10993,11 +10993,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </tlLogic>
     <tlLogic id="881" type="static" programID="0" offset="0">
         <phase duration="38" state="GggrrrGGGg"/>
-        <phase duration="3"  state="yggrrryyyy"/>
+        <phase duration="3"  state="Gggrrryyyy"/>
         <phase duration="6"  state="GGGrrrrrrr"/>
         <phase duration="3"  state="yyyrrrrrrr"/>
         <phase duration="37" state="rrrGGgGrrr"/>
-        <phase duration="3"  state="rrryyyyrrr"/>
+        <phase duration="3"  state="rrryyyGrrr"/>
     </tlLogic>
 
     <junction id="1" type="traffic_light" x="1263.68" y="1880.98" incLanes="-7_0 -7_1 -9_0 -9_1 -3_0 -11_0 -11_1 -11_2" intLanes=":1_0_0 :1_1_0 :1_1_1 :1_18_0 :1_19_0 :1_5_0 :1_6_0 :1_6_1 :1_20_0 :1_21_0 :1_10_0 :1_11_0 :1_22_0 :1_23_0 :1_14_0 :1_15_0 :1_24_0 :1_25_0" shape="1257.48,1893.62 1267.08,1893.47 1267.47,1890.17 1268.01,1889.03 1268.77,1888.24 1269.76,1887.78 1270.98,1887.66 1271.34,1878.06 1268.22,1876.79 1266.88,1875.30 1265.68,1873.23 1264.62,1870.60 1263.71,1867.39 1254.37,1869.63 1254.18,1872.02 1253.46,1873.05 1252.34,1873.98 1250.80,1874.80 1248.85,1875.52 1253.59,1890.81 1255.72,1890.59 1256.48,1890.92 1257.02,1891.53 1257.35,1892.43">