From fcae6a4a522773066b39904d0ad934eb62002547 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Fri, 20 Dec 2024 12:02:43 +0100
Subject: [PATCH] patching expected results refs #21

---
 tests/tools/import/OSM/webWizard/errors.tools |   4 +
 tests/tools/import/OSM/webWizard/output.tools |  76 ++---
 .../tools/import/OSM/webWizard/ptroutes.tools | 278 +++++++++---------
 3 files changed, 181 insertions(+), 177 deletions(-)

diff --git a/tests/tools/import/OSM/webWizard/errors.tools b/tests/tools/import/OSM/webWizard/errors.tools
index cd3a6f44a266..240b9602aa15 100644
--- a/tests/tools/import/OSM/webWizard/errors.tools
+++ b/tests/tools/import/OSM/webWizard/errors.tools
@@ -132,5 +132,9 @@ Warning: Person 'ped122' is jammed on edge ':1828018040_c0', time=639.00.
 Warning: Vehicle 'pt_tram_12:0.1' performs emergency braking on lane ':98973667_3_0' with decel=7.00, wished=3.00, severity=1.00, time=755.00.
 Warning: Person 'ped67' aborted waiting for M5:3 at busStop '30731481'.
 Warning: Person 'ped94' aborted waiting for N2:0 at busStop '2915590925'.
+Warning: Person 'ped145' aborted waiting for N42:0 at busStop '2915590925'.
+Warning: Person 'ped157' aborted waiting for N42:1 at busStop '3867910439'.
+Warning: Person 'ped136' aborted waiting for N42:1 at busStop '3867910439'.
+Warning: Person 'ped155' aborted waiting for N42:1 at busStop '3867910439'.
 Warning: Person 'ped59' aborted waiting for M5:0 at busStop '1633759766'.
 Warning: Person 'ped47' aborted waiting for TXL:0 at busStop '3869306771'.
diff --git a/tests/tools/import/OSM/webWizard/output.tools b/tests/tools/import/OSM/webWizard/output.tools
index 2060ab7f93c6..0128b3a6d03b 100644
--- a/tests/tools/import/OSM/webWizard/output.tools
+++ b/tests/tools/import/OSM/webWizard/output.tools
@@ -1,9 +1,9 @@
 Success.
 Written configuration to 'osm.polycfg'
-Parsing network projection from 'osm.net.xml.gz' ... done (28ms).
-Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (229ms).
-Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (170ms).
-Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (187ms).
+Parsing network projection from 'osm.net.xml.gz' ... done (8ms).
+Parsing nodes from osm-file '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (235ms).
+Parsing relations from osm-file '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (163ms).
+Parsing edges from osm-file '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/osm_bbox.osm.xml' ... done (180ms).
 Assembled polygon from relation '3619' (name:Altes Museum)
 Assembled polygon from relation '6647' (name:Humboldt-Universität zu Berlin)
 Assembled polygon from relation '23745' (name:Altes Stadthaus)
@@ -141,7 +141,7 @@ Assembled polygon from relation '8249214' (name:Hof V)
 Assembled polygon from relation '8249215' (name:)
 Assembled polygon from relation '8249216' (name:)
 Success.
-Building scenario in '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/test'.
+Building scenario in '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test'.
 generating trips...
 Skipping line '2194813' because it only drives at night
 Skipping line '2194814' because it only drives at night
@@ -172,18 +172,18 @@ Success.
 Success.
 Success.
 Written configuration to 'osm.sumocfg'
-Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (270ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (110ms).
-Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.05Dec084312.1988220/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (9ms).
+Loading net-file from '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm.net.xml.gz' ... done (249ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm.poly.xml.gz' ... done (114ms).
+Loading additional-files from '/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm_stops.add.xml' ... done (9ms).
 Loading done.
-Simulation version v1_21_0+1188-de3782bea46 started with time: 0.00.
-Simulation ended at time: 3100.00.
+Simulation version v1_21_0+1543-d05ff320712 started with time: 0.00.
+Simulation ended at time: 3123.00.
 Reason: All vehicles have left the simulation.
 Performance:
- Duration: 1.28s
- Real time factor: 2416.21
- UPS: 109813.717849
- UPS-Persons: 114042.868277
+ Duration: 1.11s
+ Real time factor: 2816.05
+ UPS: 126506.762849
+ UPS-Persons: 136401.262399
 Vehicles:
  Inserted: 414
  Running: 0
@@ -194,31 +194,31 @@ Persons:
  Running: 0
  Jammed: 1
 Statistics (avg of 344):
- RouteLength: 1881.64
- Speed: 6.47
- Duration: 331.80
- WaitingTime: 58.76
- TimeLoss: 118.15
+ RouteLength: 1881.66
+ Speed: 6.49
+ Duration: 329.17
+ WaitingTime: 56.38
+ TimeLoss: 115.56
+ DepartDelay: 3.85
 Bike Statistics (avg of 70):
  RouteLength: 1577.22
- Speed: 4.23
- Duration: 382.16
- WaitingTime: 50.21
- TimeLoss: 86.34
-Statistics (avg of 414):
- DepartDelay: 3.95
-Pedestrian Statistics (avg of 438 walks):
- RouteLength: 257.23
- Duration: 213.67
- TimeLoss: 28.11
-Ride Statistics (avg of 171 rides):
- WaitingTime: 114.17
- RouteLength: 915.58
- Duration: 117.97
+ Speed: 4.18
+ Duration: 386.57
+ WaitingTime: 54.06
+ TimeLoss: 90.80
+ DepartDelay: 0.49
+Pedestrian Statistics (avg of 441 walks):
+ RouteLength: 249.52
+ Duration: 207.43
+ TimeLoss: 27.75
+Ride Statistics (avg of 176 rides):
+ WaitingTime: 113.78
+ RouteLength: 893.40
+ Duration: 118.33
  Bus: 60
- Train: 106
- Aborted: 5
-DijkstraRouter answered 6477 queries and explored 10.58 edges on average.
+ Train: 107
+ Aborted: 9
+DijkstraRouter answered 6596 queries and explored 10.84 edges on average.
 DijkstraRouter spent 0.01s answering queries (0.00ms on average).
-DijkstraRouter answered 259 queries and explored 576.47 edges on average.
-DijkstraRouter spent 0.06s answering queries (0.24ms on average).
+DijkstraRouter answered 259 queries and explored 576.41 edges on average.
+DijkstraRouter spent 0.04s answering queries (0.14ms on average).
diff --git a/tests/tools/import/OSM/webWizard/ptroutes.tools b/tests/tools/import/OSM/webWizard/ptroutes.tools
index 566c5ef6f7ac..0ddbbd1a4991 100644
--- a/tests/tools/import/OSM/webWizard/ptroutes.tools
+++ b/tests/tools/import/OSM/webWizard/ptroutes.tools
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-03 12:17:37.532503 by osmWebWizard.py v1_21_0+1142-1c7e6dd0a22
+<!-- generated on 2024-12-20 12:02:18.457553 by osmWebWizard.py v1_21_0+1543-d05ff320712
 <configuration>
-    <net-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/osm.net.xml.gz"/>
-    <ptlines-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/osm_ptlines.xml"/>
-    <ptstops-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/osm_stops.add.xml"/>
-    <output-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/osm_pt.rou.xml"/>
-    <stopinfos-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/stopinfos.xml"/>
-    <routes-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/vehroutes.xml"/>
-    <trips-file value="/home/erdm_ja/.texttest/tmp/tools.03Dec121732.1317609/tools/import/OSM/webWizard/test/trips.trips.xml"/>
+    <net-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm.net.xml.gz"/>
+    <ptlines-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm_ptlines.xml"/>
+    <ptstops-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm_stops.add.xml"/>
+    <output-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/osm_pt.rou.xml"/>
+    <stopinfos-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/stopinfos.xml"/>
+    <routes-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/vehroutes.xml"/>
+    <trips-file value="/home/erdm_ja/.texttest/tmp/tools.20Dec120215.3674958/tools/import/OSM/webWizard/test/trips.trips.xml"/>
     <end value="900.0"/>
     <min-stops value="0"/>
     <extend-to-fringe value="True"/>
@@ -121,8 +121,8 @@
     <route id="pt_bus_M48:1" edges="195401013#3 24914992#1 171826985#0 171826985#1 171826985#3 -534588621#1 -534588621#0 606078071#0 606078071#3 61583423#0 -156364553#1 -156364553#0 -606078065 81112790#1 23851927#0 23851927#1 23851927#2 233835641#0 4773463#0 4773463#2" >
         <stop busStop="270727248" duration="20" until="33.0"/> <!-- S+U Alexanderplatz -->
         <stop busStop="1827996417" duration="20" until="89.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="3867910424" duration="20" until="203.0"/> <!-- Nikolaiviertel -->
-        <stop busStop="3352479219" duration="20" until="297.0"/> <!-- Fischerinsel -->
+        <stop busStop="3867910424" duration="20" until="204.0"/> <!-- Nikolaiviertel -->
+        <stop busStop="3352479219" duration="20" until="295.0"/> <!-- Fischerinsel -->
     </route>
     <route id="pt_train_RB21:0" color="77,102,255" edges="25946661" >
         <stop busStop="366500582" duration="20" until="55.0"/> <!-- Berlin Friedrichstraße -->
@@ -160,8 +160,8 @@
     </route>
     <route id="pt_bus_248:1" edges="328426208#0 23851917#0 23851917#2 23851922#1 60333313 82654055#0 82654055#1 60333311#1 60333311#2 289966097 289966281 289830408 289830064 289966845 289967595#0 82659290#0 66311464#1" >
         <stop busStop="3352479220" duration="20" until="77.0"/> <!-- Fischerinsel -->
-        <stop busStop="3867910416" duration="20" until="168.0"/> <!-- Berliner Rathaus -->
-        <stop busStop="3907105048" duration="20" until="236.0"/> <!-- Littenstraße -->
+        <stop busStop="3867910416" duration="20" until="169.0"/> <!-- Berliner Rathaus -->
+        <stop busStop="3907105048" duration="20" until="238.0"/> <!-- Littenstraße -->
     </route>
     <route id="pt_bus_100:0" color="149,39,110" edges="112128419#2 415280722 195401013#2 195401013#3 24914992#1 171826985#0 171826985#1 171826985#3 24913519#1 24913519#2 541763975 202156995#0 202156995#1 4067932#1 339201219 541763974 61584187#0 61584187#1 61584187#2 61584187#3 61584187#4 54048863 15971197 4611699 169195795#0 169195795#1 169195795#2 169195795#5 169195795#6 169195795#7 169195795#8 169195795#10 340498988 188386313#0 188386313#1 24913304#1" >
         <stop busStop="270719334" duration="20" until="64.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
@@ -170,7 +170,7 @@
         <stop busStop="3867910420" duration="20" until="287.0"/> <!-- Lustgarten -->
         <stop busStop="271296293" duration="20" until="359.0"/> <!-- Staatsoper -->
         <stop busStop="272408975" duration="20" until="445.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="271373068" duration="20" until="526.0"/> <!-- S+U Brandenburger Tor -->
+        <stop busStop="271373068" duration="20" until="525.0"/> <!-- S+U Brandenburger Tor -->
     </route>
     <route id="pt_light_rail_S25:0" color="1,138,71" edges="109444375 230976793#1 465376248 394320752#1" >
         <stop busStop="30353449" duration="20" until="69.0"/> <!-- S Oranienburger Straße -->
@@ -192,33 +192,33 @@
         <stop busStop="1745157971" duration="20" until="148.0"/> <!-- S Hackescher Markt -->
         <stop busStop="2603331695" duration="20" until="235.0"/> <!-- S Friedrichstraße -->
     </route>
-    <route id="pt_subway_U2:0" color="255,51,0" edges="200422335#0 200422335#1" >
-        <stop busStop="2094266782" duration="20" until="63.0"/> <!-- U Rosa-Luxemburg-Platz -->
-        <stop busStop="2094266778" duration="20" until="132.0"/> <!-- U Alexanderplatz -->
-        <stop busStop="2094266781" duration="20" until="196.0"/> <!-- U Klosterstraße -->
-    </route>
     <route id="pt_bus_N5:1" edges="-478396988 -370359204#1 -370359204#0 -316746323#2 -316746323#0 46140376#0 46140376#1 -84960597#1 -84960597#0 11103418 23809678#1 23809678#2 23809678#4 -19002363#10 -19002363#7 -19002363#6 -19002363#4 -19002363#3 -19002363#2 -19002363#1 4613292#0 4613308#1 4613308#2 310357284#0 100405009#0 100405009#2 100405009#3 100405009#4 305093247#0 305093247#2 305093328#1 163368988#3 301733776" >
         <stop busStop="-3867910429" duration="20" until="39.0"/> <!-- S Hackescher Markt -->
         <stop busStop="3867910439" duration="20" until="133.0"/> <!-- U Weinmeisterstraße -->
         <stop busStop="271670135" duration="20" until="303.0"/> <!-- U Alexanderplatz -->
     </route>
+    <route id="pt_subway_U2:0" color="255,51,0" edges="200422335#0 200422335#1" >
+        <stop busStop="2094266782" duration="20" until="63.0"/> <!-- U Rosa-Luxemburg-Platz -->
+        <stop busStop="2094266778" duration="20" until="134.0"/> <!-- U Alexanderplatz -->
+        <stop busStop="2094266781" duration="20" until="197.0"/> <!-- U Klosterstraße -->
+    </route>
     <route id="pt_subway_U2:1" color="255,51,0" edges="384294423 177195505#1 272795470#1" >
         <stop busStop="29495029" duration="20" until="60.0"/> <!-- U Klosterstraße -->
-        <stop busStop="2094266780" duration="20" until="123.0"/> <!-- U Alexanderplatz -->
-        <stop busStop="4961125734" duration="20" until="195.0"/> <!-- U Rosa-Luxemburg-Platz -->
+        <stop busStop="2094266780" duration="20" until="125.0"/> <!-- U Alexanderplatz -->
+        <stop busStop="4961125734" duration="20" until="196.0"/> <!-- U Rosa-Luxemburg-Platz -->
     </route>
     <route id="pt_subway_U6:0" color="128,112,183" edges="169724406 295250353#1 295250353#2 295376548" >
         <stop busStop="2071423352" duration="20" until="53.0"/> <!-- U Französische Straße -->
         <stop busStop="3869306769" duration="20" until="114.0"/> <!-- S+U Friedrichstraße -->
-        <stop busStop="3043709616" duration="20" until="177.0"/> <!-- U Oranienburger Tor -->
+        <stop busStop="3043709616" duration="20" until="176.0"/> <!-- U Oranienburger Tor -->
     </route>
     <route id="pt_train_RB21:1" color="77,102,255" edges="25946661 32590921#1 442921388" >
         <stop busStop="366500582" duration="20" until="55.0"/> <!-- Berlin Friedrichstraße -->
     </route>
     <route id="pt_subway_U6:1" color="128,112,183" edges="378664954 335043673#0 335043673#1 335043673#2 387125527 295255789" >
         <stop busStop="29058100" duration="20" until="65.0"/> <!-- U Oranienburger Tor -->
-        <stop busStop="2792364395" duration="20" until="128.0"/> <!-- S+U Friedrichstraße -->
-        <stop busStop="2071423334" duration="20" until="193.0"/> <!-- U Französische Straße -->
+        <stop busStop="2792364395" duration="20" until="126.0"/> <!-- S+U Friedrichstraße -->
+        <stop busStop="2071423334" duration="20" until="192.0"/> <!-- U Französische Straße -->
     </route>
     <route id="pt_tram_M2:3" color="51,255,51" edges="-148458500#1 -148458500#0 148457212#0 148457212#1 148449390 4791000#0 4791000#1 4791000#2 4791000#3 4791000#4 4791000#5" >
         <stop busStop="-1615531689" duration="20" until="37.0"/> <!-- S+U Alexanderplatz/Dircksenstraße -->
@@ -227,12 +227,12 @@
     <route id="pt_bus_N5:0" edges="47016365#0 301241483#2 301241681#0 301241681#1 301241681#2 301241681#5 301241681#6 246052428 301167584#0 112128419#1 112128419#2 415280722 195401013#2 195401013#3 24914992#1 171826985#0 171826985#1 171826985#3 4773465#1 4773465#2 4773465#3 490365295#1 -156364570#3 -156364570#1 -156364570#0 -77348147 -387892378 -478396988" >
         <stop busStop="3907105049" duration="20" until="52.0"/> <!-- U Alexanderplatz -->
         <stop busStop="270727260" duration="20" until="148.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
-        <stop busStop="270727248" duration="20" until="200.0"/> <!-- S+U Alexanderplatz -->
+        <stop busStop="270727248" duration="20" until="198.0"/> <!-- S+U Alexanderplatz -->
         <stop busStop="1827996417" duration="20" until="253.0"/> <!-- Spandauer Straße/Marienkirche -->
         <stop busStop="-3867910429" duration="20" until="392.0"/> <!-- S Hackescher Markt -->
     </route>
     <route id="pt_bus_265:0" edges="328426193#0 4773463#0 4773463#2" >
-        <stop busStop="3352479219" duration="20" until="49.0"/> <!-- Fischerinsel -->
+        <stop busStop="3352479219" duration="20" until="48.0"/> <!-- Fischerinsel -->
     </route>
     <route id="pt_tram_M6:0" color="0,51,136" edges="317013528#0 317013528#1 317013528#2 317013528#3 150394034#0 150394034#1 150394034#2 150394034#3 150394034#4 150394034#5 150394035#0 150394035#1 150394035#2 150394035#3 150394035#4 10597134#1 421641064" >
         <stop busStop="1789092673" duration="20" until="107.0"/> <!-- U Alexanderplatz -->
@@ -240,6 +240,12 @@
         <stop busStop="4673135647" duration="20" until="288.0"/> <!-- Spandauer Straße/Marienkirche -->
         <stop busStop="1633759766" duration="20" until="356.0"/> <!-- S Hackescher Markt -->
     </route>
+    <route id="pt_bus_N6:0" edges="6227654#0 6227654#2 465376252 388702039#0 388702039#1 388702039#2 388702039#3 388702039#4 388702039#5 388702039#6 388702047#0 388702047#1 388702047#2 388702039#10 388702047#4 541295978 389705415#1 -541295974 6228081 -222328410 -465376254 -4402228 190447768#1 195411602#1 465376240 195411604 11483007 -169999355 -461526153 -194069450#1 -194069450#0 171423001#0 171423001#1 171423001#2 42102542#1 196850608#0 196850608#1 196850606#0" >
+        <stop busStop="3918673888" duration="20" until="79.0"/> <!-- U Oranienburger Tor -->
+        <stop busStop="-3869306765" duration="20" until="223.0"/> <!-- S+U Friedrichstraße -->
+        <stop busStop="-3869306770" duration="20" until="320.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="2959830774" duration="20" until="417.0"/> <!-- U Stadtmitte -->
+    </route>
     <route id="pt_light_rail_S25:1" color="1,138,71" edges="237751551 463462760 230976795#1" >
         <stop busStop="1930939368" duration="20" until="69.0"/> <!-- S Friedrichstraße -->
         <stop busStop="1769645503" duration="20" until="142.0"/> <!-- S Oranienburger Straße -->
@@ -254,22 +260,16 @@
         <stop busStop="2094266775" duration="20" until="200.0"/> <!-- U Alexanderplatz -->
         <stop busStop="3834324122" duration="20" until="268.0"/> <!-- S+U Jannowitzbrücke -->
     </route>
-    <route id="pt_bus_M48:0" edges="328426208#0 23851917#0 23851917#2 23851922#1 60333313 82654055#0 82654055#1 24992428 606078065 156364553#0 156364553#1 72157172 61583424#0 61583424#1 61583424#2 534588621#0 534588621#1 72157174#1 171826984#2 171826984#3 171826984#4 171826984#5 195401006 195401017#3" >
-        <stop busStop="3352479220" duration="20" until="77.0"/> <!-- Fischerinsel -->
-        <stop busStop="271430924" duration="20" until="160.0"/> <!-- Berliner Rathaus -->
-        <stop busStop="1827996414" duration="20" until="322.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="270718978" duration="20" until="475.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
-    </route>
     <route id="pt_light_rail_S9:1" color="154,48,82" edges="4471823#0 4471823#1 4471823#2 25946658#1 4471819#1 4471818#1 25946681 25946682#1 25946682#2 32590894#1 4471817#1 4471817#2 4471817#3 32590638#1 32590647#1 32590496#1 72984377#1 32590438 32590434#1 32590435#1 32590431#1" >
         <stop busStop="27412232" duration="20" until="121.0"/> <!-- S Friedrichstraße -->
         <stop busStop="27411240" duration="20" until="207.0"/> <!-- S Hackescher Markt -->
         <stop busStop="27411231" duration="20" until="281.0"/> <!-- S Alexanderplatz -->
     </route>
-    <route id="pt_bus_N6:0" edges="6227654#0 6227654#2 465376252 388702039#0 388702039#1 388702039#2 388702039#3 388702039#4 388702039#5 388702039#6 388702047#0 388702047#1 388702047#2 388702039#10 388702047#4 541295978 389705415#1 -541295974 6228081 -222328410 -465376254 -4402228 190447768#1 195411602#1 465376240 195411604 11483007 -169999355 -461526153 -194069450#1 -194069450#0 171423001#0 171423001#1 171423001#2 42102542#1 196850608#0 196850608#1 196850606#0" >
-        <stop busStop="3918673888" duration="20" until="78.0"/> <!-- U Oranienburger Tor -->
-        <stop busStop="-3869306765" duration="20" until="200.0"/> <!-- S+U Friedrichstraße -->
-        <stop busStop="-3869306770" duration="20" until="321.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="2959830774" duration="20" until="444.0"/> <!-- U Stadtmitte -->
+    <route id="pt_bus_M48:0" edges="328426208#0 23851917#0 23851917#2 23851922#1 60333313 82654055#0 82654055#1 24992428 606078065 156364553#0 156364553#1 72157172 61583424#0 61583424#1 61583424#2 534588621#0 534588621#1 72157174#1 171826984#2 171826984#3 171826984#4 171826984#5 195401006 195401017#3" >
+        <stop busStop="3352479220" duration="20" until="77.0"/> <!-- Fischerinsel -->
+        <stop busStop="271430924" duration="20" until="160.0"/> <!-- Berliner Rathaus -->
+        <stop busStop="1827996414" duration="20" until="324.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="270718978" duration="20" until="476.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
     </route>
     <route id="pt_light_rail_S9:0" color="154,48,82" edges="32590425 32590433#1 32590433#2 72984388#1 32590501#1 32590649#1 32590649#2 32590640#1 32590640#2 32590653#1 32590904#1 25946685#1 25946685#2 25946678 25946662 29384521#1 29384522#1 29384522#2 29384522#3" >
         <stop busStop="574265352" duration="20" until="74.0"/> <!-- S Alexanderplatz -->
@@ -288,33 +288,33 @@
         <stop busStop="3869306771" duration="20" until="164.0"/> <!-- Unter den Linden/Friedrichstraße -->
         <stop busStop="3870475228" duration="20" until="223.0"/> <!-- Staatsoper -->
         <stop busStop="3867910421" duration="20" until="304.0"/> <!-- Lustgarten -->
-        <stop busStop="1827996414" duration="20" until="371.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="270718978" duration="20" until="513.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
+        <stop busStop="1827996414" duration="20" until="372.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="270718978" duration="20" until="514.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
     </route>
     <route id="pt_train_RE2:1" color="255,230,0" edges="442921387#0 442921387#1 25946656#1 25946673#1 25946674#1 25946676 32590898#1 32590890#1 32590636#1 32572618#1 32572624#1" >
         <stop busStop="29805120" duration="20" until="85.0"/> <!-- Berlin Friedrichstraße -->
         <stop busStop="2776873647" duration="20" until="261.0"/> <!-- Berlin Alexanderplatz -->
     </route>
     <route id="pt_subway_U8:0" color="5,90,153" edges="379102293#1" >
-        <stop busStop="3824719830" duration="20" until="52.0"/> <!-- S+U Jannowitzbrücke -->
-        <stop busStop="2094266983" duration="20" until="120.0"/> <!-- U Alexanderplatz -->
-        <stop busStop="4655287361" duration="20" until="189.0"/> <!-- U Weinmeisterstraße -->
-        <stop busStop="5227235607" duration="20" until="252.0"/> <!-- U Rosenthaler Platz -->
+        <stop busStop="3824719830" duration="20" until="53.0"/> <!-- S+U Jannowitzbrücke -->
+        <stop busStop="2094266983" duration="20" until="122.0"/> <!-- U Alexanderplatz -->
+        <stop busStop="4655287361" duration="20" until="191.0"/> <!-- U Weinmeisterstraße -->
+        <stop busStop="5227235607" duration="20" until="253.0"/> <!-- U Rosenthaler Platz -->
         <stop busStop="29190909" duration="20" until="325.0"/> <!-- U Bernauer Straße -->
     </route>
     <route id="pt_tram_M6:1" color="0,51,136" edges="23960874#0 23960874#2 144014234#1 144014234#2 167523653#1 167523653#2 22962554#1 22962554#2 150394036#1 93628049#0 93628049#1 93628049#2 93628049#3 93628049#4 301733774#1" >
         <stop busStop="1633759760" duration="20" until="41.0"/> <!-- S Hackescher Markt -->
         <stop busStop="30731481" duration="20" until="92.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="30731508" duration="20" until="200.0"/> <!-- S+U Alexanderplatz/Gontardstraße -->
-        <stop busStop="30731497" duration="20" until="286.0"/> <!-- U Alexanderplatz -->
+        <stop busStop="30731508" duration="20" until="201.0"/> <!-- S+U Alexanderplatz/Gontardstraße -->
+        <stop busStop="30731497" duration="20" until="287.0"/> <!-- U Alexanderplatz -->
     </route>
     <route id="pt_bus_200:0" color="149,39,110" edges="24914141#0 24914141#2 24914141#3 24914141#4 24914141#6 318282850#0 318282850#2 112128419#1 112128419#2 415280722 195401013#2 195401013#3 24914992#1 171826985#0 171826985#1 171826985#3 24913519#1 24913519#2 541763975 202156995#0 202156995#1 4067932#1 339201219 541763974 61584187#0 61584187#1 61584187#2 61584187#3 61584187#4 54048863 15971197 4611699 169195795#0 169195795#1 169195795#2 169195795#5 169195795#6 169195795#7 169195795#8 169195795#10 340498988 188386313#0 188386313#1 155186522 24913267#0 24913267#3 326116286#0 4402014#0 4402014#3 326116285#0 326116285#2" >
         <stop busStop="270720402" duration="20" until="47.0"/> <!-- Mollstraße/Prenzlauer Allee -->
         <stop busStop="270719334" duration="20" until="154.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
         <stop busStop="270727248" duration="20" until="209.0"/> <!-- S+U Alexanderplatz -->
-        <stop busStop="1827996417" duration="20" until="262.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="3867910420" duration="20" until="361.0"/> <!-- Lustgarten -->
-        <stop busStop="271296293" duration="20" until="434.0"/> <!-- Staatsoper -->
+        <stop busStop="1827996417" duration="20" until="264.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="3867910420" duration="20" until="360.0"/> <!-- Lustgarten -->
+        <stop busStop="271296293" duration="20" until="435.0"/> <!-- Staatsoper -->
         <stop busStop="272408975" duration="20" until="534.0"/> <!-- Unter den Linden/Friedrichstraße -->
     </route>
     <route id="pt_light_rail_S26:1" color="1,138,71" edges="109444375 230976793#1 465376248 394320752#1" >
@@ -336,24 +336,24 @@
     <route id="pt_bus_N8:1" edges="156364559#0 156364559#2 156364559#4 156364559#5 156364559#6 -24992424#5 -24992424#2 4612964#0 4612964#1 24992428 606078065 156364553#0 156364553#1 72157172 61583424#0 61583424#1 61583424#2 534588621#0 534588621#1 4773465#1 4773465#2 4773465#3 490365295#1 -156364570#3 -156364570#1 -156364570#0 -77348147 -387892378 -478396988 -370359204#1 -370359204#0 -316746323#2 -316746323#0 46140376#0 46140376#1 -84960597#1 -84960597#0 -36892597#3 -36892597#2 -36892597#1 -36892597#0 -371927739" >
         <stop busStop="271430924" duration="20" until="95.0"/> <!-- Berliner Rathaus -->
         <stop busStop="3867910438" duration="20" until="242.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="-2915579613" duration="20" until="324.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="-2915545317" duration="20" until="402.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
-    </route>
-    <route id="pt_light_rail_S2:3" color="1,138,71" edges="237751551 463462760 230976795#1" >
-        <stop busStop="1930939368" duration="20" until="69.0"/> <!-- S Friedrichstraße -->
-        <stop busStop="1769645503" duration="20" until="142.0"/> <!-- S Oranienburger Straße -->
+        <stop busStop="-2915579613" duration="20" until="323.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="-2915545317" duration="20" until="401.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
     </route>
     <route id="pt_bus_N8:0" edges="371927739 36892597#0 36892597#1 36892597#2 36892597#3 84960597#0 84960597#1 83517332#1 83517332#2 83517332#4 84960595 316746323#0 316746323#1 370359204#0 370359204#1 370359204#2 275177453 77348147 156364570#0 156364570#1 156364570#2 156364556#1 202157002#0 202157002#1 202157002#2 -534588621#1 -534588621#0 606078071#0 606078071#3 61583423#0 -156364553#1 -156364553#0 -606078065 4612963 156364566#1 60333309#0 60333309#1 24992424#0 24992424#3 4612961#0 4612961#1 344594966" >
         <stop busStop="3867910441" duration="20" until="96.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
-        <stop busStop="3867910425" duration="20" until="179.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="2915590925" duration="20" until="253.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="3867910425" duration="20" until="178.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="2915590925" duration="20" until="252.0"/> <!-- Spandauer Straße/Marienkirche -->
         <stop busStop="1686199552" duration="20" until="400.0"/> <!-- Berliner Rathaus -->
     </route>
+    <route id="pt_light_rail_S2:3" color="1,138,71" edges="237751551 463462760 230976795#1" >
+        <stop busStop="1930939368" duration="20" until="69.0"/> <!-- S Friedrichstraße -->
+        <stop busStop="1769645503" duration="20" until="142.0"/> <!-- S Oranienburger Straße -->
+    </route>
     <route id="pt_tram_M5:2" color="204,153,51" edges="317013528#0 317013528#1 317013528#2 317013528#3 150394034#0 150394034#1 150394034#2 150394034#3 150394034#4 150394034#5 150394035#0 150394035#1 150394035#2 150394035#3 150394035#4 10597134#1 421641064" >
         <stop busStop="1789092673" duration="20" until="71.0"/> <!-- U Alexanderplatz -->
         <stop busStop="1860777041" duration="20" until="156.0"/> <!-- S+U Alexanderplatz/Gontardstraße -->
-        <stop busStop="4673135647" duration="20" until="256.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="1633759766" duration="20" until="324.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="4673135647" duration="20" until="257.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="1633759766" duration="20" until="325.0"/> <!-- S Hackescher Markt -->
     </route>
     <route id="pt_train_RB14:0" color="153,0,255" edges="442921387#0 442921387#1 25946656#1 25946673#1 25946674#1 25946676 32590898#1 32590890#1 32590636#1 32572618#1 32572624#1" >
         <stop busStop="29805120" duration="20" until="85.0"/> <!-- Berlin Friedrichstraße -->
@@ -361,16 +361,10 @@
     </route>
     <route id="pt_bus_N40:0" edges="156364559#0 156364559#2 156364559#4 156364559#5 156364559#6 -24992424#5 -24992424#2 4612964#0 4612964#1 24992428 606078065 156364553#0 156364553#1 72157172 61583424#0 61583424#1 61583424#2 534588621#0 534588621#1 4773465#1 4773465#2 4773465#3 490365295#1 -156364570#3 -156364570#1 -156364570#0 -77348147 -387892378 -478396988 -370359204#1 -370359204#0 -316746323#2 -316746323#0 46140376#0 46140376#1 -84960597#1 -84960597#0 -36892597#3 -36892597#2 -36892597#1 -36892597#0 -371927739" >
         <stop busStop="3867910436" duration="20" until="42.0"/> <!-- S+U Jannowitzbrücke -->
-        <stop busStop="271430924" duration="20" until="137.0"/> <!-- Berliner Rathaus -->
+        <stop busStop="271430924" duration="20" until="135.0"/> <!-- Berliner Rathaus -->
         <stop busStop="3867910438" duration="20" until="281.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="-2915579613" duration="20" until="358.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="-2915545317" duration="20" until="434.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
-    </route>
-    <route id="pt_bus_N40:1" edges="371927739 36892597#0 36892597#1 36892597#2 36892597#3 84960597#0 84960597#1 83517332#1 83517332#2 83517332#4 84960595 316746323#0 316746323#1 370359204#0 370359204#1 370359204#2 275177453 77348147 156364570#0 156364570#1 156364570#2 156364556#1 202157002#0 202157002#1 202157002#2 -534588621#1 -534588621#0 606078071#0 606078071#3 61583423#0 -156364553#1 -156364553#0 -606078065 4612963 156364566#1 60333309#0 60333309#1 24992424#0 24992424#3 4612961#0 4612961#1 344594966" >
-        <stop busStop="3867910441" duration="20" until="116.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
-        <stop busStop="3867910425" duration="20" until="198.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="2915590925" duration="20" until="274.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="1686199552" duration="20" until="421.0"/> <!-- Berliner Rathaus -->
+        <stop busStop="-2915579613" duration="20" until="356.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="-2915545317" duration="20" until="433.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
     </route>
     <route id="pt_train_RE7:0" color="38,153,0" edges="32572630#0 32572630#1 32572622#1 32590644#1 32590651#1 32590900#1 25946666#1 25946666#2 421021565#1" >
         <stop busStop="3419694885" duration="20" until="174.0"/> <!-- Berlin Alexanderplatz -->
@@ -392,32 +386,29 @@
         <stop busStop="3922258748" duration="20" until="638.0"/> <!-- Universitätsstraße -->
         <stop busStop="247603398" duration="20" until="702.0"/> <!-- Am Kupfergraben -->
     </route>
+    <route id="pt_bus_N40:1" edges="371927739 36892597#0 36892597#1 36892597#2 36892597#3 84960597#0 84960597#1 83517332#1 83517332#2 83517332#4 84960595 316746323#0 316746323#1 370359204#0 370359204#1 370359204#2 275177453 77348147 156364570#0 156364570#1 156364570#2 156364556#1 202157002#0 202157002#1 202157002#2 -534588621#1 -534588621#0 606078071#0 606078071#3 61583423#0 -156364553#1 -156364553#0 -606078065 4612963 156364566#1 60333309#0 60333309#1 24992424#0 24992424#3 4612961#0 4612961#1 344594966" >
+        <stop busStop="3867910441" duration="20" until="116.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
+        <stop busStop="3867910425" duration="20" until="197.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="2915590925" duration="20" until="273.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="1686199552" duration="20" until="456.0"/> <!-- Berliner Rathaus -->
+    </route>
     <route id="pt_bus_N2:0" color="89,91,98" edges="369223458#0 369223458#1 24993933#0 24993933#1 24993933#2 19002357#1 19002363#1 19002363#2 19002363#3 19002363#4 19002363#6 19002363#7 19002363#8 24241790#1 36892597#0 36892597#1 36892597#2 36892597#3 84960597#0 84960597#1 83517332#1 83517332#2 83517332#4 84960595 316746323#0 316746323#1 370359204#0 370359204#1 370359204#2 275177453 77348147 156364570#0 156364570#1 156364570#2 156364556#1 202157002#0 202157002#1 202157002#2 24913519#1 24913519#2 541763975 202156995#0 202156995#1 4067932#1 339201219 541763974 61584187#0 61584187#1 61584187#2 61584187#3 61584187#4 54048863 15971197 4611699 169195795#0 169195795#1 169195795#2 169195795#5 169195795#6 169195795#7 169195795#8 169195795#10 340498988 188386313#0 188386313#1 155186522 24913267#0 24913267#3 326116286#0 4402014#0 4402014#3 326116285#0 326116285#2" >
         <stop busStop="3867910441" duration="20" until="156.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
         <stop busStop="3867910428" duration="20" until="233.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="2915590925" duration="20" until="322.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="2915590925" duration="20" until="323.0"/> <!-- Spandauer Straße/Marienkirche -->
         <stop busStop="3867910420" duration="20" until="398.0"/> <!-- Lustgarten -->
-        <stop busStop="271296293" duration="20" until="473.0"/> <!-- Staatsoper -->
+        <stop busStop="271296293" duration="20" until="472.0"/> <!-- Staatsoper -->
         <stop busStop="272408975" duration="20" until="558.0"/> <!-- Unter den Linden/Friedrichstraße -->
     </route>
     <route id="pt_bus_147:0" edges="328426193#0 52328295#0 43156728#0 43156728#1 43156728#2 43156728#4 120675240#0 120675240#1 -8008608 -4611696#5 -4611696#4 -4611696#3 -23755950#3 -23755950#0 -66071366#3 -66071366#1 -66071366#0 -389101365#2 -389101365#0 -35557143#1 -35557143#0 196850609#0 196850609#1 196850609#2 194069450#0 194069450#1 461526153 169999355 -11483007 22972195#2 465376239 190447767#1 190447766#1 190447766#2 4402228 465376254 222328410 -6228081 541295974 30720544#0 30720544#1 42103020 111251382#2 437325051#0 437325051#1 176043806#0 176043806#1 176043807#0 176043807#1" >
         <stop busStop="3867910423" duration="20" until="78.0"/> <!-- Neumannsgasse -->
         <stop busStop="-3869306773" duration="20" until="225.0"/> <!-- Werderscher Markt -->
         <stop busStop="-3869306766" duration="20" until="306.0"/> <!-- U Französische Straße -->
-        <stop busStop="3869306772" duration="20" until="372.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="3869306764" duration="20" until="475.0"/> <!-- S+U Friedrichstraße -->
+        <stop busStop="3869306772" duration="20" until="393.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="3869306764" duration="20" until="471.0"/> <!-- S+U Friedrichstraße -->
         <stop busStop="3869306762" duration="20" until="592.0"/> <!-- Friedrichstraße/Reinhardtstraße -->
         <stop busStop="3869306759" duration="20" until="653.0"/> <!-- Deutsches Theater -->
     </route>
-    <route id="pt_bus_147:1" edges="-176043807#3 -176043807#0 -176043806#1 -176043806#0 -437325051#1 -437325051#0 -111251382#2 541295978 389705415#1 -541295974 6228081 -222328410 -465376254 -4402228 190447768#1 195411602#1 465376240 195411604 11483007 -169999355 -461526153 -194069450#1 -194069450#0 171423001#0 171423001#1 171423001#2 35557143#0 35557143#1 389101365#0 389101365#1 66071366#0 66071366#1 66071366#2 23755950#0 23755950#1 4611696#1 4611696#4 4611696#5 8008608 -120675240#1 -120675240#0 -43156728#4 -43156728#2 -43156728#1 -43156728#0 -52328295#1 -328426193#1" >
-        <stop busStop="-3869306760" duration="20" until="62.0"/> <!-- Deutsches Theater -->
-        <stop busStop="-3869306761" duration="20" until="118.0"/> <!-- Friedrichstraße/Reinhardtstraße -->
-        <stop busStop="-3869306765" duration="20" until="266.0"/> <!-- S+U Friedrichstraße -->
-        <stop busStop="-3869306770" duration="20" until="363.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="3869306767" duration="20" until="424.0"/> <!-- U Französische Straße -->
-        <stop busStop="3869306774" duration="20" until="534.0"/> <!-- Werderscher Markt -->
-        <stop busStop="-3867910422" duration="20" until="659.0"/> <!-- Neumannsgasse -->
-    </route>
     <route id="pt_tram_M1:0" color="238,102,0" edges="144014230#4 207364191#1 144014242#1 167272512#0 167272512#2 167272512#3 167272512#4 167272512#5 167272512#6 167272512#7 195411594#2 195411594#1 195411594#0 165409971#1 165409971#0 388702049#1 388702049#2 167272531#0 167272531#1 167272531#2 167272531#3 167272531#4 167272531#5 167272531#6 167272531#7 167272531#8 167272531#9 167272531#10 154321049#2 101699672 143891040#1 143891040#2 101699676#1 101699676#2 101699676#3 101699676#4 30721656#1 30721656#2 30721656#3 30721656#4 421641065#0 421641065#1 28341062 421641064 30721657#1 46140383 143931935 153537606#1" >
         <stop busStop="247603398" duration="20" until="40.0"/> <!-- Am Kupfergraben -->
         <stop busStop="1673526976" duration="20" until="99.0"/> <!-- Georgenstraße/Am Kupfergraben -->
@@ -425,8 +416,8 @@
         <stop busStop="30731700" duration="20" until="322.0"/> <!-- U Oranienburger Tor -->
         <stop busStop="1668717159" duration="20" until="390.0"/> <!-- S Oranienburger Straße -->
         <stop busStop="963600646" duration="20" until="454.0"/> <!-- Monbijouplatz -->
-        <stop busStop="1633759766" duration="20" until="562.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="1662153916" duration="20" until="628.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
+        <stop busStop="1633759766" duration="20" until="563.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="1662153916" duration="20" until="629.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
     </route>
     <route id="pt_train_RE7:1" color="38,153,0" edges="442921387#0 442921387#1 25946656#1 25946673#1 25946674#1 25946676 32590898#1 32590890#1 32590636#1 32572618#1 32572624#1" >
         <stop busStop="29805120" duration="20" until="85.0"/> <!-- Berlin Friedrichstraße -->
@@ -436,11 +427,20 @@
         <stop busStop="1930939368" duration="20" until="69.0"/> <!-- S Friedrichstraße -->
         <stop busStop="1769645503" duration="20" until="142.0"/> <!-- S Oranienburger Straße -->
     </route>
+    <route id="pt_bus_147:1" edges="-176043807#3 -176043807#0 -176043806#1 -176043806#0 -437325051#1 -437325051#0 -111251382#2 541295978 389705415#1 -541295974 6228081 -222328410 -465376254 -4402228 190447768#1 195411602#1 465376240 195411604 11483007 -169999355 -461526153 -194069450#1 -194069450#0 171423001#0 171423001#1 171423001#2 35557143#0 35557143#1 389101365#0 389101365#1 66071366#0 66071366#1 66071366#2 23755950#0 23755950#1 4611696#1 4611696#4 4611696#5 8008608 -120675240#1 -120675240#0 -43156728#4 -43156728#2 -43156728#1 -43156728#0 -52328295#1 -328426193#1" >
+        <stop busStop="-3869306760" duration="20" until="62.0"/> <!-- Deutsches Theater -->
+        <stop busStop="-3869306761" duration="20" until="118.0"/> <!-- Friedrichstraße/Reinhardtstraße -->
+        <stop busStop="-3869306765" duration="20" until="266.0"/> <!-- S+U Friedrichstraße -->
+        <stop busStop="-3869306770" duration="20" until="393.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="3869306767" duration="20" until="468.0"/> <!-- U Französische Straße -->
+        <stop busStop="3869306774" duration="20" until="567.0"/> <!-- Werderscher Markt -->
+        <stop busStop="-3867910422" duration="20" until="687.0"/> <!-- Neumannsgasse -->
+    </route>
     <route id="pt_bus_N6:1" edges="-196850606#4 196850607#1 196850607#2 -42102542#1 196850609#0 196850609#1 196850609#2 194069450#0 194069450#1 461526153 169999355 -11483007 22972195#2 465376239 190447767#1 190447766#1 190447766#2 4402228 465376254 222328410 -6228081 541295974 30720544#0 30720544#1 42103020 388702041#2 388702041#3 388702041#4 388702041#5 388702041#6 388702041#7 388702041#8 388702041#9 388702041#10 388702041#11 388702041#12 544327500" >
-        <stop busStop="-4015961303" duration="20" until="40.0"/> <!-- U Stadtmitte -->
-        <stop busStop="3869306772" duration="20" until="183.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="-4015961303" duration="20" until="39.0"/> <!-- U Stadtmitte -->
+        <stop busStop="3869306772" duration="20" until="170.0"/> <!-- Unter den Linden/Friedrichstraße -->
         <stop busStop="3869306764" duration="20" until="279.0"/> <!-- S+U Friedrichstraße -->
-        <stop busStop="3928759794" duration="20" until="447.0"/> <!-- U Oranienburger Tor -->
+        <stop busStop="3928759794" duration="20" until="448.0"/> <!-- U Oranienburger Tor -->
     </route>
     <route id="pt_train_RB14:1" color="153,0,255" edges="32572630#0 32572630#1 32572622#1 32590644#1 32590651#1 32590900#1 25946666#1 25946666#2 421021565#1" >
         <stop busStop="3419694885" duration="20" until="261.0"/> <!-- Berlin Alexanderplatz -->
@@ -458,12 +458,20 @@
     </route>
     <route id="pt_bus_N2:1" color="89,91,98" edges="-326116285#2 -326116285#1 -4402014#3 -4402014#2 -326116286#2 -24913267#3 -24913267#2 342968607#1 461526152 340498982#0 340498982#1 340498982#3 340498982#4 340498982#7 354528932 251884680 339201217 15971196#0 15971196#1 54048862#0 54048862#2 54048862#3 23013165#0 23013165#1 23013165#2 4611698#1 202156994#0 4773465#1 4773465#2 4773465#3 490365295#1 -156364570#3 -156364570#1 -156364570#0 -77348147 -387892378 -478396988 -370359204#1 -370359204#0 -316746323#2 -316746323#0 46140376#0 46140376#1 -84960597#1 -84960597#0 11103418 23809678#1 23809678#2 23809678#4 -19002363#10 -19002363#7 -19002363#6 -19002363#4 -19002363#3 -19002363#2 -19002363#1 4613292#0 -24993933#4 -24993933#1 -24993933#0 -369223458#1 -369223458#0" >
         <stop busStop="-4692172068" duration="20" until="36.0"/> <!-- Behrenstraße/Wilhelmstraße -->
-        <stop busStop="3869306771" duration="20" until="162.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="3870475228" duration="20" until="249.0"/> <!-- Staatsoper -->
-        <stop busStop="3867910421" duration="20" until="330.0"/> <!-- Lustgarten -->
-        <stop busStop="3867910438" duration="20" until="399.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="-3867910429" duration="20" until="474.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="3867910439" duration="20" until="569.0"/> <!-- U Weinmeisterstraße -->
+        <stop busStop="3869306771" duration="20" until="160.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="3870475228" duration="20" until="247.0"/> <!-- Staatsoper -->
+        <stop busStop="3867910421" duration="20" until="328.0"/> <!-- Lustgarten -->
+        <stop busStop="3867910438" duration="20" until="398.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="-3867910429" duration="20" until="473.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="3867910439" duration="20" until="567.0"/> <!-- U Weinmeisterstraße -->
+    </route>
+    <route id="pt_bus_N42:0" color="89,91,98" edges="112128419#2 -24990040 -24241797#3 -24241797#2 19002357#1 19002363#1 19002363#2 19002363#3 19002363#4 19002363#6 19002363#7 19002363#8 24241790#1 36892597#0 36892597#1 36892597#2 36892597#3 84960597#0 84960597#1 83517332#1 83517332#2 83517332#4 84960595 316746323#0 316746323#1 370359204#0 370359204#1 370359204#2 275177453 77348147 156364570#0 156364570#1 156364570#2 156364556#1 202157002#0 202157002#1 202157002#2 -534588621#1 -534588621#0 606078071#0 606078071#3 61583423#0 -156364553#1 -156364553#0 -606078065 81112790#1 23851927#0 23851927#1 23851927#2 233835641#0 4773463#0 4773463#2" >
+        <stop busStop="4163212867" duration="20" until="46.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
+        <stop busStop="3867910441" duration="20" until="237.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
+        <stop busStop="3867910427" duration="20" until="317.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="2915590925" duration="20" until="398.0"/> <!-- Spandauer Straße/Marienkirche -->
+        <stop busStop="3867910424" duration="20" until="508.0"/> <!-- Nikolaiviertel -->
+        <stop busStop="3352479219" duration="20" until="601.0"/> <!-- Fischerinsel -->
     </route>
     <route id="pt_tram_M1:3" color="238,102,0" edges="153537614#0 153537614#1 153537614#2 153522303#0 153522303#1 46140393 101699692#1 101699679#0 101699679#1 101699679#2 101699679#3 154321040#1 154321040#2 167140670#1 167140670#3 167140670#4 30122986#0 30122986#1 168453605#0 168453605#1 168453605#2 168453605#3 168453605#4 168453605#5 388702047#0 388702047#1 388702047#2 388702047#3 388702047#4 93584120#2 93584120#3 93584120#4 195411601#1 195411601#0 22820560#2 22820560#1 22820560#0 93584121#1 144014237#0 144014237#1 144014237#2 144014228#0 144014228#1 144014228#2 207364192#1 207364192#2 144014230#1 144014230#2 144014230#4" >
         <stop busStop="1668497956" duration="20" until="85.0"/> <!-- S Hackescher Markt -->
@@ -475,30 +483,22 @@
         <stop busStop="3922258748" duration="20" until="635.0"/> <!-- Universitätsstraße -->
         <stop busStop="247603398" duration="20" until="705.0"/> <!-- Am Kupfergraben -->
     </route>
-    <route id="pt_bus_N42:0" color="89,91,98" edges="112128419#2 -24990040 -24241797#3 -24241797#2 19002357#1 19002363#1 19002363#2 19002363#3 19002363#4 19002363#6 19002363#7 19002363#8 24241790#1 36892597#0 36892597#1 36892597#2 36892597#3 84960597#0 84960597#1 83517332#1 83517332#2 83517332#4 84960595 316746323#0 316746323#1 370359204#0 370359204#1 370359204#2 275177453 77348147 156364570#0 156364570#1 156364570#2 156364556#1 202157002#0 202157002#1 202157002#2 -534588621#1 -534588621#0 606078071#0 606078071#3 61583423#0 -156364553#1 -156364553#0 -606078065 81112790#1 23851927#0 23851927#1 23851927#2 233835641#0 4773463#0 4773463#2" >
-        <stop busStop="4163212867" duration="20" until="46.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
-        <stop busStop="3867910441" duration="20" until="236.0"/> <!-- U Weinmeisterstraße/Gipsstraße -->
-        <stop busStop="3867910427" duration="20" until="315.0"/> <!-- S Hackescher Markt -->
-        <stop busStop="2915590925" duration="20" until="400.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="3867910424" duration="20" until="581.0"/> <!-- Nikolaiviertel -->
-        <stop busStop="3352479219" duration="20" until="644.0"/> <!-- Fischerinsel -->
-    </route>
     <route id="pt_bus_147:2" edges="-176043807#3 -176043807#0 -176043806#1 -176043806#0 -437325051#1 -437325051#0 -111251382#2 541295978 389705415#1 -541295974 6228081 -222328410 -465376254 -4402228 190447768#1 195411602#1 465376240 195411604 11483007 -169999355 -461526153 -194069450#1 -194069450#0 171423001#0 171423001#1 171423001#2 35557143#0 35557143#1 389101365#0 389101365#1 66071366#0 66071366#1 66071366#2 23755950#0 23755950#1 4611696#1 4611696#4 4611696#5 8008608 -120675240#1 -120675240#0 -43156728#4 -43156728#2 -43156728#1 -43156728#0 -52328295#1 -328426193#1" >
-        <stop busStop="-3869306760" duration="20" until="61.0"/> <!-- Deutsches Theater -->
-        <stop busStop="-3869306761" duration="20" until="118.0"/> <!-- Friedrichstraße/Reinhardtstraße -->
-        <stop busStop="-3869306765" duration="20" until="256.0"/> <!-- S+U Friedrichstraße -->
-        <stop busStop="-3869306770" duration="20" until="360.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="3869306767" duration="20" until="433.0"/> <!-- U Französische Straße -->
+        <stop busStop="-3869306760" duration="20" until="60.0"/> <!-- Deutsches Theater -->
+        <stop busStop="-3869306761" duration="20" until="115.0"/> <!-- Friedrichstraße/Reinhardtstraße -->
+        <stop busStop="-3869306765" duration="20" until="239.0"/> <!-- S+U Friedrichstraße -->
+        <stop busStop="-3869306770" duration="20" until="357.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="3869306767" duration="20" until="432.0"/> <!-- U Französische Straße -->
         <stop busStop="3869306774" duration="20" until="518.0"/> <!-- Werderscher Markt -->
-        <stop busStop="-3867910422" duration="20" until="625.0"/> <!-- Neumannsgasse -->
+        <stop busStop="-3867910422" duration="20" until="624.0"/> <!-- Neumannsgasse -->
     </route>
     <route id="pt_bus_N42:1" color="89,91,98" edges="328426208#0 23851917#0 23851917#2 23851922#1 60333313 82654055#0 82654055#1 24992428 606078065 156364553#0 156364553#1 72157172 61583424#0 61583424#1 61583424#2 534588621#0 534588621#1 4773465#1 4773465#2 4773465#3 490365295#1 -156364570#3 -156364570#1 -156364570#0 -77348147 -387892378 -478396988 -370359204#1 -370359204#0 -316746323#2 -316746323#0 46140376#0 46140376#1 -84960597#1 -84960597#0 11103418 23809678#1 23809678#2 23809678#4 -19002363#10 -19002363#7 -19002363#6 -19002363#4 -19002363#3 -19002363#2 -19002363#1 4613292#0 4613308#1 4613308#2 310357284#0 112128419#1 112128419#2" >
-        <stop busStop="3352479220" duration="20" until="64.0"/> <!-- Fischerinsel -->
+        <stop busStop="3352479220" duration="20" until="62.0"/> <!-- Fischerinsel -->
         <stop busStop="271430924" duration="20" until="170.0"/> <!-- Berliner Rathaus -->
         <stop busStop="3867910438" duration="20" until="350.0"/> <!-- Spandauer Straße/Marienkirche -->
-        <stop busStop="-3867910426" duration="20" until="419.0"/> <!-- S Hackescher Markt -->
+        <stop busStop="-3867910426" duration="20" until="439.0"/> <!-- S Hackescher Markt -->
         <stop busStop="3867910439" duration="20" until="552.0"/> <!-- U Weinmeisterstraße -->
-        <stop busStop="270727260" duration="20" until="724.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
+        <stop busStop="270727260" duration="20" until="725.0"/> <!-- S+U Alexanderplatz/Memhardstraße -->
     </route>
     <route id="pt_tram_M5:1" color="204,153,51" edges="30719903#0 30719903#1 30719903#2 101699672 143891040#1 143891040#2 101699676#1 101699676#2 101699676#3 101699676#4 30721656#1 30721656#2 30721656#3 30721656#4 421641065#0 421641065#1 30123145#0 30123145#1 30123145#2 23960874#0 23960874#2 144014234#1 144014234#2 167523653#1 167523653#2 22962554#1 22962554#2 150394036#1 93628049#0 93628049#1 93628049#2 93628049#3 93628049#4 301733774#1" >
         <stop busStop="1668717159" duration="20" until="102.0"/> <!-- S Oranienburger Straße -->
@@ -512,10 +512,10 @@
         <stop busStop="3867910423" duration="20" until="97.0"/> <!-- Neumannsgasse -->
         <stop busStop="-3869306773" duration="20" until="248.0"/> <!-- Werderscher Markt -->
         <stop busStop="-3869306766" duration="20" until="342.0"/> <!-- U Französische Straße -->
-        <stop busStop="3869306772" duration="20" until="444.0"/> <!-- Unter den Linden/Friedrichstraße -->
-        <stop busStop="3869306764" duration="20" until="555.0"/> <!-- S+U Friedrichstraße -->
+        <stop busStop="3869306772" duration="20" until="443.0"/> <!-- Unter den Linden/Friedrichstraße -->
+        <stop busStop="3869306764" duration="20" until="556.0"/> <!-- S+U Friedrichstraße -->
         <stop busStop="3869306762" duration="20" until="704.0"/> <!-- Friedrichstraße/Reinhardtstraße -->
-        <stop busStop="3869306759" duration="20" until="765.0"/> <!-- Deutsches Theater -->
+        <stop busStop="3869306759" duration="20" until="766.0"/> <!-- Deutsches Theater -->
     </route>
     <flow id="pt_light_rail_S1:0" type="pt_light_rail" route="pt_light_rail_S1:0" begin="52.0" end="952.0" period="600" line="S1:0" >
         <param key="name" value="S-Bahnlinie S1: S Oranienburg =&gt; S Wannsee"/>
@@ -641,14 +641,14 @@
         <param key="name" value="S-Bahnlinie S3: Erkner =&gt; Westkreuz"/>
         <param key="completeness" value="0.12"/>
     </flow>
-    <flow id="pt_subway_U2:0" type="pt_subway" route="pt_subway_U2:0" begin="383.0" end="1283.0" period="240" line="U2:0" >
-        <param key="name" value="U-Bahnlinie U2: S+U Pankow =&gt; U Ruhleben"/>
-        <param key="completeness" value="0.10"/>
-    </flow>
     <flow id="pt_bus_N5:1" type="pt_bus" route="pt_bus_N5:1" begin="239.0" end="1139.0" period="1800" line="N5:1" >
         <param key="name" value="Buslinie N5: S Hackescher Markt =&gt; Hellersdorf, Riesaer Straße"/>
         <param key="completeness" value="0.08"/>
     </flow>
+    <flow id="pt_subway_U2:0" type="pt_subway" route="pt_subway_U2:0" begin="383.0" end="1283.0" period="240" line="U2:0" >
+        <param key="name" value="U-Bahnlinie U2: S+U Pankow =&gt; U Ruhleben"/>
+        <param key="completeness" value="0.10"/>
+    </flow>
     <flow id="pt_subway_U2:1" type="pt_subway" route="pt_subway_U2:1" begin="388.0" end="1288.0" period="240" line="U2:1" >
         <param key="name" value="U-Bahnlinie U2: U Ruhleben =&gt; S+U Pankow"/>
         <param key="completeness" value="0.10"/>
@@ -681,6 +681,10 @@
         <param key="name" value="Straßenbahnlinie M6: Hellersdorf, Riesaer Straße =&gt; S Hackescher Markt"/>
         <param key="completeness" value="0.10"/>
     </flow>
+    <flow id="pt_bus_N6:0" type="pt_bus" route="pt_bus_N6:0" begin="218.0" end="1118.0" period="600" line="N6:0" >
+        <param key="name" value="Buslinie N6 U Alt-Tegel =&gt; U Alt-Mariendorf"/>
+        <param key="completeness" value="0.08"/>
+    </flow>
     <flow id="pt_light_rail_S25:1" type="pt_light_rail" route="pt_light_rail_S25:1" begin="477.0" end="1377.0" period="600" line="S25:1" >
         <param key="name" value="S-Bahnlinie S25: Teltow =&gt; Hennigsdorf"/>
         <param key="completeness" value="0.07"/>
@@ -693,17 +697,13 @@
         <param key="name" value="U-Bahnlinie U8: S+U Wittenau =&gt; S+U Hermannstraße"/>
         <param key="completeness" value="0.17"/>
     </flow>
-    <flow id="pt_bus_M48:0" type="pt_bus" route="pt_bus_M48:0" begin="188.0" end="1088.0" period="600" line="M48:0" >
-        <param key="name" value="Buslinie M48: Busseallee =&gt; S+U Alexanderplatz/Memhardstraße"/>
-        <param key="completeness" value="0.09"/>
-    </flow>
     <flow id="pt_light_rail_S9:1" type="pt_light_rail" route="pt_light_rail_S9:1" begin="346.0" end="1246.0" period="1200" line="S9:1" >
         <param key="name" value="S-Bahnlinie S9: S Rathaus Spandau =&gt; S Flughafen Schönefeld"/>
         <param key="completeness" value="0.11"/>
     </flow>
-    <flow id="pt_bus_N6:0" type="pt_bus" route="pt_bus_N6:0" begin="218.0" end="1118.0" period="600" line="N6:0" >
-        <param key="name" value="Buslinie N6 U Alt-Tegel =&gt; U Alt-Mariendorf"/>
-        <param key="completeness" value="0.08"/>
+    <flow id="pt_bus_M48:0" type="pt_bus" route="pt_bus_M48:0" begin="188.0" end="1088.0" period="600" line="M48:0" >
+        <param key="name" value="Buslinie M48: Busseallee =&gt; S+U Alexanderplatz/Memhardstraße"/>
+        <param key="completeness" value="0.09"/>
     </flow>
     <flow id="pt_light_rail_S9:0" type="pt_light_rail" route="pt_light_rail_S9:0" begin="414.0" end="1314.0" period="1200" line="S9:0" >
         <param key="name" value="S-Bahnlinie S9: S Flughafen Schönefeld =&gt; S Rathaus Spandau"/>
@@ -753,14 +753,14 @@
         <param key="name" value="Buslinie N8: S+U Hermannstraße =&gt; Märkisches Viertel, Wilhelmsruher Damm"/>
         <param key="completeness" value="0.07"/>
     </flow>
-    <flow id="pt_light_rail_S2:3" type="pt_light_rail" route="pt_light_rail_S2:3" begin="633.0" end="1533.0" period="1200" line="S2:3" >
-        <param key="name" value="S-Bahnlinie S2: Lichtenrade =&gt; Bernau"/>
-        <param key="completeness" value="0.08"/>
-    </flow>
     <flow id="pt_bus_N8:0" type="pt_bus" route="pt_bus_N8:0" begin="353.0" end="1253.0" period="600" line="N8:0" >
         <param key="name" value="Buslinie N8: Märkisches Viertel, Wilhelmsruher Damm =&gt; S+U Hermannstraße"/>
         <param key="completeness" value="0.07"/>
     </flow>
+    <flow id="pt_light_rail_S2:3" type="pt_light_rail" route="pt_light_rail_S2:3" begin="633.0" end="1533.0" period="1200" line="S2:3" >
+        <param key="name" value="S-Bahnlinie S2: Lichtenrade =&gt; Bernau"/>
+        <param key="completeness" value="0.08"/>
+    </flow>
     <flow id="pt_tram_M5:2" type="pt_tram" route="pt_tram_M5:2" begin="485.0" end="1385.0" period="1200" line="M5:2" >
         <param key="name" value="Straßenbahnlinie M5: Hohenschönhausen, Zingster Straße =&gt; S Hackescher Markt"/>
         <param key="completeness" value="0.15"/>
@@ -769,19 +769,15 @@
         <param key="name" value="RB14: Nauen =&gt; Berlin-Schönefeld"/>
         <param key="completeness" value="0.13"/>
     </flow>
-    <flow id="pt_bus_N40:0" type="pt_bus" route="pt_bus_N40:0" begin="367.0" end="1267.0" period="600" line="N40:0" >
+    <flow id="pt_bus_N40:0" type="pt_bus" route="pt_bus_N40:0" begin="368.0" end="1268.0" period="600" line="N40:0" >
         <param key="name" value="Buslinie N40: Friedrichshain, Wühlischplatz =&gt; U Turmstraße"/>
         <param key="completeness" value="0.16"/>
     </flow>
-    <flow id="pt_bus_N40:1" type="pt_bus" route="pt_bus_N40:1" begin="371.0" end="1271.0" period="600" line="N40:1" >
-        <param key="name" value="Buslinie N40: U Turmstraße =&gt; Friedrichshain, Wühlischplatz"/>
-        <param key="completeness" value="0.12"/>
-    </flow>
     <flow id="pt_train_RE7:0" type="pt_train" route="pt_train_RE7:0" begin="465.0" end="1365.0" period="3600" line="RE7:0" >
         <param key="name" value="RE7: Wünsdorf-Waldstadt =&gt; Dessau Hbf"/>
         <param key="completeness" value="0.07"/>
     </flow>
-    <flow id="pt_tram_M5:3" type="pt_tram" route="pt_tram_M5:3" begin="543.0" end="1443.0" period="1200" line="M5:3" >
+    <flow id="pt_tram_M5:3" type="pt_tram" route="pt_tram_M5:3" begin="544.0" end="1444.0" period="1200" line="M5:3" >
         <param key="name" value="Straßenbahnlinie M5: S Hackescher Markt =&gt; Hohenschönhausen, Zingster Straße"/>
         <param key="completeness" value="0.15"/>
     </flow>
@@ -789,6 +785,10 @@
         <param key="name" value="Straßenbahnlinie M1: Niederschönhausen, Schillerstraße =&gt; Mitte, Am Kupfergraben"/>
         <param key="completeness" value="0.28"/>
     </flow>
+    <flow id="pt_bus_N40:1" type="pt_bus" route="pt_bus_N40:1" begin="371.0" end="1271.0" period="600" line="N40:1" >
+        <param key="name" value="Buslinie N40: U Turmstraße =&gt; Friedrichshain, Wühlischplatz"/>
+        <param key="completeness" value="0.12"/>
+    </flow>
     <flow id="pt_bus_N2:0" type="pt_bus" route="pt_bus_N2:0" begin="227.0" end="1127.0" period="600" line="N2:0" >
         <param key="name" value="Buslinie N2: S+U Pankow =&gt; U Ruhleben"/>
         <param key="completeness" value="0.13"/>
@@ -797,10 +797,6 @@
         <param key="name" value="Buslinie 147: S Ostbahnhof =&gt; S+U Hauptbahnhof"/>
         <param key="completeness" value="0.39"/>
     </flow>
-    <flow id="pt_bus_147:1" type="pt_bus" route="pt_bus_147:1" begin="227.0" end="1127.0" period="600" line="147:1" >
-        <param key="name" value="Buslinie 147: S+U Hauptbahnhof =&gt; S Ostbahnhof"/>
-        <param key="completeness" value="0.39"/>
-    </flow>
     <flow id="pt_tram_M1:0" type="pt_tram" route="pt_tram_M1:0" begin="286.0" end="1186.0" period="1200" line="M1:0" >
         <param key="name" value="Straßenbahnlinie M1: Mitte, Am Kupfergraben =&gt; Niederschönhausen, Schillerstraße"/>
         <param key="completeness" value="0.28"/>
@@ -813,6 +809,10 @@
         <param key="name" value="S-Bahnlinie S26: Teltow =&gt; Waidmannslust"/>
         <param key="completeness" value="0.09"/>
     </flow>
+    <flow id="pt_bus_147:1" type="pt_bus" route="pt_bus_147:1" begin="227.0" end="1127.0" period="600" line="147:1" >
+        <param key="name" value="Buslinie 147: S+U Hauptbahnhof =&gt; S Ostbahnhof"/>
+        <param key="completeness" value="0.39"/>
+    </flow>
     <flow id="pt_bus_N6:1" type="pt_bus" route="pt_bus_N6:1" begin="483.0" end="1383.0" period="600" line="N6:1" >
         <param key="name" value="Buslinie N6 U Alt-Mariendorf =&gt; U Alt-Tegel"/>
         <param key="completeness" value="0.08"/>
@@ -829,14 +829,14 @@
         <param key="name" value="Buslinie N2: U Ruhleben =&gt; S+U Pankow"/>
         <param key="completeness" value="0.15"/>
     </flow>
-    <flow id="pt_tram_M1:3" type="pt_tram" route="pt_tram_M1:3" begin="450.0" end="1350.0" period="1200" line="M1:3" >
-        <param key="name" value="Straßenbahnlinie M1: Rosenthal Nord =&gt; Mitte, Am Kupfergraben"/>
-        <param key="completeness" value="0.26"/>
-    </flow>
     <flow id="pt_bus_N42:0" type="pt_bus" route="pt_bus_N42:0" begin="505.0" end="1405.0" period="600" line="N42:0" >
         <param key="name" value="Buslinie N42: S+U Alexanderplatz =&gt; U Theodor-Heuss-Platz"/>
         <param key="completeness" value="0.14"/>
     </flow>
+    <flow id="pt_tram_M1:3" type="pt_tram" route="pt_tram_M1:3" begin="450.0" end="1350.0" period="1200" line="M1:3" >
+        <param key="name" value="Straßenbahnlinie M1: Rosenthal Nord =&gt; Mitte, Am Kupfergraben"/>
+        <param key="completeness" value="0.26"/>
+    </flow>
     <flow id="pt_bus_147:2" type="pt_bus" route="pt_bus_147:2" begin="548.0" end="1448.0" period="600" line="147:2" >
         <param key="name" value="Buslinie 147: S+U Hauptbahnhof =&gt; U Märkisches Museum"/>
         <param key="completeness" value="0.54"/>