diff --git a/config.toml b/config.toml index f6a4a2c0..e4786c1e 100644 --- a/config.toml +++ b/config.toml @@ -208,25 +208,3 @@ detailed = true paths = "paths/ch" rules = "rules/ch" - -[colors] -el_none_pax = "90640c" -el_none = "b0945d" - -el_ole_ac_high_pax = "8845aa" -el_ole_ac_high = "b275d1" - -el_ole_ac_low_pax = "aa4689" -el_ole_ac_low = "d275b4" - -el_ole_dc_high_pax = "a51100" -el_ole_dc_high = "d15e51" - -el_ole_dc_low_pax = "d05113" -el_ole_dc_low = "ff7f40" - -el_rail_high_pax = "007e49" -el_rail_high = "3aa578" - -el_rail_four_pax = "6e6e00" -el_rail_four = "89895a" diff --git a/paths/de/a/d0.osm b/paths/de/a/d0.osm index 9cb29c92..e5a7a606 100644 --- a/paths/de/a/d0.osm +++ b/paths/de/a/d0.osm @@ -1,766 +1,642 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + - - - + + + - - - - - - - + + + - - - + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + + + - - - + + + - - - + + + + + - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + + + + - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + - - - + + + + - - - + + + + + + + - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - - + + + - - - - - - - + + + - - - + + + - - - - + + + - - - + + + + + - - - + + + - - - + + + - - - + + + + - - - - - - - + + + - - - - - - - + + + + - - - - - - - - - - - - - + + + - - - - - - - - + + + - - - + + + - - - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - - - - - + + + - - - - + + + - - - + + + - - - + + + + + + + + + + + + + - - - + + + + - - - + + + - - - - - - - - - + + + - - - + + + - - - - + + + + + - - - + + + + - - + + - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/paths/de/a/d1.osm b/paths/de/a/d1.osm index 73f3ccbe..ddfd47c8 100644 --- a/paths/de/a/d1.osm +++ b/paths/de/a/d1.osm @@ -1,3341 +1,3000 @@ - + - - - - + + + + - + - + - - - - - - - - - + + + + + + - + - + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + - - - - - - + - - - - - - - - - - - - + + - - - - - - - - - - + + + - - - - - + + + + - - - - - + + + + - + - - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - + + - - - + + - - - - - - - - + + + + - - + + - - + + - - - - - - - + + + + - - - - - - - - + + + + - - - - + + + - + - - - - - - - - + + + + + - - - + + + - - - + + + - + - - + + - + - - - - + + + - - - - - - - - + + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + - - - - - - + + + - - - - - - + + + - - - - - - - - - - - - - - - - + + + + + - - + + - - - + + + - - - + + + - + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - - + + + + + + + + - - + + - + - - + + - - - - + + + + - + - - - - + + + + - + - - + + - - + + - - + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + - - + - - + + - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + - + - - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + - + - - - + + - - - - + + + + - - - - - - - - + + + + + + - - - - - - - + + + + - - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - + + + + + + - + - - - - - + + + + + - - + + - - - - - - - - - - - + + + + + - - - - - - - - - + + + + + - + - + - - + - - - - - - - - - - + + + + + - - + - - - - - - - - - - - + + + - + - - - - - - + - - - - - - - - - - - - - - - - - + + + + + + + - + - - - - - - - - - - - - + + + + + - - - - - - - - - - - + + + + + + - + - - - - - + + - - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - + + - - - - + + + + - - - + + + - + - - - + + + - + - - + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - + - - + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - + - - + + - - + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - + - + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - + - - - - - - - + + + + + + + - - - - + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - + + + + + + + + + - - + + - - + + - + - - + + - - - - - - - + + + + + + + - + - + - - + + - + - + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - + - + - - - - + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - - - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - + + - + - + - + - - - + + + - + - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - - + + + + + - - + + - + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - - + + - - - + + + - + - + - + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - - - + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - + - - + - + - - - + - + - + - + - + - + - - - - - - - - - - - - - - - - - + - + - + - - - - - + + + + - + - - + - + - - - - - + + + - - - - - - - - - - - - - - - + - + - - - - - - - + + + - - + - - - - - - - + - - - - - - - + + - + - + - + - - + + - - - - - - - - - - - + + + + - - + + - + - + - + - + - - - + - - - - - - - - + + - + - - - - - + + + + + - - + + - - + - + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - + + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + - + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - + - + - + - - + + - + - - - - - - + + + + + + - + - - - + + + - + - + - + - - - - - - - - - + + + + + + + - + - + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + - - - + + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - + + + + - - - - - + + + + + - - + + - + - - - - - + + + + + - - + + - + - - - - + + + + - - + + - + - - - - + - + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4710,8278 +4369,7307 @@ - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - - - - - - + + + + + - - - - - - - - + + + - - - - + + + - - - - + + + - - - - + + + - - - + + + + - - - + + + - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + - - - + + + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - + + + + - - - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - - - - - - - - - + + + - - - - + + + + - - - + + + - - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + - - - + + + - - - - + + + - - - - - - - - - + + + + + - - - - - - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + - - - - - - - + + + - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - + + + - - - - + + + + - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - - - - - - - - - - + + + - - - + + + - - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - + + + - - - - - + + + - - - + + + - - - - + + + - - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + + - - - - - - - + + + - - - - + + + - - - - + + + - - - + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - - + + + - - - + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + - - - - + + + - - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - - + + + - - - - - - - + + + - - - + + + + - - - + + + - - - - - - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - - + + + + + + - - - - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + - - - + + + - - - - - - - + + + + - - - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - + + + - - - - - - + + + - - - + + + - - - - - - - - - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + + + - - - + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + - - - - + + + - - - + + + - - - - - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - + + + - - - + + + - - - + + + + + - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + - - - - - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + - - - + + + - - - - - - - + + + - - - - - - - - + + + - - - + + + - - - - - - + + + - - - - - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + - - - + + + - - - + + + + - - - - - - - - + + + + - - - - - - - + + + - - - - - + + + - - - + + + - - - - - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - - - + + + - - - - - - - - - + + + - - - + + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - - - - + + + - - - - - - - - - - - - - - - + + + - - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + + - - - - - - - - - - - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + - - - - - - - - - - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - - - - - + + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + - - - - + + + + + + + - - - + + + + + + + + - - - + + + + - - - + + + - - - + + + + - - - - - - - - - - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + - - - + + + + + + + - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + + + + - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + - - - + + + - - - - - - - - - - - - - + + + - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + - - - + + + + - - - + + + + - - - + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + @@ -14102,2701 +12790,2447 @@ - - - - - + + + + + - - - - - - - - - - + + + + + + + + - - - - + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + - - - - - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + - - - - - - - + + + + + - - - - - - - - - - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/paths/de/a/d2.osm b/paths/de/a/d2.osm index 369b41f1..fe240597 100644 --- a/paths/de/a/d2.osm +++ b/paths/de/a/d2.osm @@ -1,5230 +1,5229 @@ - + - + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + - - - - - - + + + + + + - - + + - + - - + + - - - - - + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - - + + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - - - - - - - - + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - + + - + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - + + + - - + + - - - - + + + + - - + + - + - + - + - - - + + + - + - + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - - + + - - + + - + - + - - - + + + - + - - - - - + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - + - - - - - + + + + + - - - - - - + + + + + + - + - - - + + + - + - - + + - + - - - - + + + + - - - + + + - - + + - - - + + + - + - - - - - - + + + + + + - - + + - + - - - - + + + + - - - - + + + + - - + + - + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - + - + - - + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - + + + + + + - - + + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - + + - + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - + - - - + + + - + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - + + - + - + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - - - + + + + + + + + + - + - - + + - + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + + - + - - + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - + + + + + - + - - + + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + - - - + + + - - + + - + - + - + - + - + - - - + + + - - + + - - - + + + - + - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - + - - - - - + + + + + - - - + + + - + - + - - + + - + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - + + + + + - - - - - - + + + + + + - + - + - - - + + + - - + + - + - - - - - + + + + + - - - - + + + + - + - + - - + + - - + + - + - + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - - + + + + - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + - - + + - + - - + + - - + + - - - + + + - - - - - - + + + + + + - - + + - + - + - + - - + + - - - + + + - + - + - + - + - - - + + + - + - + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + + - + - - + + - + - + - - - - + + + + - - - - + + + + - - - + + + - + - + - + - + - + - + - - - + + + - - - - + + + + - - - - + + + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - + - - + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - + + + + + + + + + - + - + - - + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - + - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - + + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - + + + + - - + + - - - - - + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + - - - + + + - - - - - + + + + + - - - + + + - - + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - + - - - - - - - - + + + + + + + + - - + + - + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - + - - + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - + - - - + + + - - + + - + - + - + - + - + - - - - + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - - + + + - + - - + + - - - - - - - + + + + + + + - + - - - - - + + + + + - + - + - + - - + + - + - + - + - - - + + + - - - - - + + + + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - - - - + + + + + + + - + - - - + + + - + - - - - + + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - + - + - - + + - - - - + + + + - - - + + + - + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - + + + - - + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - - - - - - + + + + + + - + - - - - + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - + + - + - - - - - + + + + + - - + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - - + + + - - - - + + + + - + - - - - - - - - + + + + + + + + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + - + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -6603,14912 +6602,14911 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + @@ -22630,4385 +22628,4385 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/paths/de/a/d3.osm b/paths/de/a/d3.osm index ac9f6789..1b908a7e 100644 --- a/paths/de/a/d3.osm +++ b/paths/de/a/d3.osm @@ -1,1728 +1,45072 @@ - - - + + - - - + + - - + + + + + + + - - - + + + + - - - + + + - - + + - - + + - - + + - - - + + - - + + - - + + + + - - - + + + + + - - + + + + + - - - + + + + - - - + + + + + + - - - + + + + + + - - - + + + + + + - - + + + + + + + + + + + + + + + + - - + + + + + - - + + + - - - + + - - + + + + + + - - + + + + + + - - + + + - - + + - - - + + - - + + + + + - - - + + - - + + - - - - + + - - - + + + + + + + + + - - - - - - - + + - - - + + + + + - - + + + - - + + + + - - - + + + - - - + + + + + - - + + - - + + + - - + + - - + + - - - - + + + + + + + + + - - + + - - + + + + + - - - + - - - + + + + + + + + + - - + + + + + + + - - - + + + - - + + - - + + + + - - + + - - + + + + + + - - + + + + - - - + + + - - - + + + - - + + - - + + - - + + + + + + + + + - - - - - + + - - - - - + + - - - - - + + - - - - - + + + + - - - + + - - + + + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - - - - + + + + + + - - - - + + + + + - - - + + - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - + + + + - + + + + + + + + + + + + - + + + + + + + + + + + - - - + + + + + + + + - - + + + + + + - - - + + + + + + + + + + - - - - - + + + + + + + + + - - - + + + + - - + + - - + + - - + + + - - + + - - + + + - - + + - - - - - + + + + - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + - - - - - - + + + + - - - - + + + + + + + + + - - - - - + + + + + - - + + - - + + + + - - + + + - - - + + + + - - - - + + + - - - - - - + + + + + + - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + - - - + + - - - + + + + + - - - - + + + + - - - - - + + + + - - + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - - - + + + + + + - - - - + + + - - - - + + - - + + + - - - - + + + + - - - - + + + + + - - - - - - - - - - - - + + + - - - - - - + + - - - + + + + - - - + + + + - - - + + + + + + + + + + + - - + + + + + - - - - + + + + - - + + + + - - + + + - - + + - - + + + - - + + + - - + + + + - - - + + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + - - - - - - + + + - - - - + + + + - - - + + + + - - - + + + + - - - - + + + + + - - - + + + + - - - + + + - - - - - - - - + + + - - - - + + + - - - + + + + - - - - + + + - - - - + + + + + + + + + - - - - - - - + + + - - - - + + + + + - - - + + + - - - + + + + - - - + + + + - - - - - - - - + + + + - - - - - - + + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + + - - - - + + + - - - + + + + - - - + + + + + + - - - + + + + - - - + + + - - - - + + + + - - - + + + + - - - - - - - + + + + + + + + + - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - + + + + + + + + - - - + + + + + + + + - - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - + + + - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + - - - + + + + - - - - - + + + - - - - + + + + + + + + + - - - + + + + - - - + + + + - - - - - + + + - - - + + + + + + + + - - - + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - + + + + - - - - + + + - - - + + + + + + + + + - - - + + + + - - - - - + + + - - - + + + + - - - - + + + + - - - - - + + + + - - - + + + - - - + + + + + - - - + + + - - - + + + + - - - + + + + - - - + + + - - - - - + + + + - - - + + + + - - - + + + - - - + + + + + + + + + - - - + + + + - - - + + + + - - - - - - - - + + + + - - - + + + + - - - + + + + - - - - - - - - + + + - - - + + + + - - - + + + + - - - + + + - - - + + + - - - + + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - - - + + + - - - + + + + - - - + + + - - - + + + - - - - - + + + - - - - + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + - - - - + + + + + + + + + - - - + + + + + + + + + + + + + + - - - + + + + + + + + - - - - + + + + + - - - + + + + + - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - + + + - - - + + + + + + + - - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - - - - + + + + + + + - - - + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - - - + + + + + - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + - - - - - - - - + + + + + - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/paths/de/a/d4.osm b/paths/de/a/d4.osm index c2007d24..76c3ef6d 100644 --- a/paths/de/a/d4.osm +++ b/paths/de/a/d4.osm @@ -1,12695 +1,12715 @@ - + - + - - - - + + + + - + - + - + - + - + - + - + - + - - + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - + - + - + - - - + + + - - - - - + + + + + - + - - + + - + - - + + - + - - - - + + + + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + - + - - - + + + - + - - - + + + - + - - + + - - - - - + + + + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - - - + + + - + - - - + + + - + - + - - - + + + - + - + - + - - - - - + + + + + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - - - + + + - + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - - - + + + - + - - - + + + - - - - + + + + - - - - - + + + + + - + - + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - + - + - + - + - + - + - - + + - - - - - + - - + + - + - + - + - - + + - - - - - + + + + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + - - + + - + - + - + - - - + + + - + - - - + + + - + - - + + - - + + - + - - - + - - - - - - - - - - + + + + + + - + - + - - + + - + - + - + - + - - - - - - - - + + + - - - - - - - - + + + + + + + + - - + + - - + + - + - + - + - + - + - - - + + - + - - - - + + + + - - + + - + - - + + - + - + - + - + - - + + - - - + + + - - + + - - + + - - - + + - - + + - + - - + + - + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - + - - - - + + + + - + - - + - + - - - - - - - - - + - - - - - + - - - - + - + - + - - - + + - + - + - - - - + - - - - - - - - - - - - - - - - - + + + - - - - - + + + - + - - - - - - - - + + + - + - + - - - - - + - + - - - - + + - - + - - - - - - - + - - - - - - - + - - - + - - + - - - - - - - - + - - - - - + + - - + + - - + - + - + - - - - + - - - - - - - - - - - - - - + + + - + - - - - - - - + + + - - - - - + + - - - + + - - - - - - + - + - - - - - - + + - - - - - + + - - - + - + - - + + - - + - - - - - + + - - + - - - - - + + - - - - - - + + - - - - - - - - - - - - + + + + - - - + - - - + - - - + - - - - - + + - - + - - - - - - - + + - - - - - - - + + + + - + - - + + - - + - - - + + - - - - - + + - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - + - - - + + - - - + - - - - + + + - - - - - - - - + - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + - - - - - + - - - - - - - - - + + - - - - - + - - - - - - - + + + - + - - - - - - - + - - + + - - - - + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - + + + - + - + - + - - - + + + - + - + - + - + - - - + + + - - - - - + + + + + - + - + - + - + - + - - + + - + - - - + + + - + - + - - - - + + + + - - - - - + + + + + - + - - - - + + + + - + - - - - + + + + - - + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - + + - + - - - - + + + + - - - - + + + + - + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - + + + + - + - - - + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - + + - - + + - - - - - - - + + + + + + + - - + + - - + + - + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - + - - + + - + - + - + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - + - - + + - - - - - - + + + + + + - - - + + + - + - - - + + + - - - + + + - - + + - - - - - + + + + + - - - - - + + + + + - + - + - - + + - - - - - - + + + + + + - + - - - + + + - - + + - + - - - - - - + + + + + + - - + + - - + + - + - - + + - + - + - - + + - + - - - - + + + + - + - + - + - - + + - - + + - - + + - - + + - + - - - - + + + + - - - + + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + - - + + - - + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - + - + - - - + + + - + - - - + + + - + - - + + - + - + - + - + - + - - - + + + - - + + - + - - - + + + - + - + - - + + - - + + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - - + + - - + + - + - + - - + + - + - - + + - + - + - + - + - - + + - + - + - - + + - + - + - + - - + + - - + + - - + + - + - + - - - + + + - - + + - - + + - + - + - - - + + + - - - - + + + + - - - + + + - + - - - + + + - - - + + + - + - - - - + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - + - - + + - - - + + + - - - - - - + + + + + + - + - + - + - - - - - + + + + + - - + + - - - + + + - - - - - + + + + + - + - - - + + + - + - - + + - - + + - - - + + + - - - + + + - - + + - + - - + + - - - - - + + + + + - - + + - + - - - - - + + + + + - - - - - - - + + + + + + + - + - + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - + + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - + - + - - + + - - + + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - - + + + + + - - + + - - + + - - - - - - - + + + + + + + - - + + - - + + - - - + + + - + - - + + - + - + - + - - + + - + - + - - - - - - - - + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - + - + - + - + - - - - - + + + + + - + - + - - - - - - - - + + + + + + + + - + - + - - - + + + - + - - - - - + + + + + - - - + + + - + - - + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - + - + - - - + + + - + - - + + - - - - + + + + - + - + - + - + - - - - + + + + - - - + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - + + + + + + - + - - + + - + - + - - - + + + - - + + - - - + + + - - + + - + - - + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - + + - - + + - + - + - - - - - - - + + + + + + + - + - - - + + + - - - - - - + + + + + + - - + + - - + + - + - + - - + + - + - + - + - + - + - - - - - + + + + + - - + + - + - + - - + + - + - + - - - - - - + + + + + + - + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - - - - + + + + + - + - - - - - + + + + + - - - - - + + + + + - + - + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - + + + + + + - - + + - + - - - + + + - + - - - - + + + + - - - - + + + + - - + + - + - - - + + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - + + - + - - - - + + + + - + - + - - - + + + - + - - + + - + - + - + - + - - - + + + - - - - - + + + + + - - + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - + + + - - + + - + - - - - + + + + - + - - + + - - + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + - + - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + - + - + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - + + - + - + - - + + - + - + - - - + + + - - - - + + + + - + - + - + - + - - - + + + - + - + - - - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - + + - + - - + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - + + - + - - - + + + - + - - + + - - - - + + + + - + - + - + - - - - - + + + + + - - - - + + + + - + - + - - - - - - + + + + + + - - - - - - + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - + - - - - - - + + + + + + - + - - - + + + - + - + - + - - - + + + - - + + - + - - + + - - - + + + - + - + - + - + - - - + + + - + - - - + + + - + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - - - - - - - + + + + + + + - - + + - + - + - - - + + + - - - + + + - + - + - - - + + + - + - - - - - + + + + + - + - - + + - - - + + + - + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - + + - - + + - + - - - + + + - + - + - - + + - - + + - - + + - + - + - - - + + + - - + + - + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - + + - + - - + + - - - + + + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - - + + - + - - - - + + + + - + - - - - - + + + + + - - - - - - + + + + + + - - + + - - - + + + - - - - - - + + + + + + - + - - + + - + - + - - + + - + - - - + + + - - - - + + + + - + - - - - - - - - + + + + + + + + - + - + - - - + + + - - - + + + - - + + - + - - + + - - - + + + - - - + + + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - + - - - + + + - - - + + + - + - - + + - - + + - + - + - + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + - + - - + + - + - + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - + + - - + + - - - - - + + + + + - - - + + + - + - - + + - + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - + + - - - - - + + + + + - + - - + + - - + + - + - + - - - + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - + + + - + - - - + + + - - - - - + + + + + - - - + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + - + - - - + + + - - - + + + - - + + - - + + - - - - - - - + + + + + + + - - + + - + - - + + - + - + - - + + - + - + - - - + + + - - - + + + - - + + - - + + - - + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - + - - - - - - - + + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - + - - + + - + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - + + - + - - + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - + + + + - + - - - + + + - + - - + + - + - - + + - - - + + + - - + + - - - - - + + + + + - + - + - + - + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - + + - + - - - - - + + + + + - - + + - - + + - - - - - + + + + + - - + + - + - - + + - - - - + + + + - - + + - - - + + + - + - - - - - - + + + + + + - - + + - - - + + + - + - - - - - - + + + + + + - + - + - - - - + + + + - - + + - - - + + + - - + + - + - - - - - - + + + + + + - + - - - - + + + + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - - + + - - - + + + - - - + + + - + - - - + + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - - + + - - - - + + + + - - - - - - - + + + + + + + - - + + - - - + + + - - + + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - + + + + - - + + - + - + - + - - - - + + + + - - + + - + - + - + - + - + - + - + - + - + - - + + - - - - - - - - + + + + + + + + - - + + - + - - - - - - + + + + + + - + - - - - + + + + - + - + - - + + - + - - - + + + - - - + + + - + - + - - - + + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - + - - + + - + - - + + - - + + - - - - - + + + + + - + - - - + + + - + - - - - + + + + - + - + - - - + + + - + - + - + - - + + - - - - + + + + - + - - + + - - - - - + + + + + - + - - + + - - - - + + + + - + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - + - + - - - + + + - - + + - - - - - - + + + + + + - - + + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - - - + + + - - - - + + + + - - + + - + - + - - - + + + - + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - + - - + + - - - + + + - + - - + + - + - + - - + + - - - - + + + + - - + + - + - - - + + + - + - - + + - - - - + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - - + + - - + + - + - - + + - - - - - - - + + + + + + + - + - - + + - - + + - - - + + + - - - - + + + + - - + + - - - - - - + + + + + + - + - - - + + + - - + + - - + + - - - + + + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - + - - - - - - - - - - + + + + + + + + + + - - - + + + - + - - + + - - - - - + + + + + - - - + + + - + - - - - + + + + - - - + + + - + - - - - - - - + + + + + + + - - + + - + - + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - - + + - + - - - + + + - + - - + + - + - - - + + + - + - + - - + + - - - + + + - + - + - + - - - - - + + + + + - + - - - + + + - + - - + + - - + + - - + + - - - + + + - - + + - - - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - - - - - - + + + + + + + - + - - + + - + - + - + - + - + - + - - - - - + + + + + - + - - - + + + - - + + - - + + - + - + - - + + - - + + - + - - + + - - + + - - - + + + - + - - + + - - - - - - + + + + + + - - + + - + - + - - - - + + + + - + - + - - - + + + - + - - - - - - + + + + + + - - - - - + + + + + - + - + - + - - - + + + - - - + + + - + - + - - - - + + + + - + - - - - - - - - - - + + + + + + + + + + - + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - + + - + - + - + - - - + + + - - - - + + + + - - + + - - - - - - + + + + + + - - - + + + - + - + - + - + - - - + + + - - + + - + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - + - - + + - + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - + - - - - + + + + - - + + - - - + + + - + - - + + - - - - + + + + - + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + + + - + - - - + + + - - + + - - + + - + - - + + - - + + - - - - + + + + - - - + + + - - + + - + - + - + - + - + - - + + - + - + - + - - + + - - - + + + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - - + + - - + + - - - - - + + + + + - + - - - - + + + + - + - + - - - - - - - - + + + + + + + + - + - - - + + + - + - - + + - + - - - - + + + + - + - - - + + + - - + + - - - - + + + + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + + - + - - + + - + - - + + - - - - + + + + - - - - + + + + - - - + + + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - - + + + - + - + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - + - - - - - + + + + + - + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - + + - - - - + + + + - - - - + + + + - + - + - - - - - + + + + + - + - + - - - + + + - + - - - + + + - + - + - - - - - - - + + + + + + + - + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - + - + - + - - - + + + - - + + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - - + + - - - + + + - - - + + + - + - + - + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + - + - - - - + + + + - - - + + + - - - - - + + + + + - - + + - + - - + + - + - - + + - + - + - - + + - + - - - + + + - - + + - + - - - + + + - - - + + + - + - - - - - + + + + + - + - - + + - + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - + - + - + - + - + - - - - - + + + + + - - - - + + + + - - - + + + - + - - + + - - + + - - + + - - + + - + - + - + - - - + + + - - + + - + - + - + - - + + - + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - + - + - + - + - + - - - + + + - + - + - + - - + + - - + + - - + + - + - + - - - + + + - + - - - + + + - + - + - + - - + + - + - - + + - - + + - + - - + + - - - - + + + + - + - + - - - - - + + + + + - + - + - - - + + + - - + + - - - - - + + + + + - - - - - - - - + + + + + + + + + + - + - + - + - + - + - - + + - + - + - + - - + + - - + + - - - - - + + + + + - - + + - - - - - - - + + + + + + + - - + + - - + + - + - - + + - + - + - - - - - - - + + + + + + + - + - + - + - + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - + + + - - + + - + - - + + - + - + - + - - + + - - + + - - - - + + + + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - - + + - + - + - - - - - + + + - + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - - + + - - + + - - - - + + + + - - - - + + + + - - + + - - - + + + - - - - - + + + + + - + - + - - + + - - + + - + - + - - + + - - - - - - - - + + + + + + + + - + - - + + - + - + - - - + + + - + - - - + + + - - + + - + - + - + - - - - + + + + - + - + - - - + + + - + - - - - - + + + + + - + - + - + - - - + + + - + - - + + - - - - - + + + + + - - - + + + - - + + - + - - - + + + - + - + - - + + - - - - - + + + + + - - - - - + + + + + - + - - - - - - - + + + + + + + - - + + - - - - - + + + + + - - + + - + - - + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - + - - + + - - - + + + - - - + + + - + - - - - - + + + + + - - - + + + - + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - + + - - + + - - - - - + + + + + - + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - + + + + - - + + - - - - - + + + + + - - - + + + - + - - - + + + - - - - - - - - - + + + + + + + + + - - + + - + - + - + - - - - + + + + - + - - - - + + + + - + - - + + - + - - + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - + + - + - + - + - + - - - + + + - - - + + + - - - + + + - - + + - + - + - + - + - - - + + + - - + + - - - + + + - + - - - + + + - - - - + + + + - - - + + + - - - + + + - - + + - - + + - + - + - + - + - - + + - + - - - - + + + + - - + + - - - - + + + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - + + + + + + - - - + + + - - + + - + - + - - - - + + + + - - - - - + + + + + - - + + - + - + - + - + - + - + - - - + + + - - - + + + - - - - + + + + - - + + - - - - - - - + + + + + + + - + - + - - - - + + + + - - - + + + - + - - + + - - - - + + + + - + - + - - - + + + - - + + - + - - - + + + - + - - + + - - - - + + + + - - - - + + + + - + - - + + - + - - - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - + - - + + - - - - - + + + + + - + - - + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - + - + - + - - - - - - + + + + + + - + - - - + + + - + - - + + - + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - + - + - - - - + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - + - - - + + + - - + + - - - + + + - - - + + + - - - - + + + + - + - - + + - - - - - + + + + + - - - + + + - + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - + + + - + - - - - + + + + - - - + + + - - + + - - + + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - - + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - + + - - + + - + - - + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - + - - + + - + - - - - - + + + + + - + - + - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - + - + - + - + - - + + - + - + - + - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - - - - - + + + + + - - - - - + + + + + - - - + + + - + - + - - + + - - + + - - + + - - - - - + + + + + - - + + - + - + - - - - - + + + + + - + - + - - - - + + + + - + - + - + - - + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - + - - - + + + - - + + - + - + - + - + - + - - - - + + + + - + - + - - - - - - + + + + + + - - - - + + + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - + - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - + + - + - + - - + + - - + + - - + + - - - + + + - + - - + + - - - - + + + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - + - + - - + - - - - - + + + + + - - - + + + - + - - + + - + - + - - + + - + - - + + - + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - + - - - + + + - - + + - - - - - + + + + + - + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13432,7 +13452,7 @@ - + @@ -14064,23387 +14084,23650 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - + + + + - - - + + + - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + - - - + + + + + - - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + + - - - - - + + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - + + + + - - - - - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + + - - - - - - - + + + - - - + + + - - - - - - - - + + + - - - - - - - - - + + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + - - - - + + + + + - - - + + + + - - - + + + - - - - - - + + + - - - + + + - - - + + + + + + + + - - - + + + - - - + + + - - - - - + + + + + + + + - - - + + + + + + + + + - - - - - + + + - - - + + + + - - - + + + - - - + + + + + - - - + + + + - - - + + + + + + + + + - - - + + + - - - + + + + + - - - + + + - - - - - - - - + + + + - - - + + + + - - - + + + - - - - - - - + + + - - - - + + + + + + - - - - + + + - - - + + + + + + + - - - + + + + + - - - - - - - - - - - + + + - - - - - - - + + + - - - + + + + - - - - - - - - + + + + - - - + + + - - - - - - - - + + + + + + - - - + + + - - - - - - - - - - - + + + - - - - - - - + + + - - - - + + + - - - - + + + - - - - + + + + + + + - - - - + + + + + + - - - + + + + - - - + + + + + + + + + - - - + + + + + - - - + + + - - - + + + - - - + + + + + + - - - - + + + + + + + - - - + + + + - - - + + + - - - - - - - + + + + - - - + + + - - - + + + - - - + + + + - - - - + + + + + + + + - - - - - + + + + - - - + + + + - - - + + + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + + + - - - + + + + + - - - - + + + - - - + + + - - - - + + + - - - - + + + + - - - + + + + - - - - - + + + + - - - + + + - - - - - - - - - - - - - + + + + - - - + + + - - - + + + + - - - + + + - - - - + + + + - - - - + + + + + - - - + + + + - - - + + + + - - - - + + + + - - - - + + + - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + + - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + + + - - - - - + + + + - - - + + + - - - - + + + + + - - - - + + + + + + + + + + - - - + + + + + - - - + + + + - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + + - - - + + + + - - - + + + - - - - - - + + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - - - + + + + + + + - - - + + + - - - - - + + + + - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + - - - - - - - + + + - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - - + + + - - - - - + + + + - - - + + + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + - - - - + + + + + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + + + + + + - - - + + + + - - - - + + + - - - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + + + + + - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + + - - - + + + - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + + + - - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - - + + + - - - + + + - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + + - - - + + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + + - - - + + + - - - - + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + - - - - - + + + + - - - + + + - - - + + + + + + + + - - - + + + + + + + - - - + + + - - - + + + - - - - + + + - - - - - + + + - - - + + + - - - + + + + + - - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + + - - - + + + + + + + + + + + - - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + - - - - - + + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + + + - - - + + + + - - - + + + - - - + + + - - - + + + + + + + + - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + + + + + + - - - - + + + + + + + - - - + + + + + + + + - - - + + + + + + + - - - + + + - - - + + + - - - + + + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + - - - + + + + + - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + + + - - - - + + + - - - + + + + + + + + + - - - + + + + + + + - - - + + + + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + + - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + + + + + - - - - + + + + + + + - - - + + + + - - - + + + - - - + + + + + + + + + - - - + + + - - - + + + + + + + + + + + - - - + + + - - - + + + + - - - - - + + + - - - + + + + + + + + + - - - + + + - - - + + + + - - - + + + - - - + + + + + + + + + - - - - + + + + - - - + + + + - - - + + + - - - + + + + - - - + + + - - - + + + + - - - + + + - - - + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + + + + + + + - - - - + + + + - - - + + + + + + + + + - - - + + + + + - - - + + + + + + + + + + - - - + + + - - - + + + + + + + + + - - - - + + + - - - + + + + - - - + + + + - - - + + + + + + + + + - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + + + + + - - - - + + + - - - + + + + + - - - + + + - - - + + + + - - - - + + + + - - - + + + + + - - - + + + + - - - + + + + - - - + + + + + + + + + + + + - - - + + + + - - - + + + - - - + + + + - - - - + + + + + - - - + + + + - - - - + + + + - - - + + + + - - - + + + + - - - - + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + - - - + + + - - - - - + + + + - - - + + + - - - + + + + - - - - + + + + - - - + + + + - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + + - - - - + + + - - - + + + + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - + + + + - - - - - + + + + - - - + + + + - - - + + + - - - - - - + + + + + + + + + + - - - + + + - - - + + + + - - - + + + + - - - + + + + + + + + + + + + + + - - - - + + + + - - - + + + + + - - - + + + - - - + + + + - - - + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + - - - + + + - - - + + + + - - - + + + + - - - + + + @@ -38566,6155 +38849,6218 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/paths/de/w/d1.osm b/paths/de/w/d1.osm index d44fecb6..710bdb89 100644 --- a/paths/de/w/d1.osm +++ b/paths/de/w/d1.osm @@ -1,15925 +1,15716 @@ - - - - - - - - + + + + + + - - - - - - - - + + - - - - - - - - + + + + + - + - + - + - + - - - - - - + - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + - - + + - - - - - + + + + - - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + - + - - - - - - + + + + + + - - - + + + - - - + + + - + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - + - - + + - - - - + + + + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - + - + - - - - - + - + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - + + - - + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - + - + - - - - - + + + + + - + - - - - - - - - + + + + + + + + - - + + - - - + + + - + - - - - + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - - + + + + + + + + + - + - + - + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - + + + + - + - - - + + + - - - - + + + + - + - - + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + - - + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - + + + + - + - + - - - - - + + + + + - + - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - + + + + - - - + + + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - - - + + + + + + + - - - + + + - + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - + + - - + + - + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - - - + + + - - - - - + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + - - - + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - + - + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - - - - + + + + + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + - + - - + + - - - - - - - - - + + + - - + - - + - - + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - + + - - - + + + - + - + - + - + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - + + + - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - + + + - - + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - - - - - - + + + - - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + - - - - - - - - - - - - - + + + - - - + + + - - - - + + + - - - - - - - + + + + - - - + + + - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - + + + - - - - - - + + + - - - - - - - - + + + - - - - + + + - - - + + + - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + - - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + - - - + + + + + + + - - - + + + - - - + + + + + + + + + - - - + + + + - - - + + + - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/paths/de/w/d2.osm b/paths/de/w/d2.osm index 1265eb47..d56688d4 100644 --- a/paths/de/w/d2.osm +++ b/paths/de/w/d2.osm @@ -1,29669 +1,29669 @@ - + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - + + + + + + - - + + - - + + - - - + + + - + - + - - - - + + + + - - - + + + - + - - - - + + + + - - - - + + + + - - + + - + - - + + - - + + - - - - + + + + - + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + + - - + + - - - + + + - + - + - + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - - + + - + - + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - + + - - - - - - - + + + + + + + - - - + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - + - + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - - - + + + + - + - - - + + + - + - + - + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - + - + - + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - + - - - - - + + + + + - - + + - + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - + - + - - + + - - - - - - - + + + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - + + + + + + + - - + + - - - - - + + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - + + + + + + - - + + - - - - + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - + - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/paths/de/w/d3.osm b/paths/de/w/d3.osm new file mode 100644 index 00000000..175d23b7 --- /dev/null +++ b/paths/de/w/d3.osm @@ -0,0 +1,3887 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/paths/de/w/d4.osm b/paths/de/w/d4.osm deleted file mode 100644 index 0c2931f3..00000000 --- a/paths/de/w/d4.osm +++ /dev/null @@ -1,3879 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rules/de/a/d0.map b/rules/de/a/d0.map index 18773f88..ca8b46a9 100644 --- a/rules/de/a/d0.map +++ b/rules/de/a/d0.map @@ -5,7 +5,7 @@ with detail = 0 { with link = "line.de.1040" { track(:first :double :cat:ac15 :pax, - path("d0.de.1040")[:neu.yf, :fle] + path("d0.de.1040")[:neu.yf, :flw] ); } diff --git a/rules/de/a/d1/22.map b/rules/de/a/d1/22.map index 19f7316d..9c3bc8e9 100644 --- a/rules/de/a/d1/22.map +++ b/rules/de/a/d1/22.map @@ -6,7 +6,7 @@ with detail = 1 { } with link = "point.de.Hamburg-Hbf" { - label(path("d1.de.a.2200")[:har] + (-3dt, 1.5dt), + with layer = 1 label(path("d1.de.a.2200")[:har] + (-3dt, 1.5dt), hbox(:right:top :small :bold :cat:ac15 :pax, "Hamburg") ); } diff --git a/rules/de/a/d1/a0.map b/rules/de/a/d1/a0.map index 8572076f..1aa99931 100644 --- a/rules/de/a/d1/a0.map +++ b/rules/de/a/d1/a0.map @@ -19,14 +19,6 @@ with detail = 1 { track(:second :gone, path("d1.de.a15")[:hus.yt, :pls]); } - with link = "line.de.A20" { - track(:first :gone, path("d1.de.a20")[:oro.yo, :ren.yo]); - } - - with link = "line.de.A21" { - track(:first :gone, path("d1.de.a21")[:sul, :ora]); - } - with link = "line.de.A32" { track(:second :removed, path("d1.de.a32")[:lus, :hei]); } @@ -47,10 +39,6 @@ with detail = 1 { track(:second :removed, path("d1.de.a50")[:hol.ym, :mol.yh]); } - with link = "line.de.A51" { - track(:second :removed, path("d1.de.a51")[:ech.yu, :ufe]); - } - with link = "line.de.A62" { track(:first :gone, path("d1.de.a62")[:smg, :blg]); } diff --git a/rules/de/a/d2/10.map b/rules/de/a/d2/10.map index ef243b0d..36f8f0e7 100644 --- a/rules/de/a/d2/10.map +++ b/rules/de/a/d2/10.map @@ -1,16 +1,16 @@ # DE 1000. Flensburg Weiche - Harrislee Grenze with detail = 2 { - let flwhag = path("d2.de.1000"); + let fh = path("d2.de.1000"); with link = "line.de.1000" { - with layer = -1 track(:first :double :cat:ac15, flwhag[:flw, :fri.yf]); - track(:first :double :cat:ac15 :pax, flwhag[:fri.yf, :hag]); - with layer = 1 line_badge(:cat:ac15 :pax, flwhag[:hag - 2.5km], "1000"); + track(:first :double :cat:ac15, fh[:flw, :fri.yf]); + track(:first :double :cat:ac15 :pax, fh[:fri.yf, :hag]); + line_label(:left:e :cat:ac15 :pax, fh[:hag - 2km], "1000"); } with link = "point.int.Harrislee-Padborg" { - marker(:refdt :cat:ac15 :left, flwhag[:hag]); - marker(:refdt :cat:ac15 :right, flwhag[:hag]); + marker(:refdt :cat:ac15 :left, fh[:hag]); + marker(:refdt :cat:ac15 :right, fh[:hag]); } } @@ -20,8 +20,8 @@ with detail = 2 { let flwlin = path("d2.de.1001"); with link = "line.de.1001" { - with layer = -1 track(:second :closed, flwlin[:flw.yl, :lin.yf]); - with layer = 1 line_badge(:closed, flwlin[:flw.yl + 18km], "1001"); + track(:second :closed, flwlin[:flw.yl, :lin.yf]); + line_label(:right:s :closed, flwlin[:flw.yl + 18km], "1001"); } } @@ -31,7 +31,7 @@ with detail = 2 { let fh = path("d2.de.1002"); with link = "line.de.1002" { - with layer = -1 track(:second :removed, fh[:wil.y, :fla]); + track(:second :removed, fh[:wil.y, :fla]); } with link = "point.de.Flensburg-Alter-Bf" { @@ -42,8 +42,12 @@ with detail = 2 { # DE 1005. Flensburg – Flensburg Friedensweg with detail = 2 { + let ff = path("d2.de.1005"); + with link = "line.de.1005" { - track(:first :cat:ac15 :pax, path("d2.de.1005")[:fle, :fri.yf]); + track(:first :cat:ac15 :pax, ff[:fle, :fri.yf]); + + line_label(:left:n :cat:ac15 :pax, ff[:fle + 2km], "1005"); } } @@ -54,6 +58,8 @@ with detail = 2 { with link = "line.de.1010" { with layer = -1 track(:second :removed, sa[:sle.ya, :sla]); + + line_label(:left:s :removed, sa[:sla - 1.3km], "1010"); } with link = "point.de.Schleswig-Altstadt" { @@ -68,14 +74,20 @@ with detail = 2 { let jh = path("d2.de.1011"); with link = "line.de.1011" { - track(:second :pax, jh[:jub.yh, :hus.yj]); - with layer = 1 line_badge(:pax, jh[:ohr - 4km], "1011"); - with layer = 1 line_badge(:pax, jh[:ohr + 5.5km], "1011"); + track(:second :pax, jh[:jub.yh, :ohr]); + line_label(:left:nw :pax, jh[:ohr - 6.3km], "1011"); } with link = "point.de.Ohrstedt" { - with layer = 1 marker(:statdot, jh[:ohr]); - slabel(:right, jh[:ohr + 3dt] << 3.5dt, "Ohrstedt"); + statdot(:open, jh[:ohr]); + slabel(:right, jh[:ohr] + (-2dt, 0.8dt), + hbox(:left:top, "Ohrstedt") + ) + } + + with link = "line.de.1011" { + track(:second :pax, jh[:ohr, :hus.yj]); + line_label(:left:n :pax, jh[:ohr + 5.5km], "1011"); } } @@ -86,14 +98,20 @@ with detail = 2 { let bh = path("d2.de.1012"); with link = "line.de.1012" { - with layer = -1 track(:second :removed, bh[:bud, :hus.yb]); - with layer = 1 line_badge(:removed, bh[:bud + 14.8km], "1012"); - with layer = 1 line_badge(:removed, bh[:hus - 7.5km], "1012"); + track(:second :removed, bh[:bud, :nor]); + line_label(:right:s :removed, bh[:bud + 18km], "1012"); } with link = "point.de.Norderstapel" { - with layer = 1 marker(:statdot :removed, bh[:nor]); - slabel(:left :removed, bh[:nor] + (0dt, 4dt), "Norderstapel"); + marker(:statdot :removed, bh[:nor]); + slabel(:left :removed, bh[:nor] + (0dt, 0.8dt), + hbox(:right:top, "Norderstapel") + ); + } + + with link = "line.de.1012" { + track(:second :removed, bh[:nor, :hus.yb]); + line_label(:right:w :removed, bh[:hus - 9km], "1012"); } } @@ -103,35 +121,61 @@ with detail = 2 { let hf = path("d2.de.1020"); with link = "line.de.1020" { - track(:second :pax, hf[:has, :fle.r]); - with layer = 1 line_badge(:pax, hf[:nwi + 8.0km], "1020"); - with layer = 1 line_badge(:pax, hf[:sor - 4.5km], "1020"); + track(:second :pax, hf[:has, :suc]); } with link = "point.de.Suchsdorf" { - with layer = 1 marker(:statdot :pax, hf[:suc]); + track(:second :station :pax, hf[:suc, :suc.y]); + statdot(:pax, hf[:suc]); slabel(:left :pax, hf[:suc - 1.5dt] << 1.5dt, "Suchsdorf"); } + with link = "line.de.1020" { + track(:second :pax, hf[:suc.y, :nwi]); + } + with link = "point.de.Neuwittenbek" { - with layer = 1 marker(:statdot :pax, hf[:nwi]); + track(:second :station :pax, hf[:nwi, :nwi.y]); + statdot(:pax, hf[:nwi]); slabel(:left :pax, hf[:nwi] + (-2.0dt, 1.5dt), "Neuwittenbek"); } + with link = "line.de.1020" { + track(:second :pax, hf[:nwi.y, :ecs]); + line_label(:right:sw :pax, hf[:nwi + 8.0km], "1020"); + } + with link = "point.de.Eckernförde" { - with layer = 1 marker(:statdot :pax, hf[:ecs]); - slabel(:right :pax, hf[:ecs] + (2.0dt, 1.0dt), "Eckernförde"); + track(:second :station :pax, hf[:ecs, :eck.yo]); + statdot(:pax, hf[:ecs]); + slabel(:right :pax, hf[:ecs] + (1.5dt, 0.5dt), "Eckernförde"); + } + + with link = "line.de.1020" { + track(:second :pax, hf[:eck.yo, :sud.ys]); } with link = "point.de.Süderbrarup" { - with layer = 1 marker(:statdot :pax, hf[:sud]); + track(:second :station :pax, hf[:sud.ys, :sud.yk]); + statdot(:pax, hf[:sud]); slabel(:right :pax, hf[:sud] + (2.0dt, 1.5dt), "Süderbrarup"); } + with link = "line.de.1020" { + track(:second :pax, hf[:sud.yk, :sor.yr]); + line_label(:right:w :pax, hf[:sor - 6km], "1020"); + } + with link = "point.de.Sörup" { - with layer = 1 marker(:statdot :pax, hf[:sor]); + track(:second :station :pax, hf[:sor.yr, :sor]); + statdot(:pax, hf[:sor]); slabel(:left :pax, hf[:sor] + (-2.0dt, 1.5dt), "Sörup"); } + + with link = "line.de.1020" { + track(:second :pax, hf[:sor, :fle.r]); + line_label(:right:sw :pax, hf[:sor + 7km], "1020"); + } } @@ -140,11 +184,14 @@ with detail = 2 { let hw = path("d2.de.1021"); with link = "line.de.1021" { - with layer = -1 track(:second :removed, hw[:has.y, :kiw]); + track(:second :removed, hw[:has.y, :kiw]); } with link = "point.de.Kiel-West" { - with layer = 1 marker(:statdot :removed, hw[:kiw]); + marker(:statdot :removed, hw[:kiw]); + with zoom = :high { + slabel(:top :removed, hw[:kiw] + (2dt, -0.8dt), "K. West"); + } } } @@ -154,12 +201,20 @@ with detail = 2 { let ko = path("d2.de.1022"); with link = "line.de.1022" { - track(:first :pax, ko[:kie.ks, :oro.yk]); - with layer = 1 line_badge(:pax, ko[:has + 14km], "1022"); + track(:first :pax, ko[:kie.ks, :has]); } with link = "point.de.Kiel-Hassee" { - with layer = 1 marker(:statdot :pax, ko[:has]); + track(:first :pax, ko[:has, :has.y]); + statdot(:pax, ko[:has]); + slabel(:left :pax, ko[:has] + (0.3dt, 0.5dt), + hbox(:right:top, "K.-Hassee C.p.") + ); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:has.y, :oro.yk]); + line_label(:right:s :pax, ko[:has + 14km], "1022"); } } @@ -170,23 +225,21 @@ with detail = 2 { let kn = path("d2.de.1023"); with link = "line.de.1023" { - track(:first :pax, kn[:kie.ys, :mal]); - track(:first :double :pax, kn[:mal, :eut]); - with layer = -1 track(:second :removed, kn[:eut.y, :neg.ns]); - track(:first :pax, kn[:neg.nn, :nst]); - - with layer = 1 line_badge(:pax, kn[:asc - 6.5km] @ 8 << 0.4dt, "1023"); - with layer = 1 line_badge(:pax, kn[:mal - 3.5km] @ 15 << 0.1dt, "1023"); - with layer = 1 line_badge(:removed, kn[:neg - 5.0km] @ -15, "1023"); + track(:first :pax, kn[:kie.ys, :pre]); } with link = "point.de.Preetz" { - with layer = 1 marker(:statdot :pax, kn[:pre]); + marker(:statdot :pax, kn[:pre]); slabel(:right :pax, kn[:pre + 2.5dt] << 1.5dt, "Preetz"); } + with link = "line.de.1023" { + track(:first :pax, kn[:pre, :asc]); + line_label(:right:ne :pax, kn[:asc - 6.5km], "1023"); + } + with link = "point.de.Ascheberg-Holst" { - with layer = 1 marker(:statdot :pax, kn[:asc]); + marker(:statdot :pax, kn[:asc]); label(:pax, kn[:asc] + (-2dt, 1.0dt), hbox(:left:top, hbox(:left:base :small, @@ -197,6 +250,11 @@ with detail = 2 { ); } + with link = "line.de.1023" { + track(:first :pax, kn[:asc, :mal]); + line_label(:left:s :pax, kn[:mal - 3.5km], "1023"); + } + with link = "point.de.Malente-Gremsmühlen" { with layer = 1 marker(:statdot :pax, kn[:mal]); slabel(:right :pax, kn[:mal + 2.0dt] << 1.2dt, @@ -204,15 +262,28 @@ with detail = 2 { ); } + with link = "line.de.1023" { + track(:first :double :pax, kn[:mal, :eut]); + } + with link = "point.de.Eutin" { with layer = 1 marker(:statdot :pax, kn[:eut]); slabel(:left :pax, kn[:eut + 2dt] >> 3.0dt, "Eutin"); } + with link = "line.de.1023" { + track(:second :removed, kn[:eut.y, :neg.ns]); + line_label(:left:s :removed, kn[:neg - 5.2km], "1023"); + } + with link = "point.de.Neustadt-Holst-Gbf" { with layer = 1 marker(:statdot, kn[:neg]); } + with link = "line.de.1023" { + track(:first :pax, kn[:neg.nn, :nst]); + } + with link = "point.de.Neustadt-Holst" { with layer = 1 marker(:statdot :pax, kn[:nst]); slabel(:right :pax, kn[:nst] + (0dt, 4dt), @@ -228,55 +299,94 @@ with detail = 2 { let nf = path("d2.de.1040"); with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:neu.yf, :fle]); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:oro - 10km], "1040"); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:jub - 5.5km], "1040"); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:jub + 10.5km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:neu.yf, :oro.yk]); + line_badge(:cat:ac15 :pax, nf[:oro - 11km], "1040"); } with link = "point.de.Osterrönfeld" { - with layer = 1 marker(:statdot :cat:ac15, nf[:oro]); + track(:first :double :cat:ac15 :pax, nf[:oro.yk, :oro.yo]); + statdot(:cat:ac15, nf[:oro]); label(:cat:ac15, nf[:oro] + (2.0km, 0dt), hbox(:left:middle :small, "Osterrönfeld") ); } + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:oro.yo, :ren]); + } + with link = "point.de.Rendsburg" { - with layer = 1 marker(:statdot :cat:ac15 :pax, nf[:ren]); + statdot(:cat:ac15 :pax, nf[:ren]); label(:cat:ac15 :pax, nf[:ren] + (-3dt, 1.0dt), hbox(:right:middle :small, "Rendsburg") ); } + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:ren, :bud]); + } + + with link = "point.de.Büdelsdorf" { + statdot(:removed, nf[:bud]); + slabel(:right :removed, nf[:bud] + (1.0dt, -0.5dt), "Büdelsdorf"); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:bud, :ows]); + } + with link = "point.de.Owschlag" { - with layer = 1 marker(:statdot :cat:ac15 :pax, nf[:ows]); + track(:first :double :cat:ac15 :pax, nf[:ows, :owk]); + statdot(:cat:ac15 :pax, nf[:ows]); label(:cat:ac15 :pax, nf[:ows] << 2dt, hbox(:right:middle :small, "Owschlag") ); } + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:owk, :sle]); + line_label(:right:w :double :cat:ac15 :pax, nf[:owk + 6km], "1040"); + } + with link = "point.de.Schleswig" { - with layer = 1 marker(:statdot :cat:ac15 :pax, nf[:sle]); + track(:first :double :cat:ac15 :pax, nf[:sle, :sle.ya]); + statdot(:cat:ac15 :pax, nf[:sle]); label(:cat:ac15 :pax, nf[:sle] + (2.5dt, -0.5dt), hbox(:left:middle :small, "Schleswig") ); } + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:sle.ya, :jub]); + line_label(:left:ne :double :cat:ac15 :pax, nf[:jub - 4.5km], "1040"); + } + with link = "point.de.Jübek" { - with layer = 1 marker(:statdot :cat:ac15 :pax, nf[:jub]); - slabel(:right :cat:ac15 :pax, nf[:jub - 1dt] >> 2dt, "Jübek"); + track(:first :double :cat:ac15 :pax, nf[:jub, :jub.yh]); + statdot(:cat:ac15 :pax, nf[:jub]); + slabel(:right :cat:ac15 :pax, nf[:jub] + (1.5dt, -0.5dt), "Jübek"); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:jub.yh, :flw.yl]); + line_label(:right:w :double :cat:ac15 :pax, nf[:jub + 14km], "1040"); } with link = "point.de.Flensburg-Weiche" { - with layer = 1 marker(:statdot :cat:ac15, nf[:flw]); - label(:cat:ac15, nf[:flw] + (-2.0km, 0dt), - hbox(:right:top :small, "F. Weiche") + track(:first :double :cat:ac15 :pax, nf[:flw.yl, :flw]); + statdot(:cat:ac15, nf[:flw]); + slabel(:left :cat:ac15, nf[:flw] + (-1.0km, 0.2km) + (-1.0dt, 0dt), + hbox(:right:top, "F. Weiche") ); } + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:flw, :fle]); + } + with link = "point.de.Flensburg" { - with layer = 1 marker(:statdot :cat:ac15 :pax, nf[:fle]); - slabel(:cat:ac15 :pax, nf[:fle] + (3.3km, -1.2km), + with layer = 1 statdot(:cat:ac15 :pax, nf[:fle]); + slabel(:right :cat:ac15 :pax, nf[:fle] + (3.3km, -1.2km), hbox(:left:bottom :bold, "Flensburg") ); } @@ -288,16 +398,20 @@ with detail = 2 { let na = path("d2.de.1041"); with link = "line.de.1041" { - with layer = -1 track(:first :removed, na[:neu.yh, :asc.r]); - with layer = 1 line_badge(:removed, na[:wan - 5.0km], "1041"); + track(:first :removed, na[:neu.yh, :wan]); + line_label(:left:s :removed, na[:wan - 3.0km], "1041 "); } with link = "point.de.Wankendorf" { - with layer = 1 marker(:statdot :removed, na[:wan]); + statdot(:removed, na[:wan]); label(na[:wan] + (1.7km, 0dt), hbox(:left:top :small :removed, "Wankendorf") ); } + + with link = "line.de.1041" { + track(:first :removed, na[:wan, :asc.r]); + } } @@ -306,19 +420,23 @@ with detail = 2 { let nh = path("d2.de.1042"); with link = "line.de.1042" { - track(:second :pax, nh[:neu.yh, :hei.hs]); - with layer = 1 line_badge(:pax, nh[:neu.yh + 13.5km], "1042"); - with layer = 1 line_badge(:pax, nh[:hei - 22.5km], "1042"); + track(:second :pax, nh[:neu.yh, :hwe]); + line_label(:right:s :pax, nh[:neu.yh + 11km], "1042"); } with link = "point.de.Hohenwestedt" { with layer = 1 marker(:statdot :pax, nh[:hwe]); - label(:pax, nh[:hwe + 1dt] << 1.8dt, + label(:pax, nh[:hwe] + (-1.5dt, 1dt), vbox(:left:top :small, "Hohen-", "westedt" ) ); } + + with link = "line.de.1042" { + track(:second :pax, nh[:hwe, :hei.hs]); + line_label(:left:n :pax, nh[:hei - 22.5km], "1042"); + } } @@ -327,19 +445,30 @@ with detail = 2 { let no = path("d2.de.1043"); with link = "line.de.1043" { - track(:first :pax, no[:neu.yo, :old.yn]); - with layer = 1 line_badge(:pax, no[:seg - 10km], "1043"); + track(:first :pax, no[:neu.yo, :nes]); } with link = "point.de.Neumünster-Süd" { - with layer = 1 marker(:statdot :pax, no[:nes]); + track(:first :station :pax, no[:nes, :nes.yk]); + statdot(:pax, no[:nes]); + } + + with link = "line.de.1043" { + track(:first :pax, no[:nes.yk, :seg.yk]); + line_label(:left:s :pax, no[:nes.yk + 11km], " 1043"); } with link = "point.de.Bad-Segeberg" { - with layer = 1 marker(:statdot :pax, no[:seg]); + track(:first :station :pax, no[:seg.yk, :seg.yl]); + statdot(:pax, no[:seg]); label(:pax, no[:seg - 1dt] >> 1.0dt, hbox(:right:top :small, "Bad Segeberg") ); } + + with link = "line.de.1043" { + track(:first :pax, no[:seg.yl, :old.yn]); + line_label(:right:e :pax, no[:seg.yl + 5.5km], "1043"); + } } diff --git a/rules/de/a/d2/11.map b/rules/de/a/d2/11.map index 71153403..dd2e2e69 100644 --- a/rules/de/a/d2/11.map +++ b/rules/de/a/d2/11.map @@ -4,38 +4,47 @@ with detail = 2 { with link = "line.de.1100" { track(:first :double :cat:ac15 :pax, lp[:lub, :wal]); - track(:first :double :pax, lp[:wal, :swr.ye]); - track(:first :pax, lp[:swr.ye, :neg.nn]); - track(:first, lp[:neg.nn, :put]); - - with layer = 1 line_badge(:pax, lp[:swr + 12.5km], "1100"); - with layer = 1 line_badge( - :pax, lp[:neg + 15.5km] @ -5 << 0.5dt, "1100" - ); - with layer = 1 line_badge(:pax, lp[:buw + 3.5km], "1100"); + track(:first :double :pax, lp[:wal, :swr]); } with link = "point.de.Bad-Schwartau" { - with layer = 1 marker(:statdot :pax, lp[:swr]); + track(:first :double:station :pax, lp[:swr, :swr.ye]); + statdot(:pax, lp[:swr]); slabel(:left :pax, lp[:swr] << 1.2dt, vbox(:center:bottom, "Bad ", "Schwartau") ); } + with link = "line.de.1100" { + track(:first :pax, lp[:swr.ye, :neg.nn]); + track(:first, lp[:neg.nn, :gbr]); + + line_label(:right:w :pax, lp[:swr + 12.5km], "1100"); + line_label(:right:w :pax, lp[:neg + 15km], "1100"); + } + with link = "point.de.Großenbrode" { - with layer = 1 marker(:statdot, lp[:gbr]); + statdot(:open, lp[:gbr]); label(:open, lp[:gbr] >> 2.0dt, hbox(:left:middle :small, "Großenbrode") ); } + with link = "line.de.1100" { + track(:first, lp[:gbr, :put]); + } + with link = "point.de.Burg-Fehmarn-West" { - with layer = 1 marker(:statdot, lp[:buw]); + statdot(:open, lp[:buw]); + } + + with link = "line.de.1100" { + line_label(:right:w :pax, lp[:buw + 4.5km], "1100"); } with link = "point.de.Puttgarden" { - with layer = 1 marker(:statdot, lp[:put]); - slabel(:top, lp[:put] - (0dt, 1.5dt), span(:bold, "Puttgarden")); + statdot(:open, lp[:put]); + slabel(:top, lp[:put] - (0dt, 1.0dt), span(:bold, "Puttgarden")); } } @@ -44,40 +53,32 @@ with detail = 2 { with detail = 2 { let fo = path("d2.de.1103"); - with link = "line.de.1103" { - with layer = -2 track(:third:removed, fo[:feh, :bur]); - track(:second, fo[:bur, :buw.ys]); - with layer = -2 track(:third:removed, fo[:buw.yo, :ort]); - - guide(:linenum :removed, - fo[:feh + 3.5km] >> 0.7dt - -- fo[:feh + 3.5km] >> 3.0dt - ); - label(:linenum :removed, fo[:feh + 3.5km] >> 3.0dt + (0dt, 0.2dt), - hbox(:left:middle :badgesize, " 1103") - ); - - with layer = 1 line_badge( - :removed, fo[:ort - 7.5km] @ -2 << 0.8dt, "1103" - ); - } - with link = "point.de.Fehmarnsund" { - with layer = 1 marker(:statdot :removed, fo[:feh]); + statdot(:removed, fo[:feh]); label(fo[:feh] - (2.2dt, 0.2dt), hbox(:right:middle :small :removed, "Fehmarnsund") ); } + with link = "line.de.1103" { + with layer = -2 track(:third:removed, fo[:feh, :bur]); + line_label(:right:nw :removed, fo[:bur - 2.05km], "1103"); + } + with link = "point.de.Burg-Fehmarn" { - with layer = 1 marker(:statdot, fo[:bur]); - label(:open, fo[:bur] + (1.5dt, -0.5dt), - hbox(:left:bottom :small, - hbox(:left:base, "Burg ", span(:light, "(Fehmarn)")) - ) + statdot(:open, fo[:bur]); + slabel(:right:open, fo[:bur] + (1.5dt, -0.5dt), + hbox(:left:base, "Burg ", span(:light, "(Fehmarn)")) ); } + with link = "line.de.1103" { + track(:second, fo[:bur, :buw.ys]); + with layer = -2 track(:third:removed, fo[:buw.yo, :ort]); + + line_label(:right:s :removed, fo[:ort - 4.5km], "1103"); + } + with link = "point.de.Orth-Fehmarn" { with layer = -1 marker(:statdot :removed, fo[:ort]); label(fo[:ort] + (-1.5dt, -0.2dt), @@ -90,46 +91,42 @@ with detail = 2 { # DE 1110. Eutin – Lübeck Hbf. -# with detail = 2 { let el = path("d2.de.1110"); with link = "line.de.1110" { - track(:first :pax, el[:eut, :swr.ye]); - - with layer = 1 line_badge(:pax, el[:swr - 10.0km] @ 3, "1110"); + track(:first :pax, el[:eut, :pon]); + line_label(:right:e :pax, el[:eut.y + 4.8km], "1110"); } with link = "point.de.Pönitz-Holst" { - with layer = 1 marker(:statdot :pax, el[:pon]); + track(:first :station :pax, el[:pon, :pon.y]); + statdot(:pax, el[:pon]); label(:pax, el[:pon] - (1.5dt, 0.5dt), hbox(:right:bottom :small, hbox(:right:base, "Pönitz ", span(:light, "(Holst)")) ) ); } + + with link = "line.de.1110" { + track(:first :pax, el[:pon.y, :swr.ye]); + line_label(:right:e :pax, el[:swr - 9.0km], "1110"); + } } # DE 1111. Pönitz (Holst) – Ahrensbök. -# with detail = 2 { let po = path("d2.de.1111"); with link = "line.de.1111" { track(:second :removed, po[:pon.y, :ahr]); - - guide(:linenum :removed, - po[:ahr - 2.2km] >> 0.7dt - -- po[:ahr - 2.2km] >> 3.0dt - ); - label(:linenum :removed, po[:ahr - 2.2km] >> 3.0dt, - hbox(:right:middle :badgesize, "1111 ") - ); + line_label(:right:se :removed, po[:ahr - 2.2km], "1111"); } with link = "point.de.Ahrensbök" { - with layer = 1 marker(:statdot :removed, po[:ahr]); + statdot(:removed, po[:ahr]); label(po[:ahr] - (1.5dt, 0.2dt), hbox(:right:middle :small :removed, "Ahrensbök") ); @@ -138,7 +135,6 @@ with detail = 2 { # DE 1112. Malente-Gremsmühlen – Lütjenburg -# with detail = 2 { let ml = path("d2.de.1112"); @@ -162,32 +158,38 @@ with detail = 2 { let wt = path("d2.de.1113"); with link = "line.de.1113" { - track(:first :double :cat:ac15 :pax, wt[:wal.y, :kuc]); - track(:first :cat:ac15 :pax, wt[:kuc, :trs]); - - guide(:linenum :cat:ac15 :pax, - wt[:trh - 2.5km] << 1dt - -- wt[:trh - 2.5km] << 3dt - ); - label(:linenum :cat:ac15 :pax, wt[:trh - 2.5km] << 3.5dt, - hbox(:right:middle, "1113") - ); + track(:first :double :cat:ac15 :pax, wt[:wal.y, :dan]); } with link = "point.de.Lübeck-Dänischburg" { - with layer = 1 marker(:statdot :cat:ac15 :pax, wt[:dan]); + track(:first :double :cat:ac15 :pax, wt[:dan, :dan.yh]); + statdot(:cat:ac15 :pax, wt[:dan]); + } + + with link = "line.de.1113" { + track(:first :double :cat:ac15 :pax, wt[:dan.yh, :kuc]); } with link = "point.de.Lübeck-Kücknitz" { - with layer = 1 marker(:statdot :cat:ac15, wt[:kuc]); + statdot(:cat:ac15, wt[:kuc]); + } + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:kuc, :trh]); + line_label(:left:e :cat:ac15 :pax, wt[:trh - 2.5km], "1113"); } with link = "point.de.Lübeck-Travemünde-Hafen" { - with layer = 1 marker(:statdot :cat:ac15 :pax, wt[:trh]); + track(:first :station :cat:ac15 :pax, wt[:trh, :trh.yn]); + statdot(:cat:ac15 :pax, wt[:trh]); + } + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:trh.yn, :trs]); } with link = "point.de.Lübeck-Travemünde-Strand" { - with layer = 1 marker(:statdot :cat:ac15 :pax, wt[:trs]); + statdot(:cat:ac15 :pax, wt[:trs]); label(:cat:ac15 :pax, wt[:trs] + (1.8dt, -1.3dt), hbox(:left:top :small, "L.-Travemünde") ); @@ -201,14 +203,7 @@ with detail = 2 { with link = "line.de.1114" { track(:second :removed, tn[:trh.yn, :nie]); - - guide(:removed, - tn[:trh + 2.5km] >> 0.8dt - -- tn[:trh + 2.5km] >> 3.0dt - ); - label(tn[:trh + 2.5km] >> 3.5dt, - hbox(:left:middle :badgesize :removed, "1114") - ); + line_label(:right:w :removed, tn[:trh + 2.5km], "1114"); } with link = "point.de.Niendorf-Ostsee" { @@ -228,7 +223,7 @@ with detail = 2 { } -# DE 1117 +# DE 1117. Lübeck-Kücknitz – Lübeck Skandinavienkai # with detail = 2 { let ks = path("d2.de.1117"); @@ -238,7 +233,13 @@ with detail = 2 { } with link = "point.de.Lübeck-Skandinavienkai" { - with layer = 1 marker(:statdot :cat:ac15, ks[:ska]); + statdot(:cat:ac15, ks[:ska]); + with zoom = :high { + slabel(:right :cat:ac15, + ks[:ska] + (-1dt, 1dt), + vbox(:left:top, "L.-Skandina-", " vienkai") + ); + } } } @@ -247,66 +248,84 @@ with detail = 2 { with detail = 2 { let lh = path("d2.de.1120"); - with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:lub, :ham.yo]); - - with layer = 1 line_badge(:cat:ac15 :pax, lh[:old - 5.7km], "1120"); - with layer = 1 line_badge(:cat:ac15 :pax, lh[:old + 15.0km], "1120"); - } - with link = "point.de.Lübeck-Hbf" { - with layer = 1 marker(:statdot :cat:ac15 :pax, lh[:lub]); - with layer = 2 label(:cat:ac15 :pax, lh[:lub + 2.8km] >> 2.5dt, + statdot(:cat:ac15 :pax, lh[:lub]); + label(:cat:ac15 :pax, lh[:lub + 2.8km] >> 2.5dt, hbox(:right:bottom :medium:bold, "Lübeck") ); } + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:lub, :old.yn]); + line_label(:right:s :double :cat:ac15 :pax, lh[:old - 10km], "1120"); + } + with link = "point.de.Bad-Oldesloe" { - with layer = 1 marker(:statdot :cat:ac15 :pax, lh[:old]); + track(:first :double:station :cat:ac15 :pax, lh[:old.yn, :old.ys]); + statdot(:cat:ac15 :pax, lh[:old]); label(:cat:ac15 :pax, lh[:old] << 2.0dt, hbox(:left:middle :small:bold, "Bad Oldesloe") ); } + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:old.ys, :rah]); + line_label(:left:w :double :cat:ac15 :pax, lh[:old + 15.0km], "1120"); + } + with link = "point.de.Hamburg-Rahlstedt" { - with layer = 1 marker(:statdot :cat:ac15 :pax, lh[:rah]); + statdot(:cat:ac15 :pax, lh[:rah]); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:rah, :wan]); + line_label(:left:nw :double :cat:ac15 :pax, lh[:rah + 3km], "1120"); } with link = "point.de.Hamburg-Wandsbek" { - with layer = 1 marker(:statdot :cat:ac15 :pax, lh[:wan]); + statdot(:cat:ac15 :pax, lh[:wan]); } - with link = "point.de.point.de.Hamburg-Hasselbrook" { - with layer = 1 marker(:statdot :cat:ac15 :pax, lh[:has]); + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:rah, :ham.yo]); } } -# DE 1121 -# +# DE 1121. Lübeck Hbf - Büchen with detail = 2 { let lb = path("d2.de.1121"); with link = "line.de.1121" { - track(:first :pax, lb[:lua.yb, :buc.yl]); + track(:first :pax, lb[:lua.yb, :rat.yo]); with layer = 1 line_badge(:pax, lb[:rat - 11.0km], "1121"); with layer = 1 line_badge(:pax, lb[:mol + 11.3km], "1121"); } with link = "point.de.Ratzeburg" { - with layer = 1 marker(:statdot :pax, lb[:rat]); + track(:first :station :pax, lb[:rat.yo, :rat.yh]); + statdot(:pax, lb[:rat]); label(:pax, lb[:rat] - (2.0dt, 0dt), hbox(:right:middle :small, "Ratzeburg") ); } + with link = "line.de.1121" { + track(:first :pax, lb[:rat.yh, :mol]); + } + with link = "point.de.Mölln-Lauenburg" { - with layer = 1 marker(:statdot :pax, lb[:mol]); + track(:first :station :pax, lb[:mol, :mol.yh]); + statdot(:pax, lb[:mol]); label(:pax, lb[:mol] - (2.0dt, 0dt), hbox(:right:middle :small, "Mölln ", span(:light, "(Lauenb.)")) ); } + + with link = "line.de.1121" { + track(:first :pax, lb[:mol.yh, :buc.yl]); + } } @@ -327,18 +346,11 @@ with detail = 2 { with link = "line.de.1131" { track(:second, ls[:stn.ys, :slu]); - - guide(:linenum, - ls[:slu - 2.0km] >> 0.5dt - -- ls[:slu - 2.0km] >> 3.0dt - ); - label(:linenum, ls[:slu - 2.0km] >> 3.0dt + (1.0dt, 0dt), - hbox(:left:middle :badgesize, "1131") - ); + line_label(:right:n, ls[:slu - 2km], " 1131"); } with link = "point.de.Lübeck-Schlutup" { - with layer = 1 marker(:statdot, ls[:slu]); + statdot(:open, ls[:slu]); label(ls[:slu] + (1.8dt, 0dt), hbox(:left:middle :small, "L.-Schlutup") ); @@ -348,8 +360,14 @@ with detail = 2 { # DE 1137. Brandenbaum - Lübeck Konstinbahnhof. with detail = 2 { + let bk = path("d2.de.1137"); + with link = "line.de.1137" { - track(:station, path("d2.de.1137")[:bra.yk, :kon]); + track(:station, bk[:bra.yk, :kon]); + } + + with link = "point.de.Lübeck-Konstinbahnhof" { + statdot(:open, bk[:kon]); } } @@ -359,65 +377,82 @@ with detail = 2 { let so = path("d2.de.1141"); with link = "line.de.1141" { - track(:second :removed, so[:swa.yo, :old.ys]); - - with layer = 1 line_badge(:removed, so[:swa + 7.0km], "1141"); - with layer = 1 line_badge(:removed, so[:tri + 12.5km], "1141"); + track(:second :removed, so[:swa.yo, :tri]); + line_label(:right:w :removed, so[:swa + 7.0km], "1141"); } with link = "point.de.Trittau" { - with layer = 1 marker(:statdot :removed, so[:tri]); - slabel(:right :removed, so[:tri] + (1.8dt, 0.5dt), "Trittau"); + track(:second :station :removed, so[:tri, :tri.yb]); + statdot(:removed, so[:tri]); + slabel(:right :removed, so[:tri] + (1.5dt, 0.5dt), "Trittau"); + } + + with link = "line.de.1141" { + track(:second :removed, so[:tri.yb, :old.ys]); + line_label(:right:w :removed, so[:tri + 10km], "1141"); } } -# DE 1150 +# DE 1150. Lüneburg - Büchen # with detail = 2 { let lb = path("d2.de.1150"); with link = "line.de.1150" { - track(:first :pax, lb[:lun.yb, :buc]); - - with layer = 1 line_badge(:pax, lb[:ech - 6.0km], "1150"); - with layer = 1 line_badge(:pax, lb[:buc - 8.0km], "1150"); + track(:first :pax, lb[:lun.yb, :ech]); + line_label(:left:se :pax, lb[:ech - 5.0km], "1150"); } with link = "point.de.Echem" { - with layer = 1 marker(:statdot :pax, lb[:ech]); + statdot(:pax, lb[:ech]); slabel(:left :pax, lb[:ech - 1dt] << 1.2dt, "Echem"); } + + with link = "line.de.1150" { + track(:first :pax, lb[:ech, :buc]); + line_label(:left:e :pax, lb[:buc - 6.0km], "1150"); + } } # DE 1151. Wittenberge – Buchholz (Nordheide). -# with detail = 2 { let wb = path("d2.de.a.1151"); with link = "line.de.1151" { - with layer = -1 track(:first :removed, wb[:dog, :dan]); - track(:first :pax, wb[:dan, :lun.yw]); - with layer = -1 track(:second :removed, wb[:lun.yj, :jes.yl]); - - with layer = 1 line_badge(:pax, wb[:dah - 9.0km], "1151"); - with layer = 1 line_badge(:pax, wb[:dah + 10.0km], "1151"); - with layer = 1 line_badge(:removed, wb[:wul - 7.0km], "1151"); + track(:first :removed, wb[:dog, :dan]); + line_label(:right:s :removed, wb[:dog + 5.5km], "1151"); } with link = "point.de.Dannenberg-Ost" { - with layer = 1 marker(:statdot :pax, wb[:dan]); + track(:second :station :pax, wb[:dan, :dan.yl]); + statdot(:pax, wb[:dan]); label(:pax, wb[:dan + 1.5dt] << 1.5dt, hbox(:left:top :small, "Dannenberg") ); } + with link = "line.de.1151" { + track(:first :pax, wb[:dan.yl, :dah]); + line_label(:right:s :pax, wb[:dah - 12.5km], "1151"); + } + with link = "point.de.Dahlenburg" { - with layer = 1 marker(:statdot :pax, wb[:dah]); + statdot(:pax, wb[:dah]); label(:pax, wb[:dah - 2dt] << 0.8dt, hbox(:right:top :small, "Dahlenburg") ); } + + with link = "line.de.1151" { + track(:first :pax, wb[:dah, :lun.yw]); + line_label(:right:s :pax, wb[:dah + 10.0km], "1151"); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:lun.yj, :jes.yl]); + line_label(:left:n :removed, wb[:wul - 7.0km], "1151"); + } } diff --git a/rules/de/a/d2/12.map b/rules/de/a/d2/12.map index 1737a41a..92a307dd 100644 --- a/rules/de/a/d2/12.map +++ b/rules/de/a/d2/12.map @@ -7,12 +7,12 @@ with detail = 2 { track(:first:double :pax, nw[:kla, :mor]); track(:first :pax, nw[:mor, :wes]); - with layer = 1 line_badge(:pax, nw[:kla + 9.0km], "1200*"); + line_badge(:pax, nw[:kla + 9.0km], "1200"); } with link = "point.de.Westerland-Sylt" { - with layer = 1 marker(:statdot :pax, nw[:wes]); - label(:pax, nw[:wes] + (-3.0dt, -0.2dt), + statdot(:pax, nw[:wes]); + label(:pax, nw[:wes] + (-0.75km, 0dt) + (-1.5dt, -0.2dt), hbox(:right:middle :small, span(:bold, "Westerland "), "(Sylt)" ) @@ -28,7 +28,7 @@ with detail = 2 { with link = "line.de.1201" { track(:second :pax, ns[:nie.yt, :sug]); - with layer = 1 line_badge(:pax, ns[:sud - 6.0km], "1201"); + line_label(:left:se :pax, ns[:sud - 4.0km], "1201"); } with link = "point.de.Süderlügum" { @@ -51,11 +51,11 @@ with detail = 2 { with link = "line.de.1204" { track(:second :pax, ht[:hor, :ton]); - with layer = 1 line_badge(:pax, ht[:ton - 7.5km], "1204"); + line_badge(:pax, ht[:ton - 7.5km], "1204"); } with link = "point.de.Tönning" { - with layer = 1 marker(:statdot :pax, ht[:ton]); + statdot(:pax, ht[:ton]); label(:pax, ht[:ton] + (-1.5dt, 0dt), hbox(:right:top :small, "Tönning") ); @@ -69,8 +69,7 @@ with detail = 2 { with link = "line.de.1205" { track(:second :pax, tp[:ton, :peo]); - - with layer = 1 line_badge(:pax, tp[:peo - 13.5km], "1205"); + line_label(:right:s :pax, tp[:peo - 11km], "1205"); } with link = "point.de.Bad-St-Peter-Ording" { diff --git a/rules/de/a/d2/61.map b/rules/de/a/d2/61.map index 50cf6ef2..bbf58098 100644 --- a/rules/de/a/d2/61.map +++ b/rules/de/a/d2/61.map @@ -3,25 +3,33 @@ with detail = 2 { let ba = path("d2.de.a.6100"); with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:gsah, :rot.yf]); - track(:first :cat:ac15 :pax, ba[:rot.yf, :anc]); - track(:first :double :cat:ac15 :pax, ba[:anc, :alt.yh]); - - with layer = 1 line_badge(:cat:ac15 :pax, ba[:swa + 7.0km], "6100"); + track(:first :double :cat:ac15 :pax, ba[:gsah, :buc]); } with link = "point.de.Büchen" { - with layer = 1 marker(:statdot :cat:ac15 :pax, ba[:buc]); - slabel(:right :cat:ac15 :pax, ba[:buc] + (1.5dt, -0.5dt), "Büchen"); + marker(:statdot :cat:ac15 :pax, ba[:buc]); + slabel(:right :cat:ac15 :pax, ba[:buc] + (1.5dt, -0.3dt), "Büchen"); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:buc, :swa]); + line_label(:right:s :cat:ac15 :pax, ba[:swa - 3.5km], "6100"); } with link = "point.de.Schwarzenbek" { - with layer = 1 marker(:statdot :cat:ac15 :pax, ba[:swa]); - label(:cat:ac15 :pax, ba[:swa - 4dt] << 1.5dt, - hbox(:right:top :small, "Schwarzenbek") + track(:first :double :cat:ac15 :pax, ba[:swa, :swa.yo]); + marker(:statdot :cat:ac15 :pax, ba[:swa]); + slabel(:left :cat:ac15 :pax, ba[:swa] + (0dt, 0.3km) + (3dt, 0.5dt), + hbox(:right:top, "Schwarzenbek") ); } + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:swa.yo, :rot.yf]); + track(:first :cat:ac15 :pax, ba[:rot.yf, :anc]); + track(:first :double :cat:ac15 :pax, ba[:anc, :alt.yh]); + } + with link = "point.de.Hamburg-Bergedorf" { with layer = 1 marker(:statdot :cat:ac15 :pax, ba[:ber]); } diff --git a/rules/de/a/d2/69.map b/rules/de/a/d2/69.map index 5125c27c..8f12c1cb 100644 --- a/rules/de/a/d2/69.map +++ b/rules/de/a/d2/69.map @@ -32,22 +32,23 @@ with detail = 2 { let ho = path("d2.de.a.6928"); with link = "line.de.6928" { - track(:second :removed, ho[:zar, :rat.yh]); - track(:second :removed, ho[:rat.yo, :old.yr]); - - guide(:linenum :removed, - ho[:rat.yh - 7km] >> 0.7dt - -- ho[:rat.yh - 7km] >> 3.0dt - ); - label(:linenum :removed, ho[:rat.yh - 7km] >> 3.0dt + (0dt, -0.2dt), - hbox(:left:middle :badgesize, " 6928") - ); - line_badge(:removed, ho[:rat.yo + 11.5km] @ 2.5 >> 0.1dt, "6928"); + track(:second :removed, ho[:zar, :hol]); } with link = "point.de.Hollenbek" { - with layer = 1 marker(:statdot :removed, ho[:hol]); + track(:second :station :removed, ho[:hol, :hol.ym]); + statdot(:removed, ho[:hol]); slabel(:right :removed, ho[:hol] + (1.8dt, 0.3dt), "Hollenbek"); } + + with link = "line.de.6928" { + track(:second :removed, ho[:hol.ym, :rat.yh]); + line_label(:right:sw :removed, ho[:hol + 3.5km], "6928"); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:rat.yo, :old.yr]); + line_label(:right:s :removed, ho[:rat.yo + 11.5km], "6928"); + } } diff --git a/rules/de/a/d3/10/1000.map b/rules/de/a/d3/10/1000.map index 9727efa7..4aadb24e 100644 --- a/rules/de/a/d3/10/1000.map +++ b/rules/de/a/d3/10/1000.map @@ -1,79 +1,62 @@ -# DE 1000. Flensburg Weiche - Harrislee Grenze +# DE 1000. Flensburg Weiche - Flensburg Grenze # -let flwhag = path("d4.de.1000"); +let fp = path("d3.de.1000"); with detail = 3 { # point.de.Flensburg-Weiche de.1040 with link = "line.de.1000" { - with layer = 3 track(:first:station :double :cat:ac15, - flwhag[:flw.g, :ffle] - ); - with layer = 4 track(:first:station :cat:ac15, - flwhag[:ffle, :fri - 0.5ssw] << 0.5dt - ); - with layer = 4 track(:first:station :cat:ac15 :pax, - flwhag[:ffle, :fri - 0.5ssw] >> 0.5dt + track(:first :double:rightother :cat:ac15 :pax, + fp[:fri.yf, :fri - 0.5sw] ); } with link = "point.de.Flensburg-Friedensweg" { - with layer = -1 track(:first:station :cat:ac15, - flwhag[:fri - 0.5ssw, :fri] << 0.5dt + # DE 1000 + track(:first :double:station :cat:ac15 :pax, + fp[:fri - 0.5sw, :fri + 0.5sw] ); - with layer = -1 track(:first:station :cat:ac15 :pax, - flwhag[:fri - 0.5ssw, :fri] >> 0.5dt + + # DE 1005 + track(:first :station :cat:ac15 :pax, + fp[:fri - 0.5sw, :fri] >> 1.5dt + -- fp[:fri + 2dl, :fri + 2.1dl] << 0.5dt ); - track(:first:station :double :cat:ac15 :pax, - flwhag[:fri, :fri + 0.5ssw] + + marker(:right :de.abzw :cat:ac15, fp[:fri] >> 1.5dt); + slabel(:right :cat:ac15 :light, fp[:fri + 1sw] >> 2.0dt, + vbox(:left:bottom, "Friedens-", "weg") ); - marker(:de.abzw :cat:ac15, flwhag[:fri] >> 0.5dt); } with link = "line.de.1000" { - track(:first :double :cat:ac15 :pax, - flwhag[:fri + 0.5ssw, :har - 1ssw] - ); - - guide(:linenum :cat:ac15 :pax, - flwhag[:fri + 1.5km] >> 1.2dt - -- flwhag[:fri + 1.5km] >> 3.5dt - ); - label(:linenum :cat:ac15 :pax, flwhag[:fri + 1.5km] >> 4.0dt, - hbox(:left:middle, "1000") - ); + track(:first :double :cat:ac15 :pax, fp[:fri + 0.5sw, :har - 1sw]); + line_label(:left:e :cat:ac15 :pax, fp[:fri + 1.3km] << 0.5dt, "1000"); } with link = "point.de.Harrislee" { - track(:first:station :double :cat:ac15 :pax, - flwhag[:har - 1ssw, :har + 1ssw] + track(:first :double:station :cat:ac15 :pax, + fp[:har - 1sw, :har + 1sw] + ); + marker(:right :de.bf :removed, fp[:har] >> 0.5dt); + slabel(:right :removed, fp[:har - 0.6sw] >> 0.5dt >> 1.5sh, + "Harrislee" ); - with layer = -1 marker(:de.bf :removed, flwhag[:har] >> .5dt); - slabel(:left :removed, flwhag[:har - 0.3sw] << 1.8dt, "Harrislee"); } with link = "line.de.1000" { - track(:first :double :cat:ac15 :pax, - flwhag[:har + 1ssw, :hag - 0.5ssw] - ); + track(:first :double :cat:ac15 :pax, fp[:har + 1sw, :hag - 0.5sw]); } with link = "point.int.Harrislee-Padborg" { - track(:first:station :double :cat:ac15 :pax, - flwhag[:hag - 0.5sw, :hag + 0.5sw] + track(:first :double:station :cat:ac15 :pax, + fp[:hag - 0.5sw, :hag + 0.5sw] ); - marker(:de.dirgr :cat:ac15, flwhag[:hag] >> 0.5dt); - marker(:statdt :cat:ac15, flwhag[:hag] << 0.5dt); - marker(:de.dirgr :cat:ac15 :left, flwhag[:hag] << 0.5dt); - label(:cat:ac15 :pax :badgesize, - flwhag[:hag] << 5dt, - hbox( - :right :middle, - vbox(:center :middle, - " DK FP ", - hbar(0.3), - " DE 1000 " - ) + marker(:left :de.dirgr :cat:ac15 :pax, fp[:hag] << 0.5dt); + marker(:right :de.dirgr :cat:ac15 :pax, fp[:hag] >> 0.5dt); + slabel(:left :cat:ac15 :roman:italic :pax, fp[:hag] << 0.5dt << 1.2sh, + hbox(:right:middle, + vbox(:center:middle, " DK ", hrule(), " DE SH ") ) ); } diff --git a/rules/de/a/d3/10/1001.map b/rules/de/a/d3/10/1001.map index 8dbc3996..2209ef07 100644 --- a/rules/de/a/d3/10/1001.map +++ b/rules/de/a/d3/10/1001.map @@ -1,89 +1,93 @@ # DE 1001. Flensburg Weiche - Lindholm # -let flwlin = path("d4.de.1001"); +let fl = path("d3.de.1001"); with detail = 3 { # point.de.Flensburg-Weiche de.1040 with link = "line.de.1001" { - with layer = -1 track(:second :removed, flwlin[:flw.c, :han - 1sw]); + track(:second :removed, + fl[:flw.x - 0.1dl, :flw.x] >> 2.5dt + .. fl[:flw.al, :han - 1sw] + ); + line_label(:left:ne :removed, fl[:flw.al + 1.5km], "1001"); } with link = "point.de.Handewitt" { - track(:second :removed :station, flwlin[:han - 1sw, :han + 1sw]); - marker(:de.hst :removed :left, flwlin[:han]); - slabel(:bottom :removed, flwlin[:han] << 1.1sh, "Handewitt"); + track(:second :station :removed, fl[:han - 1sw, :han + 1sw]); + marker(:left :de.hst :removed, fl[:han]); + slabel(:bottom :removed, fl[:han] << 1.3sw + (-1sw, 0dt), "Handewitt"); } with link = "line.de.1001" { - track(:second :removed, flwlin[:han + 1sw, :una - 1sw]); + track(:second :removed, fl[:han + 1sw, :una - 1sw]); } with link = "point.de.Unaften" { - track(:second :removed :station, flwlin[:una - 1sw, :una + 1sw]); - marker(:de.hp :removed :right, flwlin[:una]); - slabel(:top :removed, flwlin[:una] >> 1.2sh, "Unaften"); + track(:second :station :removed, fl[:una - 1sw, :una + 1sw]); + marker(:right :de.hp :removed, fl[:una]); + slabel(:top :removed, fl[:una] >> 1.3sw + (0.2sw, 0dt), "Unaften"); } with link = "line.de.1001" { - track(:second :removed, flwlin[:una + 1sw, :wal - 1sw]); + track(:second :removed, fl[:una + 1sw, :wal - 1sw]); } with link = "point.de.Wallsbüll" { - track(:second :removed :station, flwlin[:wal - 1sw, :wal + 1sw]); - marker(:de.bf :removed :left, flwlin[:wal]); - slabel(:bottom :removed, flwlin[:wal] << 1.3ssw + (5pt, 0pt), - "Wallsbüll" - ); + track(:second :station :removed, fl[:wal - 1sw, :wal + 1sw]); + marker(:left :de.bf :removed, fl[:wal]); + slabel(:bottom :removed, fl[:wal] << 1.6sw + (1sw, 0dt), "Wallsbüll"); } with link = "line.de.1001" { - track(:second :removed, flwlin[:wal + 1sw, :saf - 1sw]); + track(:second :removed, fl[:wal + 1sw, :saf - 1sw]); } with link = "point.de.Schafflund" { - track(:second :removed :station, flwlin[:saf - 1sw, :saf + 1sw]); - marker(:de.hst :removed :left, flwlin[:saf]); - slabel(:bottom :removed, flwlin[:saf] << 1.2sh, "Schafflund"); + track(:second :station :removed, fl[:saf - 1sw, :saf + 1sw]); + marker(:left :de.hst :removed, fl[:saf]); + slabel(:bottom :removed, fl[:saf] << 1.4sw, "Schafflund"); } with link = "line.de.1001" { - track(:second :removed :flip, flwlin[:saf + 3.2km, :saf + 1sw]); - line_badge(:removed, flwlin[:saf + 3.2km], "1001"); - track(:second :removed, flwlin[:saf + 3.2km, :spr - 1sw]); + track(:second :removed, fl[:saf + 1sw, :spr - 1sw]); + line_label(:left:n :removed, fl[:spr - 3km], "1001 "); } with link = "point.de.Sprakebüll" { - track(:second :removed :station, flwlin[:spr - 1sw, :spr + 1sw]); - marker(:de.hst :removed :right, flwlin[:spr]); - slabel(:top :removed, flwlin[:spr - 1sw] >> 1.3sh, "Sprakebüll"); + track(:second :station :removed, fl[:spr - 1sw, :spr + 1sw]); + marker(:right :de.hst :removed, fl[:spr]); + slabel(:top :removed, fl[:spr] >> 1.3sw + (0.2sw, 0dt), "Sprakebüll"); } with link = "line.de.1001" { - track(:second :removed, flwlin[:spr + 1sw, :ach - 1sw]); + track(:second :removed, fl[:spr + 1sw, :ach - 1sw]); } with link = "point.de.Achtrup" { - track(:second :removed :station, flwlin[:ach - 1sw, :ach + 1sw]); - marker(:de.hst :removed :left, flwlin[:ach]); - slabel(:bottom :removed, flwlin[:ach] << 1.2sh, "Achtrup"); + track(:second :station :removed, fl[:ach - 1sw, :ach + 1sw]); + marker(:left :de.bf :removed, fl[:ach]); + slabel(:bottom :removed, fl[:ach] << 1.4sw, "Achtrup"); } with link = "line.de.1001" { - track(:second :removed, flwlin[:ach + 1sw, :lec - 1sw]); + track(:second :removed, fl[:ach + 1sw, :lec - 1sw]); } with link = "point.de.Leck" { - track(:second :removed :station, flwlin[:lec - 1sw, :lec + 1sw]); - marker(:de.bf :removed :left, flwlin[:lec]); - slabel(:bottom :removed, flwlin[:lec] << 1.2sh, "Leck"); + track(:second :station :removed, fl[:lec - 1sw, :lec + 1sw]); + marker(:left :de.bf :removed, fl[:lec]); + slabel(:bottom :removed, fl[:lec] << 1.4sw, "Leck"); } with link = "line.de.1001" { - with layer = -1 track(:second :removed, - flwlin[:lec + 1ssw, :lin.aa - 500m] - .. flwlin[:lin - 1ssw, :lin - 0.9ssw] >> 0.5dt + track(:second :removed, + fl[:lec + 1sw, :lin.af - 1dt] + .. fl[:lin.yf, :lin - 1sw] >> 1dt ); + line_label(:right:s :removed, fl[:lin.af - 3km], "1001 "); } + + # point.de.Lindholm de.1210 } diff --git a/rules/de/a/d3/10/1002.map b/rules/de/a/d3/10/1002.map index ce4fc40e..8710af4a 100644 --- a/rules/de/a/d3/10/1002.map +++ b/rules/de/a/d3/10/1002.map @@ -1,28 +1,35 @@ # DE 1002. Flensburg Weiche - Flensburg Hafen Ost -# DE 1003. Flensburg Alter Bf - Flensburg Hafen West +# DE 1003. Flensburg Alter Bf – Flensburg, westliches Hafengleis # -let flafhw = path("d4.de.1003"); -let flwfho = path("d4.de.1002"); -let nf = path("d4.de.1040"); +let fh = path("d3.de.1002"); with detail = 3 { # point.de.Flensburg-Weiche de.1040 with link = "line.de.1002" { - track(:second :removed :flip, - nf[:flw.f, :fle - 1.5ssw] << 1.5dt - .. flwfho[:fla - 1.1ssw, :fla - 1ssw] + track(:second :rightother :removed, fh[:flw.ff, :wil - 0.5sw] << 1.5dt); + } + + # point.de.Flensburg-Wilhelminental de.1040 + + with link = "line.de.1002" { + track(:second :rightother :removed, fh[:wil + 0.5sw, :wil.ya] << 1.5dt); + track(:second :removed, + fh[:wil.ya, :wil.ya + 0.1dl] << 1.5dt + .. fh[:wil.ya + 700m, :fla - 1sw] ); + line_label(:right:w :removed, fh[:fla - 0.4km], "1002"); } with link = "point.de.Flensburg-Alter-Bf" { - track(:second :station :removed, flwfho[:fla - 1ssw, :fla + .5ssw]); - track(:station :removed, flwfho[:fla + .5ssw, :f]); - track(:station :removed, - flwfho[:fla + .5ssw, :fla + .6ssw] - .. flafhw[:afhw + 0.7km, :f] - ) - marker(:right :de.bf :removed, flwfho[:fla.bf - 0.5dt]); + track(:second :removed, fh[:fla - 1sw, :fla + 0.5sw]); + track(:station :removed, fh[:fla + 0.5sw, :f]); + track(:station :removed, path("d3.de.1003")[:fla, :f]); + + marker(:left :de.gbf :removed, fh[:fla]); + slabel(:left :removed, fh[:fla] + (-1.6sw, 0.5sw), + "F. Alter Bf" + ); } } diff --git a/rules/de/a/d3/10/1005.map b/rules/de/a/d3/10/1005.map index 5563d345..c12c58b6 100644 --- a/rules/de/a/d3/10/1005.map +++ b/rules/de/a/d3/10/1005.map @@ -1,21 +1,37 @@ -# DE 1005. Flensburg (ausschl) - Flensburg Friedensweg (ausschl) +# DE 1005. Flensburg - Flensburg Friedenswerg # -let flefri = path("d4.de.1005"); +let ff = path("d3.de.1005"); with detail = 3 { # point.de.Flensburg de.1040 with link = "line.de.1005" { - with layer = 3 track(:first :cat:ac15 :pax :flip, - flefri[:fle + .5ssw, :fle.r] >> 0.5dt - .. flefri[:fle.f + 1dt, :fri.aa] + track(:first :leftother :cat:ac15 :pax, + ff[:fle + 1sw, :fle.yf] >> 0.5dt ); - with layer = 3 track(:first:station :cat:ac15 :pax, - flefri[:fri.aa - 0.1dl, :fri.aa] - .. flefri[:ffle - 0.1dl, :ffle] >> 0.5dt + track(:first :cat:ac15 :pax, + ff[:fle.yf - 0.1dl, :fle.yf] >> 0.5dt + .. ff[:fls - 0.55sw, :fls - 0.5sw] ); - with layer = 2 casing(:first :cat, - flefri[:fri.aa - 0.8km, :fri.aa + 0.4km] + } + + with link = "point.de.Flensburg-Süd" { + track(:first :station :cat:ac15 :pax, ff[:fls - 0.5sw, :fls + 0.5sw]); + marker(:right :de.awanst :cat:ac15, ff[:fls]); + slabel(:right :cat:ac15, ff[:fls] << 0.5dt, + hbox(:left:top :light, "F. Süd") + ); + } + + with link = "line.de.1005" { + with layer = 1 track(:first :cat:ac15 :pax :casing, + ff[:fls + 0.5sw, :fri.aa] + .. ff[:fri.yf, :fri.yf + 0.1dl] >> 1.5dt + ); + line_label(:left:n :cat:ac15 :pax, ff[:fls + 0.8km], "1005"); + + track(:first :leftother :cat:ac15 :pax, + ff[:fri.yf, :fri - 0.5sw] >> 1.5dt ); } diff --git a/rules/de/a/d3/10/1010.map b/rules/de/a/d3/10/1010.map index b2671c4f..c870cdef 100644 --- a/rules/de/a/d3/10/1010.map +++ b/rules/de/a/d3/10/1010.map @@ -1,30 +1,50 @@ # DE 1010. Schleswig - Schleswig Altstadt # -let slesla = path("d4.de.1010"); +let sa = path("d3.de.1010"); with detail = 3 { # point.de.Schleswig de.1040 - + with link = "line.de.1010" { - with layer = -1 track(:second:station :removed, - slesla[:asla - .1dl, :asla] >> 0.5dt - .. slesla[:asla + 500m, :sla - 1sw] + track(:second :removed, + sa[:sle.ya - 0.1dl, :sle.ya] >> 0.5dt + .. sa[:aa, :got - 0.5sw] ); + } - guide(:linenum :removed, - slesla[:asla + 1.0km] << 0.7dt - -- slesla[:asla + 1.0km] << 3.0dt - ); - label(:linenum :removed, slesla[:asla + 1.0km] << 3.0dt, - hbox(:right:middle, "1010 ") - ); + with link = "point.de.Gottorf" { + track(:second :station :removed, sa[:got - 0.5sw, :got + 0.5sw]); + marker(:right :de.hp :removed, sa[:got]); + } + + with link = "line.de.1010" { + track(:second :removed, sa[:got + 0.5sw, :slh - 0.5sw]); + line_label(:right:nw :removed, sa[:slh - 0.3sw], "1010"); + } + + with link = "point.de.Schleihalle" { + track(:second :station :removed, sa[:slh - 0.5sw, :slh + 0.5sw]); + marker(:left :de.hp :removed, sa[:slh]); + } + + with link = "line.de.1010" { + track(:second :removed, sa[:slh + 0.5sw, :dom - 0.5sw]); + } + + with link = "point.de.Domziegelhof" { + track(:second :station :removed, sa[:dom - 0.5sw, :dom + 0.5sw]); + marker(:left :de.hp :removed, sa[:dom]); + } + + with link = "line.de.1010" { + track(:second :removed, sa[:dom + 0.5sw, :sla.f - 1.2sw]); } with link = "point.de.Schleswig-Altstadt" { - track(:second:station :removed, slesla[:sla - 1sw, :sla.f]); - marker(:de.bf :removed :left, slesla[:sla]); - slabel(:left :removed, slesla[:sla + 0.3sw] << 1.4sh, - span(:small :bold :removed, "S. Altstadt") + track(:second :station :removed, sa[:sla.f - 1.2sw, :sla.f]); + marker(:left :de.gbf :removed, sa[:sla.f - 0.7sw]); + slabel(:right :removed, sa[:sla.f - 0.9sw] >> 0.4dt, + hbox(:left:top :bold, "S.-Altstadt") ); } } diff --git a/rules/de/a/d3/10/1011.map b/rules/de/a/d3/10/1011.map index 6f14045b..b9079055 100644 --- a/rules/de/a/d3/10/1011.map +++ b/rules/de/a/d3/10/1011.map @@ -1,93 +1,89 @@ # DE 1011. Jübeck - Husum # -let jubhus = path("d4.de.1011"); +let jh = path("d3.de.1011"); with detail = 3 { # point.de.Jübek de.1040 with link = "line.de.1011" { - track(:second :pax :flip, jubhus[:sol - 2km, :jub.g + 1dt]); - line_badge(:pax, jubhus[:sol - 2km], "1011"); - track(:second :pax, jubhus[:sol - 2km, :sol - 1ssw]); + track(:second :pax, + jh[:jub.yh - 0.1dl, :jub.yh] << 0.5dt + .. jh[:jub.fh, :sol - 1sw] + ); + line_label(:right:s :pax, jh[:jub.fh + 1.5km], "1011 "); } with link = "point.de.Sollbrück" { - track(:second :station :pax, jubhus[:sol - 1ssw, :sol + 1ssw]); - marker(:de.awanst :removed :right, jubhus[:sol]); - slabel(:top :removed, jubhus[:sol] >> 1.2sh - (2ssw, 0dt), - "Sollbrück" + track(:second :station :pax, jh[:sol - 1sw, :sol + 1sw]); + marker(:right :de.hst :removed, jh[:sol]); + slabel(:right :removed, jh[:sol + 0.5sw] << 0.3dt, + hbox(:left:top, "Sollbrück") ); } with link = "line.de.1011" { - track(:second :pax, jubhus[:sol + 1ssw, :ahr - 1ssw]); + track(:second :pax, jh[:sol + 1sw, :sog]); + track(:second :pax, jh[:sog, :ahr - 1sw]); } with link = "point.de.Ahrenviöl" { - track(:second :station :pax, jubhus[:ahr - 1ssw, :ahr + 1ssw]); - marker(:de.hst :removed :left, jubhus[:ahr]); - slabel(:bottom :removed, - jubhus[:ahr] << 1.4sh + (2.0ssw, 0dt), - "Ahrenviöl" - ); + track(:second :station :pax, jh[:ahr - 1sw, :ahr + 1sw]); + marker(:left :de.hst :removed, jh[:ahr]); + slabel(:right :removed, jh[:ahr + 0.4sw] << 2.3sw, "Ahrenviöl"); } with link = "line.de.1011" { - track(:second :pax, jubhus[:ahr + 1ssw, :ohr - 1ssw]); + track(:second :pax, jh[:ahr + 1sw, :ohr - 1sw]); + line_label(:right:se :pax, jh[:ahr + 2km], "1011"); } with link = "point.de.Ohrstedt" { - track(:second :station :pax, jubhus[:ohr - 1ssw, :ohr + 1ssw]); - marker(:de.awanst :right, jubhus[:ohr]); - slabel(:bottom, jubhus[:ohr] + (2sh, 0.8dt), "Ohrstedt"); + track(:second :station :pax, jh[:ohr - 1sw, :ohr + 1sw]); + marker(:right :de.awanst, jh[:ohr]); + marker(:right :de.exbf, jh[:ohr]); + slabel(:top, jh[:ohr] >> 1.8sw + (-1sw, 0dt), "Ohrstedt"); } with link = "line.de.1011" { - track(:second :pax, jubhus[:ohr + 1ssw, :wes - 1ssw]); + track(:second :pax, jh[:ohr + 1sw, :wes - 1sw]); } with link = "point.de.Wester-Ohrstedt" { - track(:second :station :pax, jubhus[:wes - 1ssw, :wes + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, jubhus[:wes]); - slabel(:left :removed, - jubhus[:wes] >> 1.5sh + (1.5ssw, 0dt), + track(:second :station :pax, jh[:wes - 1sw, :wes + 1sw]); + marker(:right :de.hp :removed, jh[:wes]); + slabel(:left :removed, jh[:wes - 1sw] >> 1.4sw, "Wester-Ohrstedt" ); } with link = "line.de.1011" { - track(:second :pax, jubhus[:wes + 1ssw, :swe - 1ssw]); - - guide(:linenum :pax, - jubhus[:wes + 1.2km] << 0.7dt - -- jubhus[:wes + 1.2km] << 3.0dt - ); - label(:linenum :pax, jubhus[:wes + 1.2km] << 3dt, - hbox(:left:top, "1011") - ); + track(:second :pax, jh[:wes + 1sw, :swe - 1sw]); } with link = "point.de.Schwesing" { - track(:second :station :pax, jubhus[:swe - 1ssw, :swe + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, jubhus[:swe]); - label(jubhus[:swe] << 0.2dt, - hbox(:left :top, span(:small :removed, "Schwesing")) + track(:second :station :pax, jh[:swe - 1sw, :swe + 1sw]); + marker(:right :de.bf :removed, jh[:swe]); + slabel(:right :removed, jh[:swe + 0.2sw] << 0.3dt, + hbox(:left:top, "Schwesing") ); } with link = "line.de.1011" { - track(:second :pax, jubhus[:swe + 1ssw, :ros - 1ssw]); + track(:second :pax, jh[:swe + 1sw, :ros - 1sw]); + line_label(:left:n :pax, jh[:ros - 1km], "1011"); } with link = "point.de.Rosendahl" { - track(:second :station :pax, jubhus[:ros - 1ssw, :ros + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, jubhus[:ros]); + track(:second :station :pax, jh[:ros - 1sw, :ros + 1sw]); + marker(:right :de.hp :removed, jh[:ros]); + slabel(:right :removed, jh[:ros] + (-1.2sw, -1.6sw), "Rosendahl"); } with link = "line.de.1011" { - track(:second :pax, jubhus[:ros + 1ssw, :hus.a]); + track(:second :pax, + jh[:ros + 1sw, :hus.aa] + .. path("d3.de.1210")[:hus - 1.01sw, :hus - 1sw] >> 1.5dt + ); } - - # point.de.Husum de.1210 } diff --git a/rules/de/a/d3/10/1012.map b/rules/de/a/d3/10/1012.map index 46e32ade..12070a3c 100644 --- a/rules/de/a/d3/10/1012.map +++ b/rules/de/a/d3/10/1012.map @@ -1,125 +1,129 @@ # DE 1012. Büdelsdorf - Husum # -let budhus = path("d4.de.1012"); +let bh = path("d3.de.1012"); with detail = 3 { # point.de.Büdelsdorf de.1040 with link = "line.de.1012" { - track(:second:station, budhus[:bud.gg + 1dt, :gen - 1ssw]); + track(:station, + bh[:bud + 2dl, :bud + 2.1dl] << 1.5dt + .. bh[:bud.ffh, :gen - 0.5sw] + ); } with link = "point.de.Rendsburg-Gewerbegebiet-Nord" { - with layer = -2 track(:second:station, - budhus[:gen - 1ssw, :gen] + track(:station, bh[:gen - 0.5sw, :gen]); + track(:second :station :removed, bh[:gen, :gen + 0.5sw]); + marker(:right :de.anst, bh[:gen]); + slabel(:left :light, bh[:gen - 1.3sw] >> 1sw, + hbox(:right:bottom, + vbox(:right:bottom, "R. Gewerbe", "gebiet Nord"), + vbox(:left:bottom, "-", "") + ) ); - marker(:de.anst :right, budhus[:gen]); } with link = "line.de.1012" { - with layer = -4 track(:second :removed, budhus[:gen, :foc - 1ssw]); + track(:second :removed, bh[:gen + 0.5sw, :foc - 1sw]); } with link = "point.de.Fockbek" { - track(:second:station :removed, budhus[:foc - 1ssw, :foc + 1ssw]); - marker(:de.anst :closed :left, budhus[:foc]); - #slabel(:bottom :closed, budhus[:foc] << 1.2ssw, "Fockbek"); + track(:second :station :removed, bh[:foc - 1sw, :foc + 1sw]); + marker(:left :de.bf :removed, bh[:foc]); + slabel(:bottom :removed, bh[:foc] << 1.4sw, "Fockbek"); } with link = "line.de.1012" { - track(:second :removed, budhus[:foc + 1ssw, :gar - 1ssw]); + track(:second :removed, bh[:foc + 1sw, :gar - 1sw]); + line_label(:left:n :removed, bh[:gar - 1.5km], "1012"); } with link = "point.de.Garlbek" { - track(:second:station :removed, budhus[:gar - 1ssw, :gar + 1ssw]); - marker(:de.hp :removed :right, budhus[:gar]); - slabel(:top :removed, budhus[:gar] >> 1.2sh, "Garlbek"); + track(:second :station :removed, bh[:gar - 1sw, :gar + 1sw]); + marker(:right :de.hp :removed, bh[:gar]); + slabel(:top :removed, bh[:gar] >> 1.2sw, "Garlbek"); } with link = "line.de.1012" { - track(:second :removed, budhus[:gar + 1ssw, :hoh - 1ssw]); + track(:second :removed, bh[:gar + 1sw, :hoh - 1sw]); } with link = "point.de.Hohn" { - track(:second:station :removed, budhus[:hoh - 1ssw, :hoh + 1ssw]); - marker(:de.bf :removed :left, budhus[:hoh]); - slabel(:bottom :removed, budhus[:hoh] << 1.1sh, "Hohn"); + track(:second :station :removed, bh[:hoh - 1sw, :hoh + 1sw]); + marker(:left :de.bf :removed, bh[:hoh]); + slabel(:bottom :removed, bh[:hoh] << 1.4sw, "Hohn"); } with link = "line.de.1012" { - track(:second :removed :flip, budhus[:hoh + 3.3km, :hoh + 1ssw]); - line_badge(:removed, budhus[:hoh + 3.3km], "1012"); - track(:second :removed, budhus[:hoh + 3.3km, :chr - 1ssw]); + track(:second :removed, bh[:hoh + 1sw, :chr - 1sw]); } with link = "point.de.Christiansholm" { - track(:second:station :removed, budhus[:chr - 1ssw, :chr + 1ssw]); - marker(:de.bf :removed :left, budhus[:chr]); - slabel(:top :removed, budhus[:chr] >> 0.8dt, "Christiansholm"); + track(:second :station :removed, bh[:chr - 1sw, :chr + 1sw]); + marker(:left :de.bf :removed, bh[:chr]); + slabel(:right :removed, bh[:chr + -0.3sw] >> 0.8dt, "Christiansholm"); } with link = "line.de.1012" { - track(:second :removed, budhus[:chr + 1ssw, :erf - 1ssw]); + track(:second :removed, bh[:chr + 1sw, :erf - 1sw]); } with link = "point.de.Erfde" { - track(:second:station :removed, budhus[:erf - 1ssw, :erf + 1ssw]); - marker(:de.bf :removed :left, budhus[:erf]); - slabel(:bottom :removed, budhus[:erf] << 1.1sh, "Erfde"); + track(:second :station :removed, bh[:erf - 1sw, :erf + 1sw]); + marker(:left :de.bf :removed, bh[:erf]); + slabel(:bottom :removed, bh[:erf] << 1.4sw, "Erfde"); } with link = "line.de.1012" { - track(:second :removed, budhus[:erf + 1ssw, :nor - 1ssw]); + track(:second :removed, bh[:erf + 1sw, :nor - 1sw]); + line_label(:right:sw :removed, bh[:erf + 4km], "1012"); } with link = "point.de.Norderstapel" { - track(:second :station :removed, budhus[:nor - 1ssw, :nor + 1.5ssw]); - marker(:de.anst :closed :right, budhus[:nor + 0.5ssw]); - slabel(:right :removed, budhus[:nor - 3.0ssw] >> 1dt + (1ssw, 0ssw), - span(:bold, "Norderstapel") - ); + track(:second :station :removed, bh[:nor - 1sw, :nor + 1sw]); + marker(:right :de.hp :removed, bh[:nor]); + slabel(:right :removed, bh[:nor - 0.6sw] >> 1.4sw, "Norderstapel"); } with link = "line.de.1012" { - track(:second :removed, budhus[:nor + 1.5ssw, :swa - 1ssw]); + track(:second :removed, bh[:nor + 1sw, :swa - 1sw]); } with link = "point.de.Schwabstedt" { - track(:second:station :removed, budhus[:swa - 1ssw, :swa + 1ssw]); - marker(:de.anst :closed :left, budhus[:swa]); - slabel(:left :removed, budhus[:swa] << 2sh, "Schwabstedt"); + track(:second :station :removed, bh[:swa - 1sw, :swa + 1sw]); + marker(:left :de.hst :removed, bh[:swa]); + slabel(:right :removed, bh[:swa - 0.5sw] >> 0.8dt, "Schwabstedt"); } with link = "line.de.1012" { - track(:second :removed :flip, budhus[:ran - 2.4km, :swa + 1ssw]); - line_badge(:removed, budhus[:ran - 2.4km], "1012"); - track(:second :removed, budhus[:ran - 2.4km, :ran - 1ssw]); + track(:second :removed, bh[:swa + 1sw, :ran - 1sw]); } - with link = "point.de.Rantrum" { - track(:second:station :removed, budhus[:ran - 1ssw, :ran + 1ssw]); - marker(:de.anst :closed :left, budhus[:ran]); - slabel(:right :removed, budhus[:ran - 0.7sh] >> 1dt, "Rantrum"); + track(:second :station :removed, bh[:ran - 1sw, :ran + 1sw]); + marker(:left :de.bf :removed, bh[:ran]); + slabel(:right :removed, bh[:ran - 0.6sw] >> 0.8dt, "Rantrum"); } with link = "line.de.1012" { - track(:second :removed, budhus[:ran + 1ssw, :mil - 1ssw]); + track(:second :removed, bh[:ran + 1sw, :mil - 1sw]); + line_label(:right:s :removed, bh[:mil - 1.5km], " 1012"); } with link = "point.de.Mildstedt" { - track(:second:station :removed, budhus[:mil - 1ssw, :mil + 1ssw]); - marker(:de.hst :removed :left, budhus[:mil]); - slabel(:right :removed, budhus[:mil - .7sw] >> 0.8dt, "Mildstedt"); + track(:second :station :removed, bh[:mil - 1sw, :mil + 1sw]); + marker(:left :de.hst :removed, bh[:mil]); + slabel(:left :removed, bh[:mil] + (1.2sw, 1.2sw), + hbox(:right:top, "Mildstedt") + ); } with link = "line.de.1012" { track(:second :removed, - budhus[:mil + 1ssw, :hus.b] - .. budhus[:hus - 1.1ssw, :hus - 1ssw] >> 0.5dt + bh[:mil + 1sw, :hus.ab - 0.5km] + .. bh[:hus.ab, :hus.hs] >> 0.5dt ); } - - # point.de.Husum de.1210 } diff --git a/rules/de/a/d3/10/1020.map b/rules/de/a/d3/10/1020.map index cb149811..4cf1cf6d 100644 --- a/rules/de/a/d3/10/1020.map +++ b/rules/de/a/d3/10/1020.map @@ -1,231 +1,239 @@ -# DE 1020. Kiel-Hassee - Flensburg +# DE 1020. Kiel-Hassee Cittipark - Flensburg # -let hasfle = path("d4.de.1020"); +let kf = path("d3.de.1020"); with detail = 3 { # point.de.Kiel-Hassee de.1022 with link = "line.de.1020" { - track(:second :pax, - hasfle[:has + 1ssw, :has + 1.1ssw] >> 0.5dt - .. hasfle[:has.ff, :kro - 1ssw] - ); + track(:second :pax, kf[:has + 1sw, :kro - 1sw]); + line_label(:left:e :pax, kf[:has.hn + 1.3km], "1020"); } with link = "point.de.Kronshagen" { - track(:second:station :pax, hasfle[:kro - 1ssw, :kro + 1ssw]); - marker(:de.hp :pax :left, hasfle[:kro]); - slabel(:left :pax, hasfle[:kro - 0.1ssw] << 1.8ssw, "Kronshagen"); + track(:second :station :pax, kf[:kro - 1sw, :kro + 1sw]); + marker(:right :de.hp :pax, kf[:kro]); + marker(:right :de.exbf :pax, kf[:kro]); + slabel(:left :pax, kf[:kro - 0.4sw] << 2dt, "Kronshagen"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:kro + 1ssw, :suc - 1ssw]); + track(:second :pax, kf[:kro + 1sw, :suc - 1sw]); } with link = "point.de.Suchsdorf" { - track(:second :station :pax, hasfle[:suc - 1ssw, :suc + 1ssw]); - marker(:de.bf :pax :left, hasfle[:suc]); - slabel(:left :pax, hasfle[:suc - 1sw] << 1.4sh, - span(:small :bold, "Suchsdorf") + # DE 1020 + track(:second :station :pax, kf[:suc - 1sw, :suc.yw]); + + # DE 9105 + track(:second :station, + kf[:suc - 0.5sw - 1.1dl, :suc - 0.5sw - 1dl] + -- kf[:suc - 0.5sw, :suc.yw] >> 1dt + ); + + marker(:left :de.bf :pax, kf[:suc]); + slabel(:left :pax :bold, kf[:suc - 0.7sw] << 1.7sw, + "Suchsdorf" ); } with link = "line.de.1020" { - track(:second :pax, hasfle[:suc + 1ssw, :lev - 1ssw]); + track(:second :pax, kf[:suc.yw, :lev - 1sw]); } with link = "point.de.Levensau" { - track(:second:station :pax, hasfle[:lev - 1ssw, :lev + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, hasfle[:lev]); - slabel(:left :removed, hasfle[:lev - 0.3sh] + (0dt, 0.55sh), - hbox(:right:top, "Levensau") - ); + track(:second :station :pax, kf[:lev - 1sw, :lev + 1sw]); + marker(:left :de.hp :removed, kf[:lev]); + slabel(:left :removed, kf[:lev - 0.2sw] << 2.1sh, "Levensau"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:lev + 1ssw, :nwi - 1ssw]); + track(:second :pax, kf[:lev + 1sw, :nwi - 1sw]); } with link = "point.de.Neuwittenbek" { - track(:second:station :pax, hasfle[:nwi - 1ssw, :nwi + 1ssw]); - marker(:de.bbf :left, hasfle[:nwi]); - slabel(:left, hasfle[:nwi - 0.1sw] << 2sh, - span(:bold, "Neuwittenbek") + # DE 1020 + track(:second :station :pax, kf[:nwi - 1sw, :nwi + 1sw]); + + # DE 9104 + track(:second :station :pax, + kf[:nwi - 0.5sw - 1.1dl, :nwi - 0.5sw - 1dl] + -- kf[:nwi - 0.5sw, :nwi + 1sw] >> 1dt ); + + marker(:left :de.bf :pax, kf[:nwi]); + slabel(:left :pax :bold, kf[:nwi - 0.2sw] << 2.1sh, "Neuwittenbek"); } with link = "line.de.1020" { - track(:second :pax :flip, hasfle[:nwi + 2.8km, :nwi + 1ssw]); - line_badge(:pax, hasfle[:nwi + 2.8km], "1020"); - track(:second :pax, hasfle[:nwi + 2.8km, :get - 1ssw]); + track(:second :pax, kf[:nwi + 1sw, :get - 1sw]); + line_label(:left:ne :pax, kf[:nwi + 3km], "1020"); } with link = "point.de.Gettorf" { - track(:second:station :pax, hasfle[:get - 1ssw, :get + 1ssw]); - marker(:de.bf :pax :right, hasfle[:get]); - slabel(:right :pax, hasfle[:get - 0.5sw] >> 1.4sh, "Gettorf"); + track(:second :station :pax, kf[:get - 1sw, :get + 1sw]); + marker(:right :de.bf :pax, kf[:get]); + slabel(:right :pax, kf[:get - 0.6sw] >> 1.3sh, "Gettorf"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:get + 1ssw, :ndo - 1ssw]); + track(:second :pax, kf[:get + 1sw, :ndo - 1sw]); } with link = "point.de.Neudorf" { - track(:second:station :pax, hasfle[:ndo - 1ssw, :ndo + 1ssw]); - marker(:de.ldst :gone :left, hasfle[:ndo]); - slabel(:left :gone, hasfle[:ndo] << 2ssw, "Neudorf"); + track(:second :station :pax, kf[:ndo - 1sw, :ndo + 1sw]); + marker(:right :de.ldst :removed, kf[:ndo]); + slabel(:right :removed, kf[:ndo - 0.7sw] >> 1.0sh, "Neudorf"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:ndo + 1ssw, :aho - 1ssw]); + track(:second :pax, kf[:ndo + 1sw, :aho - 1sw]); } with link = "point.de.Altenhof-Schlesw" { - track(:second:station :pax, hasfle[:aho - 1ssw, :aho + 1ssw]); - marker(:de.hp :removed :right, hasfle[:aho]) - slabel(:right :removed, hasfle[:aho + 0.7sw] >> 1.2sh, - hbox(:left :base, - span(:small, "Altenhof "), - span(:small :light, "(Schlesw)") - ) + track(:second :station :pax, kf[:aho - 1sw, :aho + 1sw]); + marker(:right :de.hp :removed, kf[:aho]); + marker(:right :de.exbf :removed, kf[:aho]); + slabel(:right :removed, kf[:aho - 0.7sw] >> 1.7sh, + hbox(:left:base, "Altenhof ", span(:light, "(Schlesw)")) ); } with link = "line.de.1020" { - track(:second :pax, hasfle[:aho + 1ssw, :ecs - 1ssw]); + track(:second :pax, kf[:aho + 1sw, :ecs - 1sw]); + line_label(:left:ne :pax, kf[:ecs - 1.9km], "1020"); } with link = "point.de.Eckernförde" { - track(:second :station :pax, hasfle[:ecs - 1ssw, :ecs + 2ssw]); - marker(:de.bf :pax :right, hasfle[:ecs]); - slabel(:right :pax, hasfle[:ecs - 0.9sw] >> 1.3sh, - span(:bold, "Eckernförde") - ); + track(:second :station :pax, kf[:ecs - 1sw, :ecs + 1sw]); + marker(:right :de.bf :pax, kf[:ecs]); + slabel(:right :pax :bold, kf[:ecs - 1.2sw] >> 1.5sh, "Eckernförde"); } with link = "line.de.1020" { - track(:second :pax :flip, hasfle[:rie - 3.2km, :ecs + 2ssw]); - line_badge(:pax, hasfle[:rie - 3.2km] << 0.2dt, "1020"); - track(:second :pax, hasfle[:rie - 3.2km, :rie - 1ssw]); + track(:second :pax, kf[:ecs + 1sw, :rie - 1sw]); + line_label(:left:e :pax, kf[:ecs + 4km], "1020"); } with link = "point.de.Rieseby" { - track(:second:station :pax, hasfle[:rie - 1ssw, :rie + 1ssw]); - marker(:de.hp :pax :right, hasfle[:rie]); - slabel(:left :pax, hasfle[:rie - .5ssw] << 1dt, "Rieseby"); + track(:second :station :pax, kf[:rie - 1sw, :rie + 1sw]); + marker(:right :de.hp :pax, kf[:rie]); + marker(:right :de.exbf :pax, kf[:rie]); + slabel(:right :pax, kf[:rie - 0.6sw] >> 2.0sh, "Rieseby"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:rie + 1ssw, :lin - 3ssw]); + track(:second :pax, kf[:rie + 1sw, :sle - 130m - 0.5sw]); } with link = "point.de.Boren-Schleibrücke" { - track(:second:station :pax, hasfle[:lin - 3ssw, :lin - 1ssw]); - marker(:de.bk :left, hasfle[:lin - 2ssw]); - slabel(:right, hasfle[:lin - 2.5ssw] >> 1dt, - hbox(:left :base, - span(:small :light, "Boren "), - span(:small, "Schleibrücke") - ) - ); + track(:second :station :pax, kf[:sle - 130m - 0.5sw, :sle + 0.5sw]); + marker(:left :de.bk :pax, kf[:sle]); + slabel(:left :pax :light, kf[:sle - 0.3sw] << 1.8sh, "Schleibrücke"); } with link = "point.de.Lindaunis" { - track(:second:station :pax, hasfle[:lin - 1ssw, :lin + 1ssw]); - marker(:de.hp :museum, hasfle[:lin]); - slabel(:right :museum, hasfle[:lin - 0.6sw] >> 1.5sh, "Lindaunis"); + track(:second :station :pax, kf[:sle + 0.5sw, :lin + 1sw]); + marker(:right :de.hp :pax, kf[:lin]); + marker(:right :de.exbf :pax, kf[:lin]); + slabel(:right :pax, kf[:lin - 0.5sw] >> 1.8sh, "Lindaunis"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:lin + 1ssw, :fah - 1ssw]); + track(:second :pax, kf[:lin + 1sw, :fah - 1sw]); } with link = "point.de.Fahrtoft" { - track(:second:station :pax, hasfle[:fah - 1ssw, :fah + 1ssw]); - with layer = -1 marker(:de.hst :removed :left, hasfle[:fah]); - slabel(:right:removed, hasfle[:fah - 0.35ssw] >> 1dt, "Fahrtoft"); + track(:second :station :pax, kf[:fah - 1sw, :fah + 1sw]); + marker(:left :de.hst :removed, kf[:fah]); + slabel(:left :removed, kf[:fah - 0.4sw] << 1.9sh, "Fahrtoft"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:fah + 1ssw, :sud - 1ssw]); + track(:second :pax, kf[:fah + 1sw, :sud - 1sw]); + line_label(:right:w :pax, kf[:sud - 2km], "1020"); } with link = "point.de.Süderbrarup" { - track(:second:station :pax, hasfle[:sud - 1ssw, :sud + 1.5ssw]); - marker(:de.bf :pax :right, hasfle[:sud]); - slabel(:left :pax, hasfle[:sud - .5ssw] << 1.5dt, - span(:small :bold, "Süderbrarup") + # DE 1020 + track(:second :station :pax, kf[:sud - 1sw, :sud + 1sw]); + + # DE 9102 + track(:third :station :removed, + kf[:sud - 1sw, :sud + 1sw - 2dl] << 1dt + -- kf[:sud + 1sw - 1dl, :sud + 1sw - 0.99dl] ); + track(:third :station :museum, + kf[:sud + 1sw - 1.01dl, :sud + 1sw - 1dl] + -- kf[:sud + 1sw, :sud + 1.01sw] >> 1dt + ); + + marker(:right :de.bf :pax, kf[:sud]); + slabel(:left :pax :bold, kf[:sud - 0.5sw] << 2.5dt, "Süderbrarup"); } with link = "line.de.1020" { - track(:second :pax :flip, hasfle[:sud + 3km, :sud + 1.5ssw]); - line_badge(:pax, hasfle[:sud + 3km] >> 0.2dt, "1020"); - track(:second :pax, hasfle[:sud + 3km, :moh - 1ssw]); + track(:second :pax, kf[:sud + 1sw, :moh - 1sw]); + line_label(:right:w :pax, kf[:sud + 3km], "1020"); } with link = "point.de.Mohrkirch" { - track(:second:station :pax, hasfle[:moh - 1ssw, :moh + 1ssw]); - marker(:de.bf :removed, hasfle[:moh]); - slabel(:right :removed, hasfle[:moh - 0.6sw] >> 1.3sh, "Mohrkirch"); + track(:second :station :pax, kf[:moh - 1sw, :moh + 1sw]); + marker(:right :de.bf :removed, kf[:moh]); + slabel(:right :removed, kf[:moh - 0.7sw] >> 1.4sh, "Mohrkirch*"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:moh + 1ssw, :sor - 1ssw]); + track(:second :pax, kf[:moh + 1sw, :sor - 1sw]); } with link = "point.de.Sörup" { - track(:second:station :pax, hasfle[:sud - 1ssw, :sor + 1ssw]); - marker(:de.bf :pax :right, hasfle[:sor]); - slabel(:right :pax, hasfle[:sor - .5ssw] >> 1.3ssw, - span(:small :bold, "Sörup") - ); + track(:second :station :pax, kf[:sor - 1sw, :sor + 1sw]); + marker(:right :de.bf :pax, kf[:sor]); + slabel(:right :pax :bold, kf[:sor - 0.5sw] >> 1.4sh, "Sörup"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:sor + 1ssw, :win - 1ssw]); + track(:second :pax, kf[:sor + 1sw, :win - 1sw]); } with link = "point.de.Winderatt" { - track(:second:station :pax, hasfle[:win - 1ssw, :win + 1ssw]); - marker(:de.hp :closed, hasfle[:win]); - slabel(:left :removed, hasfle[:win + 0.8sw] << 0.5dt, - hbox(:right:top, "Winderatt") - ); + track(:second :station :pax, kf[:win - 1sw, :win + 1sw]); + marker(:right :de.bf :removed, kf[:win]); + slabel(:right :removed, kf[:win - 0.6sw] >> 1.3sh, "Winderatt"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:win + 1ssw, :hus - 1ssw]); + track(:second :pax, kf[:win + 1sw, :hus - 1sw]); + line_label(:right:s :pax, kf[:win + 1.7km], " 1020"); } with link = "point.de.Husby" { - track(:second:station :pax, hasfle[:hus - 1ssw, :huh + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, hasfle[:hus]); - marker(:de.hp :pax :left, hasfle[:huh]); - slabel(:left :pax, hasfle[:huh - 0.6sw] << 0.9sh, - hbox(:right:top, "Husby") - ); + track(:second :station :pax, kf[:hus - 1sw, :hus + 1sw]); + marker(:left :de.hp :pax, kf[:hus]); + marker(:left :de.exbf :pax, kf[:hus]); + slabel(:bottom :pax, kf[:hus] << 1.7sh + (-1sw, 0dt), "Husby"); } with link = "line.de.1020" { - track(:second :pax, hasfle[:huh + 1ssw, :maa - 1ssw]); + track(:second :pax, kf[:hus + 1sw, :maa - 1sw]); } with link = "point.de.Maasbüll-Angeln" { - track(:second:station :pax, hasfle[:maa - 1ssw, :maa + 1ssw]); - marker(:de.bf :removed :left, hasfle[:maa]); - slabel(:right, hasfle[:maa - .4ssw] >> 1dt, - hbox(:left :base, - span(:small :removed, "Maasbüll "), - span(:small :light :removed, "(Angeln)") - ) + track(:second :station :pax, kf[:maa - 1sw, :maa + 1sw]); + marker(:left :de.bf :removed, kf[:maa]); + slabel(:right :removed, kf[:maa - 0.4sw] >> 1.0dt, + hbox(:left:base, "Maasbüll ", span(:light, "(Angeln)")) ); } with link = "line.de.1020" { + track(:second :pax, kf[:maa + 1sw, :mag]); + line_label(:left:nw :pax, kf[:mag + 1.7km], "1020"); + track(:second :pax, - hasfle[:maa + 1ssw, :fle.aaa] - .. hasfle[:fle - 1.1ssw, :fle - 1ssw] >> 0.5dt + kf[:mag, :fle.gg] + .. kf[:fle.g, :fle - 1sw] >> 0.5dt ); } diff --git a/rules/de/a/d3/10/1021.map b/rules/de/a/d3/10/1021.map index f67db901..40688bb0 100644 --- a/rules/de/a/d3/10/1021.map +++ b/rules/de/a/d3/10/1021.map @@ -1,26 +1,22 @@ -# DE 1021. Kiel-Hassee Cittipark (ausschl.) - Kiel West +# DE 1021. Kiel-Hassee Cittipark - Kiel West # -let hw = path("d4.de.1021"); +let kw = path("d3.de.1021"); with detail = 3 { # point.de.Kiel-Hassee de.1022 with link = "line.de.1021" { - with layer = -4 track(:second:station :removed, - hw[:has.hn - 0.1dl, :has.hn] >> 0.5dt - .. hw[:has.gg + 1.5dt, :has.gg + 1.51dt] - ); - with layer = -4 track(:second :removed, - hw[:has.gg + 1.51dt, :kiw - 1ssw] + track(:second :closed, + kw[:has + 1sw, :has.hn] >> 1dt + .. kw[:has.fw, :kiw - 1sw] ); + line_label(:right:nw :closed, kw[:kiw - 1km], "1021"); } with link = "point.de.Kiel-West" { - track(:second :station :removed, hw[:kiw - 1ssw, :kiw + 1ssw]); - marker(:de.bf :removed :right, hw[:kiw]); - slabel(:top:removed, hw[:kiw + 1.1sh], - span(:small :bold :removed, "K. West") - ); + track(:second :station :closed, kw[:kiw - 1sw, :kiw + 1sw]); + marker(:right :de.gbf :closed, kw[:kiw]); + slabel(:right :closed, kw[:kiw - 0.4sw] >> 1.5sh, "Kiel West"); } } diff --git a/rules/de/a/d3/10/1022.map b/rules/de/a/d3/10/1022.map index fa03d81a..efd6a755 100644 --- a/rules/de/a/d3/10/1022.map +++ b/rules/de/a/d3/10/1022.map @@ -1,176 +1,189 @@ # DE 1022. Kiel Hbf - Osterrönfeld # -let ko = path("d4.de.1022"); +let ko = path("d3.de.1022"); with detail = 3 { # point.de.Kiel-Hbf de.1220 with link = "line.de.1022" { track(:first :pax, - ko[:kie.ks - 1.1dt, :kie.ks - 1dt] >> 0.5dt - .. ko[:khg - 0.51ssw, :khg - 0.5ssw] >> 0.5dt + ko[:kie + 0.5sw, :kie.yh] >> 1.5dt + .. ko[:khg - 0.51sw, :khg - 0.5sw] ); } with link = "point.de.Kiel-Hg" { - # Str. 1022 - track(:first:station :pax, - ko[:khg - 0.5ssw, :khg + 0.5ssw] >> 0.5dt - ); - - # Str. 1031 - track(:first:station, - ko[:khg - 0.5ssw, :khg + 0.5ssw] << 0.5dt - ); - - with layer = -4 marker(:de.abzw :removed, ko[:khg] >> 0.5dt); + track(:first :station :pax, ko[:khg - 0.5sw, :khg + 0.5sw]); + marker(:right :de.bk :removed, ko[:khg]); + slabel(:top :removed, ko[:khg] >> 1.2sh, "Hg"); } with link = "line.de.1022" { - track(:first :pax, ko[:khg + 0.5ssw, :has - 1ssw] >> 0.5dt); + track(:first :pax, ko[:khg + 0.5sw, :has - 1sw]); } with link = "point.de.Kiel-Hassee" { - track(:first:station :pax, ko[:has - 1ssw, :has + 1ssw] >> 0.5dt); + # DE 1020 + track(:second :station :pax, ko[:has, :has + 1sw]); - with layer = -2 track(:first:station, - ko[:has - 1ssw, :has - 0.5ssw] << 0.5dt + # DE 1021 + track(:second :station :closed, + ko[:has - 1.51dl, :has - 1.5dl] + -- ko[:has - 0.5dl, :has + 1sw] >> 1dt ); - track(:first:station :pax, ko[:has - 0.5ssw, :has + 1ssw] << 0.5dt); - marker(:de.bf :pax :left, ko[:has] << 0.5dt); - slabel(:left :pax, ko[:has - 0.2ssw] << 0.5dt + (0dt, 1.5dt), - vbox(:right :top, - span(:small :bold, "K.-Hassee Cittipark") + # DE 1022 + track(:first :station :pax, ko[:has - 1sw, :has]); + track(:second :station :pax, + ko[:has - 1.01dl, :has - 1dl] + -- ko[:has, :has + 1sw] << 1dt + ); + + # DE 1032 + track(:first :station, + ko[:has - 3.1dl, :has - 3dl] << 1dt + -- ko[:has - 2dl, :has - 1.99dl] + ); + + marker(:left :de.bf :pax, ko[:has] << 1dt); + slabel(:left :pax :bold, ko[:has] + (0dt, 300m) + (2sh, 0.5sw), + hbox(:right:top, + vbox(:right:middle, "Kiel-Hassee", "Cittipark"), + vbox(:right:middle, "", "*") ) ); } with link = "line.de.1022" { - track(:first :pax, - ko[:has + 1ssw, :has + 1.1ssw] << 0.5dt - .. ko[:has.f, :rus - 1ssw] + track(:second :pax, + ko[:has + 1sw, :has.hn] << 1dt + .. ko[:has.fr, :rus - 1sw] ); } with link = "point.de.Russee" { - track(:first:station :pax, ko[:rus - 1ssw, :rus + 1ssw]); + track(:second :station :pax, ko[:rus - 1sw, :rus + 1sw]); marker(:left :de.hp :pax, ko[:rus]); - #slabel(:top, ko[:rus] >> 1.4ssw, "K.-Russee"); + slabel(:left :pax, ko[:rus + 1sw] << 0.7dt, + hbox(:right:top, "K.-Russee") + ); } with link = "line.de.1022" { - track(:first :pax, ko[:rus + 1ssw, :met - 1ssw]); + track(:second :pax, ko[:rus + 1sw, :met - 1sw]); } with link = "point.de.Kiel-Mettenhof" { - track(:first:station :pax, ko[:met - 1ssw, :met + 1ssw]); - with layer = -4 marker(:de.hp :removed :right, ko[:met]); + track(:second :station :pax, ko[:met - 1sw, :met + 1sw]); + marker(:right :de.hp :removed, ko[:met]); + slabel(:right :removed, ko[:met + 1sw] >> 1.4sw + (-1.2sw, 0dt), + "K.-Mettenhof" + ); } with link = "line.de.1022" { - track(:first :pax, ko[:met + 1ssw, :mel - 1ssw]); + track(:second :pax, ko[:met + 1sw, :mel - 1sw]); } with link = "point.de.Melsdorf" { - track(:first :station :pax, ko[:mel - 1ssw, :mel + 1ssw]); - marker(:de.hp :pax :right, ko[:mel]); - slabel(:top :pax, ko[:mel] >> 1.15sh, "Melsdorf"); + track(:second :station :pax, ko[:mel - 1sw, :mel + 1sw]); + marker(:right :de.hp :pax, ko[:mel]); + marker(:right :de.exbf :pax, ko[:mel]); + slabel(:left :pax, ko[:mel] << 0.8dt, + hbox(:right:top, "Melsdorf") + ); } with link = "line.de.1022" { - track(:first :pax, ko[:mel + 1ssw, :fle - 1ssw]); + track(:second :pax, ko[:mel + 1sw, :fle - 1sw]); + line_label(:right:s :pax, ko[:mel + 1.5km], " 1022"); } with link = "point.de.Flemhude" { - track(:first :station :pax, ko[:fle - 1ssw, :fle + 1ssw]); - with layer = -1 marker(:de.hst :removed :right, ko[:fle]); + track(:second :station :pax, ko[:fle - 1sw, :fle + 1sw]); + marker(:right :de.hp :removed, ko[:fle]); slabel(:top :removed, ko[:fle] >> 1.2sh, "Flemhude"); } with link = "line.de.1022" { - track(:first :pax, ko[:fle + 1ssw, :ach - 1ssw]); + track(:second :pax, ko[:fle + 1sw, :ach - 1sw]); } with link = "point.de.Achterwehr" { - track(:first :station :pax, ko[:ach - 1ssw, :ach + 1ssw]); - marker(:de.hp :pax :left, ko[:ach]); - slabel(:right :pax, ko[:ach] + (0sw, 1sh), - hbox(:left:top, "Achterwehr") - ); + track(:second :station :pax, ko[:ach - 1sw, :ach + 1sw]); + marker(:left :de.hp :pax, ko[:ach]); + slabel(:left :pax, ko[:ach + 0.3sw] >> 1.0dt, "Achterwehr"); } with link = "line.de.1022" { - track(:first :pax, ko[:ach + 1ssw, :fel - 1ssw]); + track(:second :pax, ko[:ach + 1sw, :fel - 1sw]); } with link = "point.de.Felde-Brandsbek" { - track(:first :station :pax, ko[:fel - 1ssw, :fel + 1ssw]); - marker(:de.bf :pax :left, ko[:fel]); - slabel(:bottom :pax, ko[:fel] << 1.2sh, - vbox(:center:top, " Felde-", "Brandsbek") - ); + track(:second :station :pax, ko[:fel - 1sw, :fel + 1sw]); + marker(:left :de.bf :pax, ko[:fel]); + slabel(:bottom :pax, ko[:fel] << 1.2sh, "Felde-Brandsbek*"); } with link = "line.de.1022" { - track(:first :pax, ko[:fel + 1ssw, :bre - 1ssw]); - with layer = 1 line_badge(:pax, ko[:fel + 2km] @ -4 >> 0.3dt, "1022"); + track(:second :pax, ko[:fel + 1sw, :bre - 1sw]); + line_label(:right:s :pax, ko[:bre - 2.0km], "1022"); } with link = "point.de.Bredenbek" { - track(:first :station :pax, ko[:bre - 1ssw, :bre + 1ssw]); - marker(:de.hp :pax :left, ko[:bre]); - slabel(:bottom :pax, ko[:bre] << 1.1sh, "Bredenbek"); + track(:second :station :pax, ko[:bre - 1sw, :bre + 1sw]); + marker(:left :de.hp :pax, ko[:bre]); + slabel(:bottom :pax, ko[:bre] << 1.2sh, "Bredenbek"); } with link = "line.de.1022" { - track(:first :pax, ko[:bre + 1ssw, :kro - 1ssw]); + track(:second :pax, ko[:bre + 1sw, :kro - 1sw]); } with link = "point.de.Kronsburg" { - track(:first :station :pax, ko[:kro - 1ssw, :kro + 1ssw]); - marker(:de.bf :right :removed, ko[:kro]); - slabel(:top :removed, ko[:kro] >> 1.1ssw, "Kronsburg"); + track(:second :station :pax, ko[:kro - 1sw, :kro + 1sw]); + marker(:right :de.bf :removed, ko[:kro]); + slabel(:top :removed, ko[:kro] >> 1.2sh, "Kronsburg"); } with link = "line.de.1022" { - track(:first :pax, ko[:kro + 1ssw, :ost - 1ssw]); + track(:second :pax, ko[:kro + 1sw, :ost - 1sw]); } with link = "point.de.Ostenfeld-Rendsburg" { - track(:first :pax, ko[:ost - 1ssw, :ost + 1ssw]); - marker(:de.hst :removed, ko[:ost]); - slabel(:left :removed, ko[:ost] >> 1.4sh + (1.8sw, 0sw), - vbox(:right :bottom, - span(:small :removed, "Ostenfeld"), - span(:small :light :removed, "(Kr Rendsburg)") - ) + track(:second :station :pax, ko[:ost - 1sw, :ost + 1sw]); + marker(:right :de.hst :removed, ko[:ost]); + slabel(:right :removed, ko[:ost + 0.3sw] << 0.5dt, + vbox(:left:top, "Ostenfeld", span(:light, "(Kr Rendsburg)")) ); } with link = "line.de.1022" { - track(:first :pax, ko[:ost + 1ssw, :sul - 1ssw]); + track(:second :pax, ko[:ost + 1sw, :sul - 1sw]); } with link = "point.de.Schülldorf" { - track(:first :station :pax, ko[:sul - 1ssw, :sul + 1ssw]); + track(:second :station :pax, ko[:sul - 1sw, :sul + 1sw]); marker(:right :de.hp :pax, ko[:sul]); - slabel(:right :pax, ko[:sul + .5ssw] << 1.4sh, - "Schülldorf" + marker(:right :de.exbf :pax, ko[:sul]); + slabel(:right :pax, ko[:sul] << 0.5dt, + vbox(:left:top, "Schülldorf") ); } with link = "line.de.1022" { - track(:first :pax, - ko[:sul + 1ssw, :oro.r - 1.5dt] - .. ko[:oro.s, :ora - 0.5ssw] >> 1.5dt + track(:second :pax, + ko[:sul + 1sw, :oro.r] + .. ko[:oro.yk, :oro.yk + 0.1dl] >> 1.5dt ); + line_label(:left:w :pax, ko[:oro.r - 0.7km], "1022"); } with link = "point.de.Osterrönfeld-Awanst" { - track(:first :station :pax, ko[:ora - 0.5ssw, :ora + 0.5ssw] >> 1.5dt); - with layer = -2 marker(:de.awanst, ko[:ora] >> 1.5dt); + track(:second :station :pax, ko[:oro.yk, :oro - 0.5sw] >> 1.5dt); + marker(:right :de.awanst, ko[:ora] >> 1.5dt); } # point.de.Osterrönfeld de.1040 } + diff --git a/rules/de/a/d3/10/1023.map b/rules/de/a/d3/10/1023.map index f4a27acf..9b9027af 100644 --- a/rules/de/a/d3/10/1023.map +++ b/rules/de/a/d3/10/1023.map @@ -1,36 +1,58 @@ -# DE 1023. Kiel Hbf (ausschl.) - Neustadt (Holst) +# DE 1023. Kiel Hbf - Neustadt (Holst) # -let kn = path("d4.de.1023"); +let kn = path("d3.de.1023"); with detail = 3 { # point.de.Kiel-Hbf de.1220 with link = "line.de.1023" { - with layer = -1 track(:first :pax, - path("d4.de.1220")[:kie.aa - 200m, :kie.aa - 201m] << 0.5dt - .. kn[:kss - 0.51sw, :kss - 0.5sw] + track(:first :pax :casing, + kn[:kie + 0.5sw, :kie.yn] << 1.5dt + .. kn[:kss - 1.1dl, :kss - 1dl] ); } with link = "point.de.Kiel-Hbf-Ss" { - track(:first:station :pax, kn[:kss - 0.5sw, :kss + 0.5sw]); - track(:second:station, kn[:kss - 0.5sw, :kss + 0.5sw] << 1dt); - with layer = 2 track(:first:station, - kn[:kss - 0.5sw, :kss - 0.5dl] >> 1dt - -- kn[:kss + 0.5dl, :kss + 0.51dl] + # DE 1023 + track(:first :station :pax, kn[:kss - 1dl, :kss + 0.5sw]); + + # DE 1033 + track(:first :station, + kn[:kss - 1.1dl, :kss - 1dl] >> 1dt + -- kn[:kss + 1dl, :kss + 1.01dl] << 1dt ); - marker(:de.abzw :left, kn[:kss] << 1dt); + + # DE 9107 + track(:third :station, kn[:kss - 0.5sw, :kss + 1dl] << 1dt); + + marker(:left :de.abzw, kn[:kss] << 1dt); + slabel(:top :light, kn[:kss + 1dl] << 1dt << 1.2sh, "Ss"); + } + + with link = "point.de.Kiel-Wellsee-Awanst" { + track(:first :station :pax, kn[:kss + 0.5sw, :wel + 0.5sw]); + marker(:right :de.awanst, kn[:wel]); + with zoom = :high { + slabel(:right :light, kn[:wel] + (-0.3sw, 1.2sh), + vbox(:left:top, "Wellsee") + ); + } + with zoom = :low { + slabel(:right :light, kn[:wel] + (-1.5sw, 1.2sh), + vbox(:left:top, "Wellsee") + ); + } } with link = "line.de.1023" { - track(:first :pax, kn[:kss + 0.5sw, :elh - 1sw]); + track(:first :pax, kn[:wel + 0.5sw, :elh - 1sw]); } with link = "point.de.Kiel-Elmschenhagen" { - track(:first:station :pax, kn[:elh - 1sw, :elh + 1sw]); - marker(:de.bf :pax :left, kn[:elh]); - with layer = -1 slabel(:right :pax, kn[:elm] << 1.7sh - (1sh, 0sh), - "K.-Elmschenhagen" + track(:first :station :pax, kn[:elh - 1sw, :elh + 1sw]); + marker(:left :de.bf :pax, kn[:elh] << 0.1sh); + slabel(:right :pax, kn[:elh] + (-0.5sw, -1.2sh), + vbox(:left:bottom, "Kiel-", "Elmschenhagen") ); } @@ -39,49 +61,42 @@ with detail = 3 { } with link = "point.de.Kroog" { - track(:first:station :pax, kn[:kro - 1sw, :kro + 1sw]); - marker(:de.hp :closed :right, kn[:kro]); - slabel(:bottom :closed, kn[:kro] >> 1.1sh, "Kroog"); + track(:first :station :pax, kn[:kro - 1sw, :kro + 1sw]); + marker(:right :de.hp :removed, kn[:kro]); + slabel(:left :removed, kn[:kro + 1sw] >> 0.8sh, + hbox(:right:top, "Kroog") + ); } with link = "line.de.1023" { - track(:first :pax, kn[:kro + 1sw, :raw - 1sw]); + track(:first :pax, kn[:kro + 1sw, :raw - 0.5sw]); } with link = "point.de.Raisdorf-West" { - track(:first:station :pax, kn[:raw - 1sw, :raw + 1sw]); - marker(:de.awanst :left, kn[:raw]); + track(:first :station :pax, kn[:raw - 0.5sw, :raw + 0.5sw]); + marker(:left :de.awanst, kn[:raw]); + slabel(:right, kn[:raw] + (0.7sw, -1.1sw), "Raisdorf West"); } with link = "line.de.1023" { - track(:first :pax, kn[:raw + 1sw, :rai - 1sw]); + track(:first :pax, kn[:raw + 0.5sw, :rai - 1sw]); } with link = "point.de.Raisdorf" { - track(:first:station :pax, kn[:rai - 1sw, :rai + 1sw]); - marker(:de.bf :pax :right, kn[:rai]); - slabel(:right :pax, kn[:rai + .6sw] << 1dt, "Raisdorf"); + track(:first :station :pax, kn[:rai - 1sw, :rai + 1sw]); + marker(:right :de.bf :pax, kn[:rai] >> 0.1sw); + slabel(:right :pax, kn[:rai + 0.6sw] << 1dt, "Raisdorf"); } with link = "line.de.1023" { track(:first :pax, kn[:rai + 1sw, :pre - 1sw]); - with layer = -1 casing(:first, kn[:pre.a - 1dt, :pre.a + 1dt]); - - guide(:linenum :pax, - kn[:rai + 3.2km] << 1.0dt - -- kn[:rai + 3.2km] << 3.0dt - ); - label(:linenum :pax, kn[:rai + 3.2km] << 3.5dt, - hbox(:left:middle, "1023") - ); + line_label(:right:e :pax, kn[:rai + 1.5km], "1023"); } with link = "point.de.Preetz" { - track(:first:station :pax, kn[:pre - 1sw, :pre + 1sw]); - marker(:de.bf :pax :left, kn[:pre]); - slabel(:right :pax, kn[:pre - 0.4sw] << 1.5sh, - hbox(:left:top, "Preetz") - ); + track(:first :station :pax, kn[:pre - 1sw, :pre + 1sw]); + marker(:left :de.bf :pax, kn[:pre]); + slabel(:right :pax, kn[:pre + 0.9sw] << 1.4sh, "Preetz"); } with link = "line.de.1023" { @@ -89,13 +104,10 @@ with detail = 3 { } with link = "point.de.Kühren-Holst" { - track(:first:station :pax, kn[:kuh - 1sw, :kuh + 1sw]); - with layer = -1 marker(:de.bf :removed :right, kn[:kuh]); - slabel(:left, kn[:kuh + .15sw] >> 1.8sh, - hbox(:center :base, - span(:small:removed, "Kühren "), - span(:small :light :removed, "(Holst)") - ) + track(:first :station :pax, kn[:kuh - 1sw, :kuh + 1sw]); + marker(:right :de.bf :removed, kn[:kuh]); + slabel(:right :removed, kn[:kuh + 0.5sw] << 1dt, + hbox(:left:base, "Kühren ", span(:light, "(Holst)")) ); } @@ -104,166 +116,197 @@ with detail = 3 { } with link = "point.de.Wahlstorf" { - track(:first:station :pax, kn[:wah - 1sw, :wah + 1sw]); - marker(:de.bf :removed :left, kn[:wah]); - slabel(:right :removed, kn[:wah + .4sw] << 1.3sh, "Wahlstorf"); + track(:first :station :pax, kn[:wah - 1sw, :wah + 1sw]); + marker(:left :de.bf :removed, kn[:wah]); + slabel(:right :removed, kn[:wah + 0.4sw] << 1.2sh, "Wahlstorf"); } with link = "line.de.1023" { - track(:first :pax, kn[:wah + 1sw, :asc - 1sw]); - with layer = 1 line_badge(:pax, kn[:asc - 2km] << 0.1dt, "1023"); + track(:first :pax, kn[:wah + 1sw, :asc - 1sw - 3dt]); + line_label(:left:w :pax, kn[:asc - 3km], "1023"); } with link = "point.de.Ascheberg-Holst" { - track(:first:station :pax, kn[:asc - 1sw, :asc + 1sw]); - with layer = -4 track(:first:station :closed, - path("d4.de.1041")[:asc.b, :asc.r] + let nm = path("d3.de.1041"); + + # DE 1023 + track(:first :station :pax, + kn[:asc - 1sw - 3dt, :asc - 1sw - 2.9dt] + .. kn[:asc - 0.5sw, :asc + 1sw] << 1dt ); - marker(:de.bf :pax :right, kn[:asc]); - label(kn[:asc] >> 1.1sh - (1.5sw, 0sw), - vbox(:left :top :pax, - hbox(:left :base, - span(:small :bold, "Ascheberg "), - span(:small, "(Holst)") - ) - ) + + # DE 1041 + track(:first :station :removed, + nm[:asc - 1sw, :asc + 0.5sw] + -- nm[:asc + 0.5sw + 1dl, :asc + 0.5sw + 1.1dl] << 1dt + ); + + marker(:right :de.bf :pax, nm[:asc]); + slabel(:bottom :pax, nm[:asc] >> 1.3sh + (0.5sw, 0dt), + vbox(:center:top, "Ascheberg", span(:light, "(Holst)")) ); } with link = "line.de.1023" { - track(:first :pax, kn[:asc + 1sw, :plo - 1sw]); + track(:first :pax, + kn[:asc + 1sw, :asc + 1.01sw] << 1dt + .. kn[:asc.ff, :plo - 1sw] + ); + line_label(:left:s :pax, kn[:asc.ff + 1.5km], "1023"); } with link = "point.de.Plön" { - track(:first:station :pax, kn[:plo - 1sw, :plo + 1sw]); - marker(:de.bf :pax :left, kn[:plo]); - slabel(:top :pax, kn[:plo] << 1.1sw - (.5sw, 0sw), "Plön"); + track(:first :station :pax, kn[:plo - 1sw, :plo + 1sw]); + marker(:left :de.bf :pax, kn[:plo]); + slabel(:right :pax, kn[:plo + 0.5sw] >> 0.5dt, + hbox(:left:top, "Plön") + ); } with link = "line.de.1023" { - track(:first :pax, kn[:plo + 1ssw, :tim - 1ssw]); - guide(:linenum :pax, - kn[:plo + 2.8km] << 0.7dt - -- kn[:plo + 2.8km] << 3dt - ); - label(:linenum :pax, kn[:plo + 2.8km] << 3dt, - hbox(:center:bottom, "1023") + track(:first :pax, kn[:plo + 1sw, :tig - 0.5sw]); + } + + { + track(:first :station :pax, kn[:tig - 0.5sw, :tig + 0.5sw]); + marker(:left :de.lgr :removed, kn[:tig]); + marker(:right :de.lgr :removed, kn[:tig]); + slabel(:top :removed :roman:italic, kn[:tig] << 1sh + (0.5sw, 0dt), + "Pre/Old" ); } + with link = "line.de.1023" { + track(:first :pax, kn[:tig + 0.5sw, :tim - 1sw]); + } + with link = "point.de.Timmdorf" { - track(:first:station :pax, kn[:tim - 1ssw, :tim + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, kn[:tim]); - slabel(:bottom :removed, kn[:tim] >> 1.2ssw, "Timmdorf"); + track(:first :station :pax, kn[:tim - 1sw, :tim + 1sw]); + marker(:right :de.bf :removed, kn[:tim]); + slabel(:right :removed, kn[:tim] + (-1sw, 1.5sw), + hbox(:left:top, "Timmdorf") + ); } with link = "line.de.1023" { - track(:first :pax, - kn[:tim + 1ssw, :mal - 1ssw - .4km] - .. kn[:mal - 1ssw - .1dl, :mal - 1ssw] << 0.5dt); + track(:first :pax, kn[:tim + 1sw, :mal - 1sw]); } with link = "point.de.Malente-Gremsmühlen" { - track(:first:station :pax, kn[:mal - 1ssw, :mal + 1ssw] << 0.5dt); - track(:first:station :pax, - kn[:mal - 1ssw - .1dl, :mal - 1ssw] << 0.5dt - -- kn[:mal - 1ssw + 1dl, :mal + 1ssw] >> 0.5dt + # DE 1023 + track(:first :station :pax, + kn[:mal - 1sw, :mal - 0.5sw - 1dl] + -- kn[:mal - 0.5sw, :mal + 1sw] << 0.5dt ); - with layer = -1 track(:second :station :closed, - path("d4.de.1112")[:mal.bbb, :mal.bbb - .1dl] - .. kn[:mal - .2ssw, :mal + .5ssw] << 0.5dt << 1ssw + track(:first :station :pax, + kn[:mal - 0.5sw - 1.01dl, :mal - 0.5sw - 1dl] + -- kn[:mal - 0.5sw, :mal + 1sw] >> 0.5dt ); - marker(:de.hp :pax :left, kn[:mal] << 0.5dt); - marker(:de.uest :pax :left, kn[:mal] << 0.5dt); - with layer = -4 marker(:de.bf :removed :left, kn[:mal] << 0.5dt); - slabel(:right :pax, kn[:mal + 1.5ssw] << 2dt, - span(:small :bold, "Bad Malente-Gremsmühlen") + + # DE 1041 + track(:second :station :closed, + kn[:mal, :mal + 0.5sw] << 1sh << 0.5dt + ); + + marker(:left :de.inbf :pax, kn[:mal] << 0.5dt); + slabel(:right :pax :bold, kn[:mal + 0.6sw] << 1sh << 1.5dt, + "Malente-Gremsmühlen" ); } with link = "line.de.1023" { - track(:double :first :pax, kn[:mal + 1ssw, :eut - 1ssw]); - with layer = 1 line_badge(:pax, kn[:eut - 2.4km], "1023"); + track(:first :double :pax, kn[:mal + 1sw, :eut - 1sw]); + line_label(:right:ne :pax, kn[:mal + 2.3km] >> 0.5dt, "1023"); } with link = "point.de.Eutin" { - track(:first:station :pax, kn[:eut - 1ssw, :eut + .5ssw] << 0.5dt); - with layer = -4 track(:second:station :removed, - kn[:eut + .5ssw, :eut + 1ssw] << .5dt - ); - track(:first:station :pax, kn[:eut - 1ssw, :eut + 1ssw] >> 0.5dt); - marker(:de.bf :pax :left, kn[:eut - .5ssw] << 0.5dt); - slabel(:right :pax, kn[:eut] << .5dt << 1.3ssw, - span(:small :bold, "Eutin") + track(:first :double:station :pax, kn[:eut - 1sw, :eut + 1sw]); + marker(:left :de.bf :pax, kn[:eut] << 0.5dt); + slabel(:right :pax :bold, kn[:eut + 0.6sw] << 0.5dt << 1.3sh, + "Eutin" ); } with link = "line.de.1023" { track(:second :removed, - kn[:eut + 1ssw, :eut.fff] << .5dt - .. kn[:rob - 1.1ssw, :rob - 1ssw] - ); - with layer = 1 line_badge( - :removed, kn[:eut.fff - 0.7km] << 0.5dt, "1023" + kn[:eut + 1sw, :eut.yl] << 0.5dt + .. kn[:eut.yl + 1.2km, :rob - 1sw] ); + line_label(:left:s :removed, kn[:eut.yl + 1.8km], " 1023"); } with link = "point.de.Röbel" { - track(:second:station :removed, kn[:rob - 1ssw, :rob + 1ssw]); - marker(:de.hp :removed :right, kn[:rob]); - slabel(:right :removed, kn[:rob + .3ssw] << .7ssw, "Röbel"); + track(:second :station :removed, kn[:rob - 1sw, :rob + 1sw]); + marker(:right :de.hp :removed, kn[:rob]); + slabel(:right :removed, kn[:rob + 0.7sw] << 1.0dt, "Röbel"); } with link = "line.de.1023" { - track(:second :removed, kn[:rob + 1ssw, :buj - 1ssw]); + track(:second :removed, kn[:rob + 1sw, :buj - 1sw]); } with link = "point.de.Bujendorf" { - track(:second :station :removed, kn[:buj - 1ssw, :buj + 1ssw]); - marker(:de.bf :removed :left, kn[:buj]); - slabel(:right :removed, kn[:buj] << 1.5ssw, "Bujendorf"); + track(:second :station :removed, kn[:buj - 1sw, :buj + 1sw]); + marker(:left :de.hst :removed, kn[:buj]); + slabel(:left :removed, kn[:buj - 0.4sw] >> 0.5dt, + hbox(:right:top, "Bujendorf") + ); } with link = "line.de.1023" { - track(:second :removed, kn[:buj + 1ssw, :ove - 1ssw]); + track(:second :removed, kn[:buj + 1sw, :ove - 1sw]); + line_label(:left:s :removed, kn[:ove - 0.85km], "1023"); } with link = "point.de.Ovelgönne-Holst" { - track(:second :station :removed, kn[:ove - 1ssw, :ove + 1ssw]); - marker(:de.hp :removed :right, kn[:ove]); - slabel(:bottom :removed, kn[:ove] >> 1.4ssw, "Ovelgönne"); + track(:second :station :removed, kn[:ove - 1sw, :ove + 1sw]); + marker(:right :de.hp :removed, kn[:ove]); + slabel(:left :removed, kn[:ove + 1sw] >> 0.9sh, + hbox(:right:top, "Ovelgönne") + ); } with link = "line.de.1023" { - track(:second :removed, kn[:ove + 1ssw, :neg.a]); + track(:second :removed, kn[:ove + 1sw, :neg.ns - 1sw]); } with link = "point.de.Neustadt-Holst-Gbf" { - with layer = -4 track(:second :removed, kn[:neg.a, :neg.ns]); - track(:first:station :pax, path("d4.de.1100")[:neg.b, :neg.nn]); - track(:first:station, path("d4.de.1100")[:neg.nn, :neg.g]); - track(:first:station :pax, kn[:neg.nn, :nst.a]); - - marker(:de.gbf, kn[:neg]); - slabel(:right, kn[:neg - 0.4ssw] >> 1.7ssw, - hbox(:left :base, - span(:small :bold, "Neustadt "), - span(:small, "(Holst) "), - span(:small :bold, "Gbf") + let lp = path("d3.de.1100"); + + # DE 1023 + track(:second :station :removed, kn[:neg.ns - 1sw, :neg.ns]); + track(:first :station :pax, + kn[:neg - 0.5sw - 1.1dl, :neg - 0.5sw - 1dl] + -- kn[:neg - 0.5sw, :neg.nn + 1sw] >> 1dt + ); + + # DE 1100 + track(:first :station :pax, lp[:neg.ns - 1sw, :neg - 0.5sw - 1dl]); + track(:first :station, lp[:neg - 0.5sw - 1dl, :neg.nn + 1sw]); + + marker(:right :de.bbf, lp[:neg] >> 1dt); + slabel(:right :pax, kn[:neg - 0.4sw] >> 1dt >> 1.8sh, + hbox(:left:base, + span(:bold, "Neustadt "), "(Holst)", span(:bold, " Gbf") ) ); } with link = "point.de.Neustadt-Holst" { - track(:first:station :pax, kn[:nst.a, :nst + 0.5ssw]); - marker(:de.hp :pax :left, kn[:f - .5ssw]); - marker(:de.awanst :pax :left, kn[:f - .5ssw]); - with layer = -1 marker(:de.bf :gone :left, kn[:f - .5ssw]); - slabel(:right :pax, kn[:nst] + (1.0ssw, 0ssw), - hbox(:left :base, - span(:small :bold, "Neustadt "), - span(:small, "(Holst) ") - ) + # DE 1023 + track(:first :station :pax, + kn[:neg.nn + 1sw, :nst + 1sw] >> 1dt + ); + + # DE A32 + track(:second :station :removed, + kn[:nst.yo, :nst - 0.5sw - 1.5dl] + -- kn[:nst - 0.5sw - 0.5dl, :nst - 0.5sw - 0.49dl] >> 1dt + ); + + marker(:left :de.bf :pax, kn[:nst] >> 0.9dt); + slabel(:right :pax, kn[:nst] + (1.5sw, 0.5sw), + hbox(:left:base, span(:bold, "Neustadt "), "(Holst)") ); } } diff --git a/rules/de/a/d3/10/1030.map b/rules/de/a/d3/10/1030.map index 13de4331..65981910 100644 --- a/rules/de/a/d3/10/1030.map +++ b/rules/de/a/d3/10/1030.map @@ -1,17 +1,14 @@ # DE 1030. Meimersdorf - Kiel Hgbf # -let mg = path("d4.de.1030"); +let mk = path("d3.de.1030"); with detail = 3 { - # point.de.Meimersdorf-Rbf de.1031 - with link = "point.de.Kiel-Hgbf" { - with layer = 3 track(:first :removed, - mg[:mer - 0.1dt, :mer] << 1.5dt - .. mg[:khg - 1dl, :khg] << 2dt - ); - - marker(:de.gbf :top :removed, mg[:khg] << 2dt); + track(:second :station :removed, mk[:meo, :khg] << 1.5dt); + marker(:top :de.gbf :removed, mk[:khg] << 1.5dt); + with zoom = :high { + slabel(:left :removed, mk[:khg] + (-1.9sw, 0.4sw), "K. Hgbf"); + } } } diff --git a/rules/de/a/d3/10/1031.map b/rules/de/a/d3/10/1031.map index d745df71..6ce7b35e 100644 --- a/rules/de/a/d3/10/1031.map +++ b/rules/de/a/d3/10/1031.map @@ -1,38 +1,27 @@ # DE 1031. Meimersdorf Mf - Rbf Meimersdorf - Kiel-Hassee # -let ak = path("d4.de.1220"); -let mh = path("d4.de.1031"); +let mh = path("d3.de.1031"); with detail = 3 { # point.de.Meimersdorf-Mf de.1220 - with link = "point.de.Meimersdorf-Rbf" { - with layer = 4 track(:first:station :cat:ac15, - ak[:mei + 1ssw, :meo - 2dl] << 1.5dt - ); - with layer = 4 track(:first:station, ak[:meo - 2dl, :kie.aa] << 1.5dt); - - marker(:de.bbf :cat:ac15 :left, ak[:meg] << 1.5dt); - slabel(:left :cat:ac15, ak[:mei + 0.5ssw] << 2.5dt, - "Meimersdorf" - ); - } - - with link = "line.de.1031" { - with layer = -2 track(:first, - ak[:kie.aa, :kie.aa + 0.1dl] << 1.5dt - .. mh[:khg - 0.51ssw, :khg - 0.5ssw] << 0.5dt - ); - } - - # point.de.Kiel-Hg de.1022 - with link = "line.de.1031" { - with layer = -2 track(:first, - mh[:khg + 0.5ssw, :has - 0.5ssw] << 0.5dt - ); + with zoom = :high { + track(:first :rightother :cat:ac15, + mh[:mef + 1sw, :mer - 1sw] << 2.5dt + ); + track(:first :rightother, + mh[:mer + 1sw, :meo - 1sw] << 2.5dt + .. mh[:meo, :ahas] << 1.5dt + .. mh[:khg.ym, :has - 3dl] << 1dt + ); + } + with zoom = :low { + track(:first :rightother, + mh[:meo - 4dl, :ahas] << 1.5dt + .. mh[:khg.ym, :has - 3dl] << 1dt + ); + } } - - # point.de.Kiel-Hassee de.1022 } diff --git a/rules/de/a/d3/10/1032.map b/rules/de/a/d3/10/1032.map new file mode 100644 index 00000000..0f212d78 --- /dev/null +++ b/rules/de/a/d3/10/1032.map @@ -0,0 +1,14 @@ +# DE 1032. Meimersdorf Rbf - Kiel Hbf +# +let ak = path("d3.de.1220"); + +with detail = 3, zoom = :high { + with link = "line.de.1032" { + with layer = -1 track(:first :leftother :cat:ac15, + ak[:meo - 0.1dl, :meo] >> 1.5dt + -- ak[:meo + 1dl, :meo + 500m] >> 1.5dt + .. ak[:kie.yn, :kie - 0.5sw] >> 2.5dt + ); + } +} + diff --git a/rules/de/a/d3/10/1033.map b/rules/de/a/d3/10/1033.map index 2b7ea936..06dd4ec7 100644 --- a/rules/de/a/d3/10/1033.map +++ b/rules/de/a/d3/10/1033.map @@ -1,19 +1,87 @@ -# DE 1033. DE 1033 - Meimersdorf Mitte - Kiel SS +# DE 1033 - Meimersdorf Mitte - Kiel SS # -let ak = path("d4.de.1220"); -let kn = path("d4.de.1023"); +let ms = path("d3.de.1033"); + +with detail = 3, zoom = :high { + # point.de.Meimersdorf-Mf de.1220 + + with link = "line.de.1033" { + track(:first :leftother:rightother :cat:ac15, + ms[:mef + 1sw, :mer - 1sw] << 1.5dt + ); + } + + with link = "point.de.Meimersdorf-Rbf" { + # DE 1033 + track(:first :station :cat:ac15, ms[:mer - 1sw, :mer + 1sw] << 1.5dt); + + # DE 1031 + track(:first :station :cat:ac15, + ms[:mer - 1sw, :mer + 1sw] << 2.5dt + ); + + marker(:left :de.bbf :cat:ac15, ms[:mer] << 2.5dt); + slabel(:left :cat:ac15 :pax, + ms[:mer] << 2.5dt << 1.7sw + (1sw, 0dt), + "Meimersdorf Rbf" + ); + } + + with link = "line.de.1033" { + with layer = 1 track(:first :leftother:rightother :cat:ac15 :casing, + ms[:mer + 1sw, :mmo - 2dl] << 1.5dt + .. ms[:meo - 1.1dl, :meo - 1dl] >> 1.5dt + ); + } + + with link = "point.de.Meimersdorf-Ost" { + track(:first :station :cat:ac15, + ms[:meo - 1dl, :meo + 1dl] >> 1.5dt + ); + track(:first :station, + ms[:meo - 1.1dl, :meo - 1dl] >> 1.5dt + -- ms[:meo, :meo + 1dl] >> 2.5dt + ); + + marker(:right :de.abzw :cat:ac15, ms[:meo] >> 2.5dt); + slabel(:right :cat:ac15 :light, ms[:meo] >> 2.5dt + (0dt, 0.8sh), + hbox(:left:top, "M. Ost") + ); + } + + with link = "line.de.1033" { + track(:first, + ms[:meo + 1dl, :meo + 1.1dl] >> 2.5dt + .. ms[:kss - 2dl, :kss - 1dl] >> 1dt + ); + } +} + +with detail = 3, zoom = :low { + # point.de.Meimersdorf-Mf de.1220 + + with link = "line.de.1033" { + track(:first :leftother:rightother :cat:ac15, + ms[:mef + 1sw, :mer - 1sw] << 1.5dt + ); + } + + with link = "point.de.Meimersdorf-Rbf" { + track(:first :station :cat:ac15, ms[:mer - 1sw, :mer + 1sw] << 1.5dt); + marker(:left :de.bbf :cat:ac15, ms[:mer] << 1.5dt); + slabel(:left :cat:ac15 :pax, ms[:mer - 1.3sw] << 3.5dt, + "Meimersdorf Rbf" + ); + } -with detail = 3 { - # point.de.Meimersdorf-Rbf de.1031 - with link = "line.de.1033" { - with layer = 2 track(:first, - ak[:meo - 0.1dl, :meo] << 1.5dt - .. kn[:kss - 0.51ssw, :kss - 0.5ssw] >> 1dt + track(:first :leftother:rightother :cat:ac15, + ms[:mer + 1sw, :meo - 4dl] << 1.5dt + -- ms[:meo - 1dl, :meo] >> 1.5dt ); - with layer = 1 casing(:first, - ak[:meo - 0.1dl, :meo] << 1.5dt - .. kn[:kss - 0.51ssw, :kss - 0.5ssw] >> 1dt + track(:first :leftother, + ms[:meo, :meo + 1dl] >> 1.5dt + .. ms[:kss - 1.5dl, :kss - 1dl] >> 1dt ); } } diff --git a/rules/de/a/d3/10/1040.map b/rules/de/a/d3/10/1040.map index ea955b8a..297c3437 100644 --- a/rules/de/a/d3/10/1040.map +++ b/rules/de/a/d3/10/1040.map @@ -1,364 +1,406 @@ # DE 1040. Neumünster - Flensburg # -let nf = path("d4.de.1040"); +let nf = path("d3.de.1040"); with detail = 3 { - # point.de.Neumünster de.1220 - # point.de.Neumünster-Gbf de.1220 + # point.de.Neumünster de.1220 with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:neu.yf + 1ssw, :asp - 1ssw]); - with layer = -4 track(:first :double :removed, - path("d4.de.1040.neu")[:neu.h, :xneu] + track(:first :double:leftother:rightother :cat:ac15 :pax, + nf[:neu + 1sw, :neu.yf] << 2dt + ); + track(:first :double :cat:ac15 :pax, + nf[:neu.yf - 0.1dl, :neu.yf] << 2dt + .. nf[:neu.fff + 2dt, :sto - 0.5sw] + ); + line_label( + :right:sw :cat:ac15 :pax, nf[:sto - 0.7km] >> 0.5dt, "1040" ); } with link = "point.de.Stover" { - with layer = -1 marker(:de.bk :removed :left, nf[:sto] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + nf[:sto - 0.5sw, :sto + 0.5sw] + ); + marker(:left :de.bk :removed, nf[:sto] << 0.5dt); + slabel(:left :removed, nf[:sto - 0.1sw] << 0.5dt << 2.2sw, "Stover"); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:sto + 0.5sw, :asp - 1sw]); } with link = "point.de.Aspe" { - track(:first:station :double :cat:ac15 :pax, - nf[:asp - 1ssw, :asp + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:asp - 1sw, :asp + 1sw] ); - with layer = -1 marker(:de.bf :removed :right, nf[:asp] >> 0.5dt); - slabel(:right :removed, nf[:asp - 0.7ssw] >> 0.5dt >> 1.4ssw, "Aspe"); + marker(:right :de.bf :removed, nf[:asp] >> 0.5dt); + slabel(:right :removed, nf[:asp - 0.7sw] >> 0.5dt >> 1.4sw, "Aspe"); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:asp + 1ssw, :nor - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:asp + 1sw, :nor - 1sw]); } with link = "point.de.Nortorf" { - track(:first:station :double :cat:ac15 :pax, - nf[:nor - 1ssw, :nor + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:nor - 1sw, :nor + 1sw] ); - marker(:de.bf :cat:ac15 :pax :right, nf[:nor] >> 0.5dt); - slabel(:right :cat:ac15 :pax, nf[:nor - 0.9ssw] >> 0.5dt >> 1.5ssw, + marker(:right :de.bf :cat:ac15 :pax, nf[:nor] >> 0.5dt); + slabel(:right :cat:ac15 :pax, nf[:nor - 0.7sw] >> 0.5dt >> 1.4sw, "Nortorf" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:nor + 1ssw, :bok - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:nor + 3km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:nor + 1sw, :bok - 0.5sw]); + line_label( + :right:sw :cat:ac15 :pax, nf[:nor + 4.2km] >> 0.5dt, "1040" + ); } with link = "point.de.Bokel" { - track(:first:station :double :cat:ac15 :pax, - nf[:bok - 1ssw, :bok + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:bok - 0.5sw, :bok + 0.5sw] + ); + marker(:left :de.hp :removed, nf[:bok] << 0.5dt); + marker(:left :de.exbf :removed, nf[:bok] << 0.5dt); + slabel(:left :removed, nf[:bok - 0.5sw] << 0.5dt << 2.3sh, + "Bokel" ); - with layer = -1 marker(:de.hp :removed:left, nf[:bok] << 0.5dt); - with layer = -2 marker(:de.bf :gone :left, nf[:bok] << 0.5dt); - slabel(:left :removed, nf[:bok - 0.4ssw] << 0.5dt << 2.0ssw, "Bokel"); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:bok - 1ssw, :bos - 0.5ssw]); - } - - with link = "point.de.Bokelholm-Süd" { - track(:first:station :double :cat:ac15 :pax, - nf[:bos - 0.5ssw, :bos + 100m] - ); - with layer = -4 marker(:de.bk :left :removed, nf[:bos] << 0.5dt); + track(:first :double :cat:ac15 :pax, nf[:bok + 0.5sw, :boh - 0.5sw]); } with link = "point.de.Bokelholm" { - track(:first:station :double :cat:ac15 :pax, - nf[:bos + 100m, :bon - 100m] - ) - with layer = -4 marker(:de.bf :right :removed, nf[:boh] >> 0.5dt); - slabel(:right :removed, nf[:boh - 0.6ssw] >> 0.5dt >> 1.6ssw, - "Bokelholm" + track(:first :double:station :cat:ac15 :pax, + nf[:boh - 0.5sw, :boh + 0.5sw] ); - } - - - with link = "point.de.Bokelholm-Nord" { - track(:first:station :double :cat:ac15 :pax, - nf[:bon - 100m, :bon + 0.5ssw] + marker(:right :de.bf :removed, nf[:boh] >> 0.5dt); + slabel(:right :removed, nf[:boh - 0.4sw] >> 0.5dt >> 1.4sh, + "Bokelholm" ); - with layer = -4 marker(:de.bk :left :removed, nf[:bon] << 0.5dt); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:bon + 0.5ssw, :oro - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:boh + 0.5sw, :oro.yk]); + track(:first :double:rightother :cat:ac15 :pax, + nf[:oro.yk, :oro - 0.5sw] + ); + line_label( + :left:ne :cat:ac15 :pax, nf[:oro.yk - 1.2km] << 0.5dt, "1040" + ); } with link = "point.de.Osterrönfeld" { - # Str. 1040 - track(:first:station :double :cat:ac15 :pax, - nf[:oro - 1ssw, :oro + 1.5ssw] + # DE 1022 + track(:second :station :pax, + nf[:oro - 0.5sw, :oro + 0.5sw] >> 1.5dt + -- nf[:oro + 0.5sw + 1dl, :oro + 0.5sw + 1.1dl] >> 0.5dt ); - # Str. 1022 - with layer = -2 track(:first:station :pax, - nf[:ora + 0.5ssw, :ora + 0.51ssw] >> 1.5dt - -- nf[:ora + 0.5ssw + 1dl, :ora + 0.5ssw + 1.1dl] >> 0.5dt + # DE 1040 + track(:first :double:station :cat:ac15 :pax, + nf[:oro - 0.5sw, :oro + 1sw] ); - with layer = -2 marker(:de.bbf :cat:ac15 :right, - nf[:ora + 1ssw + 1dl] >> 0.5dt - ); - slabel(:right :cat:ac15, nf[:ora] + (1.3km, 0dt), - span(:bold, "Osterrönfeld") + marker(:right :de.bbf :cat:ac15, nf[:oro] >> 1.5dt); + marker(:right :de.exbf :cat:ac15, nf[:oro] >> 1.5dt); + slabel(:left :cat:ac15 :bold, nf[:oro - 1.0km] << 3.8dt, + "Osterrönfeld" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:oro + 1.5ssw, :orb - 0.5ssw]); + track(:first :double :cat:ac15 :pax, nf[:oro + 1sw, :orb - 0.5sw]); } with link = "point.de.Osterrönfeld-Brücke" { - track(:first:station :double :cat:ac15 :pax, - nf[:orb - 0.5ssw, :orb + 0.5ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:orb - 0.5sw, :orb + 0.5sw] ); - marker(:de.uest :cat:ac15 :right, nf[:orb] >> 0.5dt); + marker(:left :de.uest :cat:ac15, nf[:orb] << 0.5dt); } with link = "line.de.1040" { - with layer = 3 track(:first :double :cat:ac15 :pax, - nf[:orb + 0.5ssw, :ren.a] - ); - with layer = 1 casing(:first :double :cat:ac15 :pax, - nf[:bhbx - 1ssw, :bhbx + 1ssw] - ); + track(:first :double :cat:ac15 :pax, nf[:orb + 0.5sw, :hbr - 0.5sw]); } with link = "point.de.Hochbrücke" { - with layer = 2 marker(:de.bk :removed :left, nf[:hbr] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + nf[:hbr - 0.5sw, :hbr + 0.5sw] + ); + marker(:left :de.bk :removed, nf[:hbr] << 0.5dt); } + with link = "line.de.1040" { + with layer = 1 track(:first :double :cat:ac15 :pax :casing, + nf[:hbr + 0.5sw, :rbr - 0.5sw] + ); + } with link = "point.de.Rendsburg-Brücke" { - with layer = 2 marker(:de.uest :removed :left, nf[:rbr] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + nf[:rbr - 0.5sw, :rbr + 0.5sw] + ); + marker(:left :de.bk :removed, nf[:rbr] << 0.5dt); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:rbr + 0.5sw, :rsl - 0.5sw]); } with link = "point.de.Rendsburg-Schleife" { - with layer = 2 marker(:de.bk :removed :left, nf[:rsl] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + nf[:rsl - 0.5sw, :rsl + 0.5sw] + ); + marker(:left :de.bk :removed, nf[:rsl] << 0.5dt); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:rsl + 0.5sw, :ren - 1sw]); } with link = "point.de.Rendsburg" { - track(:first:station :double :cat:ac15 :pax, - nf[:ren.a, :bud.a] + track(:first :double:station :cat:ac15 :pax, + nf[:ren - 1sw, :ren + 1sw] ); - marker(:de.bf :cat:ac15 :pax :left, nf[:ren] << 0.5dt); - slabel(:left :cat:ac15 :pax, nf[:ren] - (1.5km, 0dt), + marker(:left :de.bf :cat:ac15 :pax, nf[:ren] << 0.5dt); + slabel(:left :cat:ac15 :pax, nf[:ren + 1.2sw] << 0.5dt << 1.2sh, hbox(:right:top :bold, "Rendsburg") ); } + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:ren + 1sw, :bud - 1sw]); + } + with link = "point.de.Büdelsdorf" { - # Str. 1040 - track(:double :first :station :cat:ac15 :pax, - nf[:bud.a, :bud + 1.5ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:bud - 1sw, :bud + 1sw] ); - - # Str. 1012 - with layer = -2 track(:second:station, - nf[:bud + 0.5ssw, :bud + 0.51ssw] << 0.5dt - .. path("d4.de.1012")[:bud.gg + 0.9dt, :bud.gg + 1dt] + track(:station, + nf[:bud - 0.1dl, :bud] << 0.5dt + -- nf[:bud + 1dl, :bud + 2dl] << 1.5dt ); - with layer = -1 marker(:de.bf :removed :left, nf[:bud] << 0.5dt); + + marker(:left :de.bf :removed, nf[:bud] << 1.5dt); + slabel(:right :removed :bold, nf[:bud - 0.2sw] >> 1.5dt, "Büdelsdorf"); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:bud + 1.5ssw, :adu - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:bud + 1sw, :adu - 0.5sw]); + line_label(:right:w :cat:ac15 :pax, nf[:bud + 3km] >> 0.5dt, "1040"); } - with link = "point.de.Alt-Duvenstedt" { - track(:first:station :double :cat:ac15 :pax, - nf[:adu - 1ssw, :adu + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:adu - 0.5sw, :adu + 0.5sw] ); - with layer = -1 marker(:de.hst :removed :right, nf[:adu] >> 0.5dt); - with layer = -2 marker(:de.bf :gone :right, nf[:adu] >> 0.5dt); - slabel(:right :removed, nf[:adu - 0.6ssw] >> 0.5dt >> 1.5ssw, + marker(:right :de.hst :removed, nf[:adu] >> 0.5dt); + slabel(:right :removed, nf[:adu - 0.7sw] >> 0.5dt >> 1.4sh, "Alt Duvenstedt" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:adu + 1ssw, :ows - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:adu + 0.5sw, :ows - 1sw]); } - with link = "point.de.Owschlag" { - track(:double :first :station :cat:ac15 :pax, nf[:ows.a, :ows.f]); - marker(:de.bf :cat:ac15 :pax, nf[:ows] >> 0.5dt); - slabel(:left :cat:ac15 :pax, nf[:ows - 0.5ssw] << 2.5dt, - span(:bold, "Owschlag") + track(:first :double:station :cat:ac15 :pax, + nf[:ows - 1sw, :ows + 1sw] + ); + marker(:right :de.bf :cat:ac15 :pax, nf[:ows] >> 0.5dt); + slabel(:right :cat:ac15 :pax :bold, nf[:ows - 0.6sw] >> 0.5dt >> 1.3sh, + "Owschlag" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:ows + 1ssw, :lot - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:ows + 3.2km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:ows + 1sw, :lot - 0.5sw]); + line_label(:left:e :cat:ac15 :pax, nf[:ows + 3km] << 0.5dt, "1040"); } with link = "point.de.Lottorf" { - track(:first:station :double :cat:ac15 :pax, - nf[:lot - 1ssw, :lot + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:lot - 0.5sw, :lot + 0.5sw] ); - with layer = -1 marker(:de.uest :removed :right, nf[:lot] >> 0.5dt); - with layer = -2 marker(:de.bf :gone :right, nf[:lot] >> 0.5dt); - slabel(:right :removed, nf[:lot - 0.6ssw] >> 0.5dt >> 1.6ssw, + marker(:right :de.uest :removed, nf[:lot] >> 0.5dt); + marker(:right :de.exbf :removed, nf[:lot] >> 0.5dt); + slabel(:right :removed, nf[:lot - 0.6sw] >> 0.5dt >> 1.7sh, "Lottorf" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:lot + 1ssw, :sle - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:lot + 0.5sw, :klg - 0.5sw]); + track(:first :double:station :cat:ac15 :pax, + nf[:klg - 0.5sw, :klg + 0.5sw] + ); + track(:first :double :cat:ac15 :pax, nf[:klg + 0.5sw, :sle - 1sw]); + line_label(:right:w :cat:ac15 :pax, nf[:sle - 1.5km] >> 0.5dt, "1040"); } - with link = "point.de.Schleswig" { - track(:first:station :double :cat:ac15 :pax, nf[:sle.a, :sle.f]); - marker(:de.bf :cat:ac15 :pax :right, nf[:sle] >> 0.5dt); - slabel(:right :cat:ac15 :pax, nf[:sle - 0.6ssw] + (1.5ssw, -0.5ssw), - span(:bold, "Schleswig") + track(:first :double:station :cat:ac15 :pax, + nf[:sle - 1sw, :sle + 1sw] + ); + marker(:right :de.bf :cat:ac15 :pax, nf[:sle] >> 0.5dt); + slabel(:left :cat:ac15 :pax :bold, nf[:sle + 1dt] << 1.5dt, + hbox(:right:top, "Schleswig") ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:sle + 1ssw, :sub - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:sle + 1sw, :sub - 0.5sw]); } with link = "point.de.Schuby" { - track(:first:station :double :cat:ac15 :pax, - nf[:sub - 1ssw, :sub + 1ssw] - ); - with layer = -1 marker(:de.bf :left :removed, nf[:sub] << 0.5dt); - marker(:de.awanst :cat:ac15 :left, nf[:sub.f] << 0.5dt); - slabel(:left :cat:ac15, nf[:sub.f] << 0.5dt << 1.4ssw, - hbox(:center :top, - "Schuby ", - span(:removed, "(Kr Schleswig)") - ) + track(:first :double:station :cat:ac15 :pax, + nf[:sub - 0.5sw, :sub + 0.5sw] ); + marker(:left :de.awanst :cat:ac15, nf[:sub] << 0.5dt); + marker(:left :de.exbf :cat:ac15, nf[:sub] << 0.5dt); + slabel(:right :cat:ac15, nf[:sub - 0.5sw] >> 1.5dt, "Schuby"); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:sub - 1ssw, :jub - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:sub + 3.5km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:sub + 0.5sw, :jub - 1sw]); + line_label(:right:w :cat:ac15 :pax, nf[:jub - 3km] >> 0.5dt, "1040"); } - with link = "point.de.Jübek" { - track(:first:station :double :cat:ac15 :pax, - nf[:jub - 1ssw, :jub.r + 1ssw] - ); - with layer = -2 track(:second:station :pax, - nf[:jub.r - .1dl, :jub.r] << 0.5dt - .. path("d4.de.1011")[:jub.g + 1dt, :jub.g + 1.1dt] - ); - - with layer = 1 marker(:de.bf :cat:ac15 :pax :left, nf[:jub] << 0.5dt); - slabel(:left :cat:ac15 :pax, nf[:jub - 0.8ssw] << 0.5dt << 2.4ssw, - span(:bold, "Jübek") + track(:first :double:station :cat:ac15 :pax, + nf[:jub - 1sw, :jub.yh + 1sw] ); + marker(:left :de.bf :cat:ac15 :pax, nf[:jub] << 0.5dt); + slabel(:right :cat:ac15 :bold, nf[:jub - 0.7sw] >> 2.0dt, "Jübek"); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:jub.r + 1ssw, :egb - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:jub + 1sw, :egb - 0.5sw]); + line_label(:right:w :cat:ac15 :pax, nf[:jub + 4.6km] >> 0.5dt, "1040"); } with link = "point.de.Eggebek" { - track(:first:station :double :cat:ac15 :pax, - nf[:egb - 1ssw, :egb + 1ssw] - ); - marker(:de.anst :removed:left, nf[:egb] << 0.5dt); - with layer = -1 marker(:de.bf :gone:left, nf[:egb] << 0.5dt); - slabel(:right :removed, nf[:egb - 0.6ssw] >> 1.5dt, - "Eggebek" + track(:first :double:station :cat:ac15 :pax, + nf[:egb - 0.5sw, :egb + 0.5sw] ); + marker(:left :de.bf :removed, nf[:egb] << 0.5dt); + slabel(:right :removed, nf[:egb - 0.6sw] >> 2.0dt, "Eggebek"); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:egb + 1ssw, :tar - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:egb + 0.5sw, :egg.yo - 1sw]); + track(:first :double:station :cat:ac15 :pax, + nf[:egg.yo - 1sw, :egg.yo + 1sw] + ); + track(:first :double :cat:ac15 :pax, nf[:egg.yo + 1sw, :tar - 1sw]); } - with link = "point.de.Tarp" { - track(:first:station :double :cat:ac15 :pax, - nf[:tar - 1ssw, :tar + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:tar - 1sw, :tar + 1sw] ); - marker(:de.bf :removed, nf[:tar] >> .5dt); - with layer = 1 marker(:de.hp :cat:ac15 :pax, nf[:tar] >> .5dt); - slabel(:right :cat:ac15 :pax, nf[:tar - 0.4ssw] >> 0.5dt >> 2.0ssw, + marker(:right :de.hp :cat:ac15 :pax, nf[:tar] >> 0.5dt); + marker(:right :de.exbf :cat:ac15 :pax, nf[:tar] >> 0.5dt); + slabel(:right :cat:ac15 :pax, nf[:tar - 0.5sw] >> 0.5dt >> 2.2sh, "Tarp" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:tar + 1ssw, :bar - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, nf[:tar + 2.3km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:tar + 1sw, :bar - 0.5sw]); } with link = "point.de.Barderup" { - track(:first:station :double :cat:ac15 :pax, - nf[:bar - 1ssw, :bar + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:bar - 0.5sw, :bar + 0.5sw] ); - with layer = -4 marker(:de.hp :removed :left, nf[:bar] << .5dt); - with layer = -4 marker(:de.bk :removed :left, nf[:bar] << .5dt); - slabel(:left :removed, nf[:bar - 0.4ssw] << .5dt << 1.8ssw, + marker(:left :de.hp :removed, nf[:bar] << 0.5dt); + slabel(:left :removed, nf[:bar - 0.4sw] << 0.5dt << 1.7sh, "Barderup" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:bar + 1ssw, :fws - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:bar + 0.5sw, :fws - 0.5sw]); + line_label(:right:w :cat:ac15 :pax, nf[:bar + 1.8km] >> 0.5dt, "1040"); } with link = "point.de.Flensburg-Weiche-Süd" { - track(:first:station :double :cat:ac15 :pax, - nf[:fws - 1ssw, :fws + 1ssw] + track(:first :double:station :cat:ac15 :pax, + nf[:fws - 0.5sw, :fws + 0.5sw] + ); + marker(:left :de.bft :cat:ac15, nf[:fws] << 0.5dt); + slabel(:right :cat:ac15 :light, nf[:fws - 0.5sw] >> 2.5dt, + "F.-W. Süd" ); - marker(:de.bft :cat:ac15 :right, nf[:fws] >> 0.5dt); } - + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:fws + 0.5sw, :flw - 1sw]); + } + with link = "point.de.Flensburg-Weiche" { - # Str. 1040 - track(:first:station :double :cat:ac15 :pax, - nf[:fws + 1ssw, :flw.f] + # DE 1000 + track(:first :double:station :cat:ac15 :pax, + nf[:flw - 0.5sw, :flw] << 2dt + .. path("d3.de.1000")[:fri.yf, :fri.yf + 0.1dl] ); - # Str. 1001 - with layer = -4 track(:second:station :closed, - path("d4.de.1001")[:flw.c, :flw.c - 0.1dl] - .. nf[:flw.x, :flw.x + 0.1dl] << 0.5dt + # DE 1001 + track(:second :station :removed, + nf[:flw.x, :flw - 0.5sw] << 2.5dt ); - # Str. A05 - with layer = -5 track(:second:station :removed, - path("d4.de.a05")[:ff + 750m, :ff + 751m] << 1.5dt - .. nf[:flw.x, :flw.x + 0.1dl] << 0.5dt + # DE 1002 + track(:second :station :removed, nf[:flw, :flw.ff] << 1.5dt); + + # DE 1040 + track(:first :double:station :cat:ac15 :pax, + nf[:flw - 1sw, :flw + 1sw] + ); + + marker(:right :de.bbf :cat:ac15 :pax, nf[:flw] >> 0.5dt); + slabel(:right :cat:ac15 :bold, + nf[:flw - 0.5sw] >> 0.5dt >> 1.7sh + (0dt, 0.7sh), + "F.-Weiche" ); + } - # Str. 1000 - with layer = -1 track(:first:station :double :cat:ac15, - path("d4.de.1000")[:flw, :flw.g] + with link = "line.de.1040" { + track(:first :double:leftother :cat:ac15 :pax, + nf[:flw + 1sw, :wil - 0.5sw] ); + } - marker(:de.bbf :cat:ac15 :right, nf[:flw] >> 0.5dt); - slabel(:right :cat:ac15, nf[:flw - 0.4ssw] >> 0.5dt >> 2.2ssw, - span(:bold, "Flensburg Weiche") + with link = "point.de.Flensburg-Wilhelminental" { + track(:first :station :removed, + nf[:wil - 0.5sw, :wil + 0.5sw] << 1.5dt ); + track(:first :double:station :cat:ac15 :pax, + nf[:wil - 0.5sw, :wil + 0.5sw] + ); + marker(:left :de.awanst :removed, nf[:wil] << 1.5dt); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:flw.f, :fle - 1ssw]); + track(:first :double :cat:ac15 :pax, nf[:wil + 0.5sw, :fle - 1sw]); } with link = "point.de.Flensburg" { - track(:first:station :double :cat:ac15 :pax, - nf[:fle - 1ssw, :fle.r] + track(:first :double:station :cat:ac15 :pax, + nf[:fle - 1sw, :fle + 1sw] ); - marker(:de.bf :cat:ac15 :pax :left, nf[:fle] << 0.5dt); - slabel(:right :cat:ac15 :pax, nf[:fle] + (1.2km, 0.7km), - hbox(:left:top :bold :medium, "Flensburg") + marker(:left :de.bf :cat:ac15 :pax, nf[:fle] << 0.5dt); + slabel(:right :cat:ac15 :pax :bold, nf[:fle] + (1.2sw, -1.3sh), + "Flensburg" ); } + } diff --git a/rules/de/a/d3/10/1041.map b/rules/de/a/d3/10/1041.map index 4e8d55f5..e192ff1e 100644 --- a/rules/de/a/d3/10/1041.map +++ b/rules/de/a/d3/10/1041.map @@ -1,56 +1,59 @@ # DE 1041. Neumünster - Ascheberg (Holst) # -let na = path("d4.de.1041"); +let na = path("d3.de.1041"); with detail = 3 { - # point.de.Neumünster de.1220 + # point.de.Neumünster de.1220 with link = "line.de.1041" { - track(:first :removed, na[:neu.hh, :bok - 1ssw]); + track(:second :removed, + na[:neu + 1sw, :neu.yh] >> 1.5dt + .. na[:neu.yyh, :bok - 1sw] + ); + line_label(:left:s :removed, na[:neu.yyh + 3km], "1041"); } with link = "point.de.Bokhorst" { - track(:first:station :removed, na[:bok - 1ssw, :bok + 1ssw]); - marker(:de.bf :removed :left, na[:bok]); - slabel(:top :removed, na[:bok] << 1.4ssw, "Bokhorst"); + track(:second :station :removed, na[:bok - 1sw, :bok + 1sw]); + marker(:left :de.bf :removed, na[:bok]); + slabel(:top :removed, na[:bok] << 1.2sh + (-0.5sw, 0dt), "Bokhorst"); } with link = "line.de.1041" { - track(:first :removed, na[:bok + 1ssw, :wan - 1ssw]); - with layer = 1 line_badge(:removed, na[:bok + 2.7km], "1041"); + track(:second :removed, na[:bok + 1sw, :wan - 1sw]); } with link = "point.de.Wankendorf" { - track(:first :station :removed, na[:wan - 1ssw, :wan + 1ssw]); - marker(:de.bf :removed :right, na[:wan]); - slabel(:right :removed, na[:wan - 2.5ssw] >> 0.6ssw, - hbox(:left:top, "Wankendorf") + track(:second :station :removed, na[:wan - 1sw, :wan + 1sw]); + marker(:right :de.bf :removed, na[:wan]); + slabel(:bottom :removed, na[:wan] >> 1.2sh + (0.5sw, 0dt), + "Wankendorf" ); } with link = "line.de.1041" { - track(:first :removed, na[:wan + 1ssw, :per - 1ssw]); + track(:second :removed, na[:wan + 1sw, :per - 1sw]); } with link = "point.de.Perdoel" { - track(:first :station :removed, na[:per - 1ssw, :per + 1ssw]); - marker(:de.hp :removed:left, na[:per]); - with layer = -1 marker(:de.bf :gone :left, na[:per]); - slabel(:left :removed, na[:per - 0.5ssw] << 1.4ssw, "Perdoel"); + track(:second :station :removed, na[:per - 1sw, :per + 1sw]); + marker(:left :de.hp :removed, na[:per]); + slabel(:top :removed, na[:per] << 1.3sh + (-1sw, 0dt), "Perdoel"); } with link = "line.de.1041" { - track(:first :removed, na[:per + 1ssw, :kal - 1ssw]); + track(:second :removed, na[:per + 1sw, :kal - 1sw]); } with link = "point.de.Kalübbe" { - track(:first :station :removed, na[:kal - 1ssw, :kal + 1ssw]); - marker(:de.hp :removed :left, na[:kal]); - slabel(:left :removed, na[:kal - 0.5ssw] << 1.4ssw, "Kalübbe"); + track(:second :station :removed, na[:kal - 1sw, :kal + 1sw]); + marker(:left :de.hp :removed, na[:kal]); + slabel(:left :removed, na[:kal - 0.5sw] << 1.2sh, "Kalübbe"); } with link = "line.de.1041" { - track(:first :removed, na[:kal + 1ssw, :asc.b]); + track(:second :removed, na[:kal + 1sw, :asc - 1sw]); + line_label(:left:s :removed, na[:asc - 2km], "1041 "); } # point.de.Ascheberg-Holst de.1023 diff --git a/rules/de/a/d3/10/1042.map b/rules/de/a/d3/10/1042.map index 8f3458b4..e8a49b9a 100644 --- a/rules/de/a/d3/10/1042.map +++ b/rules/de/a/d3/10/1042.map @@ -1,177 +1,166 @@ # DE 1042. Neumünster - Heide (Holst) # -let nh = path("d4.de.1042"); +let nh = path("d3.de.1042"); with detail = 3 { # point.de.Neumünster de.1220 with link = "line.de.1042" { - track(:second :pax, nh[:neu.kk, :nst - 1ssw]); + track(:second :pax, + nh[:neu + 1sw, :neu.yh] << 3.5dt + .. nh[:neu.yyh + 1dt, :nst - 1sw] + ); } with link = "point.de.Neumünster-Stadtwald" { - track(:second:station :pax, nh[:nst - 1ssw, :nst + 1ssw]); - marker(:de.hp :pax :open :left, nh[:nst]); - slabel(:left :pax, nh[:nst] >> 1.0dt, "N. Stadtwald"); + track(:second :station :pax, nh[:nst - 1sw, :nst + 1sw]); + marker(:left :de.hp :pax, nh[:nst]); + slabel(:left :pax, nh[:nst + 0.3sw] >> 1.0dt, "N. Stadtwald"); } with link = "line.de.1042" { - track(:second :pax, nh[:nst + 1ssw, :was - 1ssw]); + track(:second :pax, nh[:nst + 1sw, :was - 1sw]); + line_label(:left:n :pax, nh[:nst + 2km], "1042"); } with link = "point.de.Wasbek" { - track(:second:station :pax, nh[:was - 1ssw, :was + 1ssw]); - marker(:de.hp :pax :open :left, nh[:was]); - with layer = -1 marker(:de.bf :gone :left, nh[:was]); - slabel(:bottom :pax, nh[:was] << 1.4ssw, "Wasbek"); + track(:second :station :pax, nh[:was - 1sw, :was + 1sw]); + marker(:left :de.hp :pax, nh[:was]); + marker(:left :de.exbf :pax, nh[:was]); + slabel(:bottom :pax, nh[:was] << 1.7sh, "Wasbek"); } with link = "line.de.1042" { - track(:second :pax, nh[:was + 1ssw, :bun - 1ssw]); + track(:second :pax, nh[:was + 1sw, :bun - 0.7sw]); } with link = "point.de.Bünzenfeld" { - track(:second:station :pax, nh[:bun - 1ssw, :bun + 1ssw]); - marker(:de.ldst :removed :left, nh[:bun]); - slabel(:left:removed, nh[:bun - 1ssw] << 1.0ssw, - hbox(:right:top, "Bünzenfeld") - ); + track(:second :station :pax, nh[:bun - 0.7sw, :bun + 0.7sw]); + marker(:left :de.ldst :removed, nh[:bun]); + slabel(:bottom :removed, nh[:bun] << 1.1sh + (-1sw, 0dt), "Bünzenfeld"); } with link = "line.de.1042" { - track(:second :pax, nh[:bun + 1ssw, :auk - 1ssw]); + track(:second :pax, nh[:bun + 0.7sw, :auk - 1sw]); } with link = "point.de.Aukrug" { - track(:second:station :pax, nh[:auk - 1ssw, :auk + 1ssw]); - marker(:de.hp :pax :open :right, nh[:auk]); - with layer = -1 marker(:de.bf :gone :right, nh[:auk]); - slabel(:top :pax :open, nh[:auk] >> 1.4ssw, - vbox(:center :bottom, - span(:removed, "Innien"), - "Aukrug" - ) - ); + track(:second :station :pax, nh[:auk - 1sw, :auk + 1sw]); + marker(:right :de.hp :pax, nh[:auk]); + marker(:right :de.exbf :pax, nh[:auk]); + slabel(:top :pax, nh[:auk] >> 1.55sh + (0.5sw, 0dt), "Aukrug*"); } with link = "line.de.1042" { - track(:second :pax, nh[:auk + 1ssw, :hwe - 1ssw]); - with layer = 1 line_badge(:pax, nh[:auk + 3km], "1042"); + track(:second :pax, nh[:auk + 1sw, :hwe - 1sw]); + line_label(:left:n :pax, nh[:hwe - 2km], "1042"); } with link = "point.de.Hohenwestedt" { - track(:second:station :pax, nh[:hwe - 1ssw, :hwe + 1ssw]); - marker(:de.bf :pax :open :right, nh[:hwe]); - slabel(:bottom :pax, nh[:hwe - 0.7km] << 0.5dt, - span(:small :bold, "Hohenwestedt") + track(:second :station :pax, nh[:hwe - 1sw, :hwe + 1sw]); + marker(:right :de.bf :pax, nh[:hwe]); + slabel(:right :pax :bold, nh[:hwe + 1.5sw] >> 1.2sh, + "Hohenwestedt" ); } with link = "line.de.1042" { - track(:second :pax, nh[:hwe + 1ssw, :ost - 1ssw]); + track(:second :pax, nh[:hwe + 1sw, :ost - 1sw]); + line_label(:left:n :pax, nh[:ost - 1.5km], "1042 "); } with link = "point.de.Osterstedt" { - track(:second:station :pax, nh[:ost - 1sw, :ost + 1sw]); - marker(:de.hp :pax :open :right, nh[:ost]); - with layer = -1 marker(:de.bf :gone :right, nh[:ost]); - slabel(:top :pax :open, nh[:ost] >> 1.4ssw + (1ssw, 0ssw), - "Osterstedt" - ); + track(:second :station :pax, nh[:ost - 1sw, :ost + 1sw]); + marker(:right :de.hp :pax, nh[:ost]); + marker(:right :de.exbf :pax, nh[:ost]); + slabel(:right :pax, nh[:ost - 0.5sw] >> 1.7sh, "Osterstedt"); } with link = "line.de.1042" { - track(:second :pax, nh[:ost + 1ssw, :ber - 1ssw]); + track(:second :pax, nh[:ost + 1sw, :ber - 1sw]); } with link = "point.de.Beringstedt" { - track(:second:station :pax, nh[:ber - 1ssw, :ber + 1ssw]); - marker(:de.hp :pax :open :left, nh[:ber]); - with layer = -1 marker(:de.bf :gone :left, nh[:ber]); - slabel(:top :pax :open, nh[:ber] >> 1dt, "Beringstedt"); + track(:second :station :pax, nh[:ber - 1sw, :ber + 1sw]); + marker(:left :de.hp :pax, nh[:ber] << 0.1sh); + marker(:left :de.exbf :pax, nh[:ber] << 0.1sh); + slabel(:top :pax, nh[:ber] >> 1.0dt, "Beringstedt"); } with link = "line.de.1042" { - track(:second :pax, nh[:ber + 1ssw, :gok - 1ssw]); + track(:second :pax, nh[:ber + 1sw, :gok - 1sw]); } - with link = "point.de.Gokels" { - track(:second:station :pax, nh[:gok - 1ssw, :gok + 1ssw]); - marker(:de.hp :pax :open :left, nh[:gok]); - with layer = -1 marker(:de.bf :gone :left, nh[:gok]); - slabel(:bottom :pax :open, nh[:gok] << 1.4ssw, "Gokels"); + track(:second :station :pax, nh[:gok - 1sw, :gok + 1sw]); + marker(:left :de.hp :pax, nh[:gok]); + marker(:left :de.exbf :pax, nh[:gok]); + slabel(:bottom :pax, nh[:gok] << 1.7sh, "Gokels"); } with link = "line.de.1042" { - track(:second :pax, nh[:gok + 1ssw, :had - 1ssw]); + track(:second :pax, nh[:gok + 1sw, :had - 1sw]); } with link = "point.de.Hademarschen" { - track(:second:station :pax, nh[:had - 1ssw, :had + 1ssw]); - marker(:de.hp :pax :open :right, nh[:had]); - with layer = -1 marker(:de.bf :gone :right, nh[:had]); - slabel(:top :pax :open, nh[:had] >> 1.4ssw, "Hademarschen"); + track(:second :station :pax, nh[:had - 1sw, :had + 1sw]); + marker(:left :de.hp :pax, nh[:had]); + marker(:left :de.exbf :pax, nh[:had]); + slabel(:bottom :pax, nh[:had] << 1.5sh, "Hademarschen"); } with link = "line.de.1042" { - track(:second :pax, nh[:had + 1ssw, :bel - 1ssw]); + track(:second :pax, nh[:had + 1sw, :bel - 1sw]); + line_label(:right:s :pax, nh[:had + 1.8km], "1042"); } with link = "point.de.Beldorf" { - track(:second:station :pax, nh[:bel - 1ssw, :bel + 1ssw]); - marker(:de.hp :pax :open :left, nh[:bel]); - with layer = -1 marker(:de.bf :gone :left, nh[:bel]); - slabel(:bottom :pax :open, nh[:bel] << 1.4ssw, "Beldorf"); + track(:second :station :pax, nh[:bel - 1sw, :bel + 1sw]); + marker(:left :de.hp :pax, nh[:bel] << 0.1sh); + marker(:left :de.exbf :pax, nh[:bel] << 0.1sh); + slabel(:bottom :pax, nh[:bel] << 1.7sh, "Beldorf"); } with link = "line.de.1042" { - track(:second :pax, nh[:bel + 1ssw, :bed - 1ssw]); + track(:second :pax, nh[:had + 1sw, :bgra]); } with link = "point.de.Beldorf-Dkst" { - track(:second:station :pax, nh[:bed - 1ssw, :bed + 1ssw]); - with layer = -1 marker(:de.dkst :closed :right, nh[:bed]); - } - - with link = "struct.de.Hochbrücke-Grünental" { - slabel(:left, nh[:bgrf] << 1.5dt, - hbox(:right:top :italic, - "Hochbrücke Grünental" - ) - ); + track(:second :station :pax, nh[:bgra, :bgrf]); + marker(:right :de.dkst :removed, nh[:bed]); + slabel(:right :removed, nh[:bed] + (-1sh, -1.5sh), "Beldorf Dkst"); } with link = "line.de.1042" { - track(:second :pax, nh[:bed + 1ssw, :alb - 1ssw]); + track(:second :pax, nh[:bgrf, :alb - 1sw]); } with link = "point.de.Albersdorf" { - track(:second:station :pax, nh[:alb - 1ssw, :alb + 1ssw]); - marker(:de.hp :pax :open :left, nh[:alb]); - with layer = -1 marker(:de.bf :gone :left, nh[:alb]); - slabel(:left :pax :open, nh[:alb - 0.4ssw] << 2.6ssw, "Albersdorf"); + track(:second :station :pax, nh[:alb - 1sw, :alb + 1sw]); + marker(:left :de.hp :pax, nh[:alb]); + marker(:left :de.exbf :pax, nh[:alb]); + slabel(:left :pax, nh[:alb] << 1.8sh + (1.5sw, 0dt), + hbox(:right:top, "Albersdorf") + ); } with link = "line.de.1042" { - track(:second :pax, nh[:alb + 1ssw, :nha - 1ssw]); - with layer = 1 line_badge(:pax, nh[:alb + 4km], "1042"); + track(:second :pax, nh[:alb + 1sw, :nha - 1sw]); } with link = "point.de.Nordhastedt" { - track(:second:station :pax, nh[:nha - 1ssw, :nha + 1ssw]); - marker(:de.hp :pax :open :right, nh[:nha]); - with layer = -1 marker(:de.bf :gone :right, nh[:nha]); - slabel(:top :pax :open, nh[:nha] >> 1.4ssw + (2ssw, 0ssw), - "Nordhastedt" - ); + track(:second :station :pax, nh[:nha - 1sw, :nha + 1sw]); + marker(:right :de.hp :pax, nh[:nha]); + marker(:right :de.exbf :pax, nh[:nha]); + slabel(:right :pax, nh[:nha + 1sw] >> 1.7sh, "Nordhastedt"); } with link = "line.de.1042" { track(:second :pax, - nh[:nha + 1ssw, :hei.bb - 1ssw] - .. nh[:hei - 1.1ssw, :hei - 1ssw] >> 1.5dt + nh[:nha + 1sw, :hei.yyn] + .. nh[:hei.hs, :hei - 1sw] >> 1.5dt ); + line_label(:right:s :pax, nh[:hei.yyn - 1.5km], " 1042"); } # point.de.Heide-Holst de.1210 diff --git a/rules/de/a/d3/10/1043.map b/rules/de/a/d3/10/1043.map index 8ff62d6e..5cbf00e7 100644 --- a/rules/de/a/d3/10/1043.map +++ b/rules/de/a/d3/10/1043.map @@ -1,226 +1,187 @@ # DE 1043. Neumünster - Bad Oldesloe # -let no = path("d4.de.1043"); +let no = path("d3.de.1043"); with detail = 3 { # point.de.Neumünster de.1220 with link = "line.de.1043" { track(:first :pax, - no[:neu + 1ssw, :neu.b + 50m] << 1.5dt - .. no[:nes - 1.1ssw, :nes - 1ssw] << 0.5dt + no[:neu + 1sw, :neu.yo] << 1.5dt + .. no[:neu.yyo, :nes - 1sw] << 0.5dt ); - with layer = -4 track(:first :removed, - no[:neu.b + 49m, :neu.b + 50m] << 0.5dt - .. no[:nes - 1.1ssw, :nes - 1ssw] >> 0.5dt + track(:first :removed, + no[:neu.yo - 0.1dl, :neu.yo] << 0.5dt + .. no[:neu.yyo, :nes - 1sw] >> 0.5dt ); } - with link = "point.de.Neumünster-Süd-AKN" { - track(:first:station :pax, no[:nes - 1ssw, :nes + 1.5ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - no[:nes - 1ssw, :nes + 1.5ssw] >> 0.5dt - ); - track(:second:station :pax, - no[:nes + 0.5ssw, :nes + 1.5ssw] >> 1.5dt - ); - marker(:de.bf :pax :right, no[:nes] >> 0.5dt); - slabel(:right :pax, no[:nes + 0.7ssw] << 1.5dt, - span(:bold, "N. Süd AKN") + with link = "point.de.Neumünster-Süd" { + # DE 1043 + track(:first :station :pax, no[:nes - 1sw, :nes + 1sw] << 0.5dt); + track(:first :station :removed, no[:nes - 1sw, :nes + 1sw] >> 0.5dt); + + # DE 9121 + track(:second :station :pax, + no[:nes - 0.5sw - 2.1dl, :nes - 0.5sw - 2dl] << 0.5dt + -- no[:nes - 0.5sw, :nes + 1sw] >> 1.5dt ); + + marker(:left :de.bf :removed, no[:nes] << 0.5dt); } with link = "line.de.1043" { - track(:first :pax, no[:nes + 1.5ssw, :kku - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:nes + 1.5ssw, :kku - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:nes + 1sw, :kku - 1sw] << 0.5dt); + track(:first :removed, no[:nes + 1sw, :kku - 1sw] >> 0.5dt); + line_label(:left:sw :pax, no[:nes + 2.5km] << 0.5dt, "1043"); } with link = "point.de.Kleinkummerfeld" { - track(:first:station :pax, no[:kku - 1ssw, :kku + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - no[:kku - 1ssw, :kku + 1ssw] >> 0.5dt - ); - with layer = -2 marker(:de.bf :removed, no[:kku] >> 0.5dt); - slabel(:bottom :removed, no[:kku] >> 0.5dt >> 1.8ssw, - vbox(:center:top, " Klein-", "kummerfeld") + track(:first :station :pax, no[:kku - 1sw, :kku + 1sw] << 0.5dt); + track(:first :station :removed, no[:kku - 1sw, :kku + 1sw] >> 0.5dt); + marker(:right :de.bf :removed, no[:kku] >> 0.5dt); + slabel(:left :removed, + no[:kku + 0.5sw] >> 0.5dt >> 1.2sh + (1.5sw, 0dt), + hbox(:right:top, "Kleinkummerfeld*") ); } with link = "line.de.1043" { - track(:first :open :pax, no[:kku + 1ssw, :rio - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:kku + 1ssw, :rio - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:kku + 1sw, :rio - 0.5sw] << 0.5dt); + track(:first :removed, no[:kku + 1sw, :rio - 0.5sw] >> 0.5dt); } with link = "point.de.Rickling-Ölweiche" { - track(:first:station :pax, no[:rio - 1ssw, :rio + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - no[:rio - 1ssw, :rio + 1ssw] >> 0.5dt + track(:first :station :pax, no[:rio - 0.5sw, :rio + 0.5sw] << 0.5dt); + track(:first :station :removed, + no[:rio - 0.5sw, :rio + 0.5sw] >> 0.5dt ); - with layer = -5 marker(:de.hp :gone :left, no[:rio] << 0.5dt); - with layer = -4 marker(:de.anst :removed :left, no[:rio] << 0.5dt); - slabel(:right :removed, no[:rio - 1ssw] << 0.5dt << 1.3ssw, + marker(:left :de.hp :removed, no[:rio] << 0.5dt); + slabel(:right :removed, no[:rio - 1.5sw] << 1.3sh, "Rickling Ölweiche" ); } with link = "line.de.1043" { - track(:first :open :pax, no[:rio + 1ssw, :rin - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:rio + 1ssw, :rin - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:rio + 0.5sw, :rin - 1sw] << 0.5dt); + track(:first :removed, no[:rio + 0.5sw, :rin - 1sw] >> 0.5dt); } with link = "point.de.Rickling" { - track(:first:station :pax, no[:rin - 1ssw, :ric + 1ssw] << 0.5dt); - with layer = -1 track(:first :station :removed, - no[:rin - 1ssw, :ric + 1ssw] >> 0.5dt - ); - marker(:de.hp :pax :left, no[:rin] << 0.5dt); - with layer = -1 marker(:de.bf :removed :left, no[:ric] << 0.5dt); - slabel(:right :pax, no[:ric + 0.5ssw] << 0.5dt << 1.4ssw, "Rickling"); + track(:first :station :pax, no[:rin - 1sw, :rin + 1sw] << 0.5dt); + track(:first :station :removed, no[:rin - 1sw, :rin + 1sw] >> 0.5dt); + marker(:left :de.hp :pax, no[:rin] << 0.5dt); + marker(:left :de.exbf :pax, no[:rin] << 0.5dt); + slabel(:right :pax, no[:rin + 0.7sw] << 0.5dt << 1.7sh, "Rickling"); } with link = "line.de.1043" { - track(:first :pax, no[:ric + 1ssw, :wah - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:ric + 1ssw, :wah - 1ssw] >> 0.5dt - ); - with layer = 1 line_badge(:pax, no[:ric + 3km], "1043"); + track(:first :pax, no[:rin + 1sw, :wah - 1sw] << 0.5dt); + track(:first :removed, no[:rin + 1sw, :wah - 1sw] >> 0.5dt); } with link = "point.de.Wahlstedt" { - track(:first:station :pax, no[:wah - 1ssw, :wah + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - no[:wah - 1ssw, :wah + 1ssw] >> 0.5dt - ); - marker(:de.hp :pax :open :left, no[:wah] << 0.5dt); - slabel(:right :pax :open, no[:wah + 0.5ssw] << 0.5dt << 1.4ssw, - "Wahlstedt" - ); + track(:first :station :pax, no[:wah - 1sw, :wah + 1sw] << 0.5dt); + track(:first :station :removed, no[:wah - 1sw, :wah + 1sw] >> 0.5dt); + marker(:right :de.hp :pax, no[:wah] >> 0.5dt); + slabel(:right :pax, no[:wah + 0.5sw] << 1.5dt, "Wahlstedt"); } with link = "line.de.1043" { - track(:first :pax, no[:wah + 1ssw, :fah - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:wah + 1ssw, :fah - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:wah + 1sw, :fak - 1sw] << 0.5dt); + track(:first :removed, no[:wah + 1sw, :fak - 1sw] >> 0.5dt); } with link = "point.de.Fahrenkrug" { - track(:first :station :pax, no[:fah - 1ssw, :fak + 1ssw] << 0.5dt); - with layer = -4 track(:first :station :removed, - no[:fah - 1ssw, :fak + 1ssw] >> 0.5dt - ); - marker(:de.bft :left, no[:fak] << 0.5dt); - with layer = -2 marker(:de.bf :removed :right, no[:fah] >> 0.5dt); - slabel(:left :open, no[:fak + 1ssw] >> 0.5dt >> 2.2ssw, - "Fahrenkrug" + track(:first :station :pax, no[:fak - 1sw, :fak + 1sw] << 0.5dt); + track(:first :station :removed, no[:fak - 1sw, :fak + 1sw] >> 0.5dt); + marker(:right :de.hp :pax, no[:fak] >> 0.5dt); + marker(:right :de.exbf :pax, no[:fak] >> 0.5dt); + slabel(:left :pax, no[:fak + 1sw] >> 0.5dt >> 1.2sh, + hbox(:right:top, "Fahrenkrug") ); } with link = "line.de.1043" { - track(:first :pax, no[:fak + 1ssw, :seb - 1ssw] << 0.5dt); - with layer = -1 track(:first :removed, - no[:fak + 1ssw, :seb - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:fak + 1sw, :seg - 1sw] << 0.5dt); + track(:first :removed, no[:fak + 1sw, :seg - 1sw] >> 0.5dt); + line_label(:right:n :pax, no[:fak + 2km] >> 0.5dt, "1043 "); } with link = "point.de.Bad-Segeberg" { - track(:first:station :pax, no[:seb - 1ssw, :seg + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - no[:seb - 1ssw, :seg + 1ssw] >> 0.5dt - ); - marker(:de.bf :pax :left, no[:seb] << 0.5dt); - with layer = -1 marker(:de.bf :removed :left, no[:seg] << 0.5dt); - slabel(:right :pax :open, no[:seg - .5ssw] << 0.5dt << 1.5ssw, - span(:small :bold, "Bad Segeberg") + track(:first :station :pax, no[:seg - 1sw, :seg + 1sw] << 0.5dt); + track(:first :station :removed, no[:seg - 1sw, :seg + 1sw] >> 0.5dt); + marker(:left :de.bf :pax, no[:seg] << 0.5dt); + slabel(:right :pax :bold, no[:seg + 0.7sw] << 0.5dt << 1.4sh, + "Bad Segeberg" ); } with link = "line.de.1043" { - track(:first :pax, no[:seg + 1ssw, :ago - 1ssw] << 0.5dt); - with layer = -1 track(:first :removed, - no[:seg + 1ssw, :ago - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:seg + 1sw, :ago - 1sw] << 0.5dt); + track(:first :removed, no[:seg + 1sw, :ago - 1sw] >> 0.5dt); + line_label(:right:ne :pax, no[:ago - 1.5km] >> 0.5dt, "1043"); } with link = "point.de.Altengörs" { - track(:first:station :pax, no[:ago - 1ssw, :ago + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - no[:ago - 1ssw, :ago + 1ssw] >> 0.5dt - ); - marker(:de.hp :pax :left, no[:ago] << 0.5dt); - slabel(:right :pax, no[:ago + 0.7ssw] << 0.5dt << 1.6ssw, "Altengörs"); + track(:first :station :pax, no[:ago - 1sw, :ago + 1sw] << 0.5dt); + track(:first :station :removed, no[:ago - 1sw, :ago + 1sw] >> 0.5dt); + marker(:left :de.hp :pax, no[:ago] << 0.5dt); + slabel(:right :pax, no[:ago + 0.7sw] << 0.5dt << 1.4sh, "Altengörs"); } with link = "line.de.1043" { - track(:first :pax, no[:ago + 1ssw, :wak - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:ago + 1ssw, :wak - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:ago + 1sw, :wkh - 1sw] << 0.5dt); + track(:first :removed, no[:ago + 1sw, :wkh - 1sw] >> 0.5dt); } with link = "point.de.Wakendorf" { - track(:first :station :pax, no[:wak - 1ssw, :wak + 1ssw] << 0.5dt); - with layer = -1 track(:first :station :removed, - no[:wak - 1ssw, :wak + 1ssw] >> 0.5dt - ); - marker(:de.hp :pax :right, no[:wak] >> 0.5dt); - with layer = -2 marker(:de.bf :removed :right, no[:wak] >> 0.5dt); - slabel(:left :pax :open, no[:wak] >> 0.5dt >> 2.2ssw, "Wakendorf"); + track(:first :station :pax, no[:wkh - 1sw, :wkh + 1sw] << 0.5dt); + track(:first :station :removed, no[:wkh - 1sw, :wkh + 1sw] >> 0.5dt); + marker(:right :de.hp :pax, no[:wkh] >> 0.5dt); + marker(:right :de.exbf :pax, no[:wkh] >> 0.5dt); + slabel(:right :pax, no[:wkh + 0.5sw] << 1.5dt, "Wakendorf"); } with link = "line.de.1043" { - track(:first :pax, no[:wak + 1ssw, :frh - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:wak + 1ssw, :frh - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:wkh + 1sw, :frh - 1sw] << 0.5dt); + track(:first :removed, no[:wkh + 1sw, :frh - 1sw] >> 0.5dt); } with link = "point.de.Fresenburg" { - track(:first :station :pax, no[:frh - 1ssw, :fre + 1ssw] << 0.5dt); - with layer = -1 track(:first :station :removed, - no[:frh - 1ssw, :fre + 1ssw] >> 0.5dt - ); - marker(:de.hp :pax :open :right, no[:frh] >> 0.5dt); - with layer = -2 marker(:de.bf :gone :right, no[:fre] >> 0.5dt); - slabel(:left :pax :open, no[:fre + 0.5ssw] >> 0.5dt >> 1.7ssw, + track(:first :station :pax, no[:frh - 1sw, :frh + 1sw] << 0.5dt); + track(:first :station :removed, no[:frh - 1sw, :frh + 1sw] >> 0.5dt); + marker(:right :de.hp :pax, no[:frh] >> 0.5dt); + marker(:right :de.exbf :pax, no[:frh] >> 0.5dt); + slabel(:left :pax, no[:frh + 0.5sw] >> 0.5dt >> 2.0sh, "Fresenburg" ); } with link = "line.de.1043" { - track(:first :pax, no[:fre + 1ssw, :pog - 1ssw] << 0.5dt); - with layer = -4 track(:first :removed, - no[:fre + 1ssw, :pog - 1ssw] >> 0.5dt - ); + track(:first :pax, no[:frh + 1sw, :pog - 0.5sw] << 0.5dt); + track(:first :removed, no[:frh + 1sw, :pog - 0.5sw] >> 0.5dt); + line_label(:left:w :pax, no[:frh + 1.2km] << 0.5dt, "1043"); } with link = "point.de.Poggensee" { - track(:first :station :pax, no[:pog - 1ssw, :pog + 1ssw] << 0.5dt); - with layer = -1 track(:first :station :removed, - no[:pog - 1ssw, :pog + 1ssw] >> 0.5dt - ); - with layer = -2 marker(:de.hp :removed :left, no[:pog] << 0.5dt); - slabel(:left :removed, no[:pog + .6ssw] >> 2.0dt, "Poggensee"); + track(:first :station :pax, no[:pog - 1sw, :pog + 1sw] << 0.5dt); + track(:first :station :removed, no[:pog - 1sw, :pog + 1sw] >> 0.5dt); + marker(:left :de.hp :removed, no[:pog] << 0.5dt); + slabel(:left :removed, no[:pog + 0.6sw] >> 1.8dt, "Poggensee"); } with link = "line.de.1043" { track(:first :pax, - no[:pog + 1ssw, :pog + 1.1ssw] << 0.5dt - .. no[:old.yn - 2.1ssw, :old.yn - 2ssw] >> 0.5dt + no[:pog + 0.5sw, :old.aan] << 0.5dt + .. no[:old - 1.01sw, :old - 1sw] >> 1sh >> 0.5dt ); - with layer = -1 track(:first :removed, - no[:pog + 1ssw, :pog + 1.1ssw] >> 0.5dt - .. no[:old.yn - 2.1ssw, :old.yn - 2ssw] >> 1.5dt + track(:first :removed, + no[:pog + 0.5sw, :old.aan] >> 0.5dt + .. no[:old - 1.01sw, :old - 1sw] >> 1sh >> 1.5dt ); } - # point.de.Bad-Oldesloe de.1120 } diff --git a/rules/de/a/d3/11/1100.map b/rules/de/a/d3/11/1100.map index 91d4627c..3291fb6e 100644 --- a/rules/de/a/d3/11/1100.map +++ b/rules/de/a/d3/11/1100.map @@ -1,321 +1,355 @@ -# DE 1100. Lübeck Hbf (ausschl.) - Puttgarden +# DE 1100. Lübeck Hbf - Puttgarden # -let lp = path("d4.de.1100"); +let lp = path("d3.de.1100"); with detail = 3 { + with link = "point.de.Lübeck-Hbf" { + # DE 1120 - DE 1100 + track(:first :double:station :cat:ac15 :pax, + lp[:lub - 1sw, :lub + 0.5sw + 4dl] + ); + + # DE 1121 + track(:first :station :removed, + lp[:lub - 1sw, :lub + 0.5sw + 2dl] >> 1.5dt + ); + + # DE 1122 + track(:first :station :cat:ac15 :pax, + lp[:lub - 1sw, :lub + 0.5sw + 1dl] >> 2.5dt + -- lp[:lub + 0.5sw + 3dl, :lub + 0.5sw + 3.01dl] >> 0.5dt + ); + track(:first :station :removed, + lp[:lub - 1sw, :lub + 0.5sw] >> 3.5dt + -- lp[:lub + 0.5sw + 1dl, :lub + 0.5sw + 1.01dl] >> 2.5dt + ); + + marker(:right :de.bf :cat:ac15 :pax, lp[:lub] >> 3.5dt); + } + with link = "line.de.1100" { - track(:first :double :cat:ac15 :pax, lp[:lub.a, :wal - 0.5ssw]); + track(:first :double :cat:ac15 :pax, + lp[:lub + 0.5sw + 4dl, :wal - 1sw] + ); + line_label(:left:e :cat:ac15 :pax, lp[:wal - 2.3km] << 0.5dt, "1100"); } with link = "point.de.Schwartau-Waldhalle-Wr" { - with layer = -2 track(:first :station :double :pax, - lp[:wal, :wal + 0.5ssw] + # DE 1100 - 1113 + track(:first :double:station :cat:ac15 :pax, + path("d3.de.1113")[:wal - 1sw, :wal + 2sw] ); - track(:first :station :double :cat:ac15 :pax, - lp[:wal - 0.5ssw, :wal + 0.1dl] - .. path("d4.de.1113")[:aa - 0.1dl, :aa] + + # DE 1100 + track(:first :double:station :pax, + lp[:wal, :wal + 2sw] ); - with layer = -2 marker(:de.abzw :cat:ac15 :left, lp[:wal] << 0.5dt); - slabel(:left :cat:ac15, lp[:wal - 0.4ssw] << 0.5dt << 1.4ssw, - span(:bold :condensed, "S. Waldhalle") + + marker(:left :de.abzw :cat:ac15 :pax, lp[:wal] << 0.5dt); + slabel(:left :cat:ac15 :pax :light, lp[:wal - 0.4sw] << 0.5dt << 1.4sh, + "S.-Waldhalle (Wr)" ); } with link = "line.de.1100" { - with layer = -2 track(:first :double :pax, - lp[:wal + 0.5ssw, :swr - 1ssw] - ); + track(:first :double :pax, lp[:wal + 2sw, :swr - 1sw]); } with link = "point.de.Bad-Schwartau" { - track(:first:station :double :pax, lp[:swr - 1ssw, :swa - 0.5ssw]); - marker(:de.hp :pax :left, lp[:swr] << 0.5dt); - with layer = -1 marker(:de.bf :gone :left, lp[:swr] << 0.5dt); - slabel(:left :pax, lp[:swr - 1.0ssw] << 0.5dt << 1.3ssw, - span(:bold, "Bad Schwartau") + track(:first :double:station :pax, + lp[:swr - 1sw, :swr + 0.5sw] + ); + marker(:left :de.hp :pax, lp[:swr] << 0.5dt); + marker(:left :de.exbf :pax, lp[:swr] << 0.5dt); + slabel(:left :pax :bold, lp[:swr - 0.7sw] << 0.5dt << 1.8sh, + "Bad Schwartau" ); } with link = "point.de.Bad-Schwartau-Abzw" { - track(:first :pax, lp[:swa - 0.5ssw, :swa + 0.5ssw] << 0.5dt); - track(:first :pax, lp[:swa - 0.5ssw, :swa + 0.5ssw] >> 0.5dt); - with layer = -1 marker(:de.abzw :left, lp[:swa] << 0.5dt); + track(:first :double:station :pax, + lp[:swr + 0.5sw, :swa + 0.5sw] + ); + marker(:left :de.abzw :pax, lp[:swa] << 0.5dt); } with link = "line.de.1100" { track(:first :pax, - lp[:swa + 0.5ssw, :aeut.ff - 1km] >> 0.5dt - .. lp[:rat - 2ssw, :rat - 1ssw] + lp[:swa + 0.5sw, :swr.yye] >> 0.5dt + .. lp[:rat - 1.1sw, :rat - 1sw] ); + line_label(:right:nw :pax, lp[:swr.yye] >> 0.5dt, "1100"); } with link = "point.de.Ratekau" { - track(:first :pax, lp[:rat - 1ssw, :rat + 1ssw]); - with layer = -2 marker(:de.bbf :left, lp[:rat]); - with layer = -3 marker(:de.bf :gone :left, lp[:rat]); - slabel(:right, lp[:rat - 0.4ssw] >> 1.7dt, "Ratekau"); + track(:first :station :pax, lp[:rat - 1sw, :rat + 1sw]); + marker(:left :de.bf :pax, lp[:rat]); + slabel(:right :pax, lp[:rat - 0.2sw] >> 2.0dt, "Ratekau"); } with link = "line.de.1100" { - track(:first :pax, lp[:rat + 1ssw, :tim - 1ssw]); + track(:first :pax, lp[:rat + 1sw, :tim - 1sw]); } with link = "point.de.Timmendorferstrand" { - track(:first :station :pax, lp[:tim - 1ssw, :tim + 1ssw]); - marker(:de.bf :pax :right, lp[:tim]); - label(lp[:tim] >> 1.4ssw, - vbox(:left:middle :pax :small, "Timmen-", "dorfer", "Strand") + track(:first :station :pax, lp[:tim - 1sw, :tim + 1sw]); + marker(:right:de.bf :pax, lp[:tim]); + slabel(:right :pax, lp[:tim] >> 1.5sh + (0dt, 0.8sw), + vbox(:left:bottom, "Timmendorfer-", "strand") ); - } with link = "line.de.1100" { - track(:first :pax, lp[:tim + 1ssw, :sar - 1ssw]); + track(:first :pax, lp[:tim + 1sw, :sar - 1sw]); + line_label(:left:ne :pax, lp[:tim + 1.5km], "1100"); } with link = "point.de.Scharbeutz" { - track(:first :station :pax, lp[:sar - 1ssw, :sar + 1ssw]); - marker(:de.bf :pax :right, lp[:sar]); - slabel(:right :pax, lp[:sar - 0.6ssw] >> 1.4ssw, "Scharbeutz"); + track(:first :station :pax, lp[:sar - 1sw, :sar + 1sw]); + marker(:right:de.bf :pax, lp[:sar]); + slabel(:right :pax, lp[:sar - 0.5sw] >> 1.3sh, "Scharbeutz"); } with link = "line.de.1100" { - track(:first :pax, lp[:sar + 1ssw, :haf - 1ssw]); - with layer = 1 line_badge(:pax, lp[:sar + 1.5km], "1100"); + track(:first :pax, lp[:sar + 1sw, :haf - 1sw]); } with link = "point.de.Haffkrug" { - track(:first :station :pax, lp[:haf - 1ssw, :haf + 1ssw]); - marker(:de.bf :pax :right, lp[:haf]); - slabel(:right :pax, lp[:haf - 0.3ssw] >> 1.9ssw, - "Haffkrug" - ); + track(:first :station :pax, lp[:haf - 1sw, :haf + 1sw]); + marker(:right:de.bf :pax, lp[:haf]); + slabel(:right :pax, lp[:haf - 0.5sw] >> 1.9sh, "Haffkrug"); } with link = "line.de.1100" { - track(:first :pax, lp[:haf + 1ssw, :sie - 1ssw]); + track(:first :pax, lp[:haf + 1sw, :sie - 1sw]); } with link = "point.de.Sierksdorf" { - track(:first :station :pax, lp[:sie - 1ssw, :sib + 1ssw]); - marker(:de.bf :pax :right, lp[:sie]); - with layer = -1 marker(:de.bft :left :closed, lp[:sib]); - slabel(:right :pax, lp[:sie - 0.4ssw] >> 2.4ssw, "Sierksdorf"); + track(:first :station :pax, lp[:sie - 1sw, :sie + 1sw]); + marker(:right:de.hp :pax, lp[:sie]); + marker(:right:de.exbf :pax, lp[:sie]); + slabel(:right :pax, lp[:sie] >> 1.8sh + (-0.5sw, 0dt), + hbox(:left:top, "Sierksdorf") + ); } with link = "line.de.1100" { - track(:first :pax, lp[:sib + 1ssw, :neg - 1ssw]); + track(:first :pax, lp[:sie + 1sw, :neg.ns - 1sw]); + line_label(:right:w :pax, lp[:sie + 1.7km], "1100"); } - # point.de.Neustadt-Holst-Gbf: 1023. + # point.de.Neustadt-Holst-Gbf de.1023 with link = "line.de.1100" { - track(:first, lp[:neg + 0.5ssw, :ssl - 0.5ssw]); + track(:first, lp[:neg.nn + 1sw, :ssl.yg]); } with link = "point.de.Südschleuse" { - track(:first :station, lp[:ssl - 0.5ssw, :ssl + 0.5ssw]); - with layer = -1 marker(:de.abzw :removed :left, lp[:ssl]); + track(:first :station, lp[:ssl.yg, :ssl + 0.5sw]); + marker(:left :de.abzw :removed, lp[:ssl]); + slabel(:left :removed, lp[:ssl - 0.5sw] << 1.4sh, "Südschleuse"); } with link = "line.de.1100" { - track(:first, lp[:ssl + 0.5ssw, :has - 0.5ssw]); + track(:first, lp[:ssl + 0.5sw, :has - 0.5sw]); + line_label(:left:e, lp[:ssl + 1.5km], "1100"); } with link = "point.de.Hasselburg" { - track(:first :station, lp[:has - 1ssw, :has + 1ssw]); - with layer = -1 marker(:de.bbf :right, lp[:has]); - slabel(:right, lp[:has - 0.3ssw] >> 1.9ssw, "Hasselburg"); + track(:first :station, lp[:has - 0.5sw, :has + 0.5sw]); + marker(:right :de.bbf, lp[:has]); + marker(:right :de.exbf, lp[:has]); + slabel(:right, lp[:has - 0.5sw] >> 2.3sh, "Hasselburg"); } with link = "line.de.1100" { - track(:first, lp[:has + 1ssw, :gsl - 1ssw]); + track(:first, lp[:has + 0.5sw, :gsl - 0.5sw]); } with link = "point.de.Groß-Schlamin" { - track(:first :station, lp[:gsl - 1ssw, :gsl + 1ssw]); - with layer = -1 marker(:de.bbf :left, lp[:gsl]); - slabel(:left, lp[:gsl - 0.6ssw] << 1.5ssw, "Groß Schlamin"); + track(:first :station, lp[:gsl - 0.5sw, :gsl + 0.5sw]); + marker(:left :de.bbf, lp[:gsl]); + marker(:left :de.exbf, lp[:gsl]); + slabel(:left, lp[:gsl - 0.7sw] << 1.7sh, "Groß Schlamin"); } with link = "line.de.1100" { - track(:first, lp[:gsl + 1ssw, :bes - 1ssw]); + track(:first, lp[:gsl + 0.5sw, :bes - 1sw]); } with link = "point.de.Beschendorf" { - track(:first :station, lp[:bes - 1ssw, :bes + 1ssw]); - with layer = -1 marker(:de.bbf :left, lp[:bes]); - slabel(:left, lp[:bes - 0.6ssw] << 1.6ssw, "Beschendorf"); + track(:first :station, lp[:bes - 1sw, :bes + 1sw]); + marker(:right :de.bbf, lp[:bes]); + marker(:right :de.exbf, lp[:bes]); + slabel(:right, lp[:bes - 0.5sw] >> 2.0sh, "Beschendorf"); } with link = "line.de.1100" { - track(:first, lp[:bes + 1ssw, :len - 1ssw]); + track(:first, lp[:bes + 1sw, :len - 0.5sw]); } with link = "point.de.Lensahn" { - track(:first :station, lp[:len - 1ssw, :len + 1ssw]); - marker(:de.bf :left, lp[:len]); - slabel(:left, lp[:len - 0.6ssw] << 1.6ssw, "Lensahn"); + track(:first :station, lp[:len - 0.5sw, :len + 0.5sw]); + marker(:left :de.bf, lp[:len]); + slabel(:left, lp[:len - 0.6sw] << 1.5sh, "Lensahn"); } with link = "line.de.1100" { - track(:first, lp[:len + 1ssw, :gru - 1ssw]); + track(:first, lp[:len + 0.5sw, :gru - 0.5sw]); } with link = "point.de.Grüner-Hirsch" { - track(:first :station, lp[:gru - 1ssw, :gru + 1ssw]); - with layer = -1 marker(:de.bbf :left, lp[:gru]); - slabel(:left, lp[:gru - 0.6ssw] << 1.6ssw, "Grüner Hirsch"); + track(:first :station, lp[:gru - 0.5sw, :gru + 0.5sw]); + marker(:left :de.bbf, lp[:gru]); + marker(:left :de.exbf, lp[:gru]); + slabel(:left, lp[:gru - 0.6sw] << 2.0sh, "Grüner Hirsch"); } with link = "line.de.1100" { - track(:first, lp[:gru + 1ssw, :old - 2ssw]); - with layer = 1 line_badge(:open, lp[:gru + 2.7km], "1100"); + track(:first, lp[:gru + 0.5sw, :old - 0.5sw]); + line_label(:left:e, lp[:gru + 3km], "1100"); } with link = "point.de.Oldenburg-Holst" { - track(:first :station, lp[:old - 2ssw, :old + 1ssw]); - with layer = -1 marker(:de.bft :left, lp[:old - 1ssw]); - marker(:de.bf :left, lp[:old]); - slabel(:left, lp[:old - 0.3ssw] << 1.5ssw, - hbox(:center:base, - span(:regular, "Oldenburg "), - span(:light, "(Holst) ") - ) + track(:first :station, lp[:old - 0.5sw, :old + 0.5sw]); + marker(:left :de.bf, lp[:old]); + slabel(:left, lp[:old - 0.4sw] << 1.8sh, + hbox(:right:base, "Oldenburg ", span(:light, "(Holst)")) ); } with link = "line.de.1100" { - track(:first, lp[:old + 1ssw, :ols - 1ssw]); + track(:first, lp[:old + 0.5sw, :ols - 0.5sw]); } with link = "point.de.Oldenburg-Holst-Stadt" { - track(:first :station, lp[:ols - 1ssw, :ols + 1ssw]); - with layer = -1 marker(:de.anst :removed :left, lp[:ols]); - with layer = -2 marker(:de.hp :gone :left, lp[:ols]); - slabel(:top :removed, lp[:ols] << 1.4ssw, - hbox(:center:base, - span(:regular, "Oldenburg "), - span(:light, "(Holst) "), - span(:regular, "Stadt") - ) + track(:first :station, lp[:ols - 0.5sw, :ols + 0.5sw]); + marker(:left :de.hp :removed, lp[:ols]); + slabel(:left :removed, lp[:ols] << 1.5sh + (2sh, 0dt), + hbox(:right:base, "Oldenburg ", span(:light, "(Holst)"), " Stadt") ); } with link = "line.de.1100" { - track(:first, lp[:ols + 1ssw, :goh - 1ssw]); + track(:first, lp[:ols + 0.5sw, :goh - 0.5sw]); } with link = "point.de.Göhl" { - track(:first :station, lp[:goh - 1ssw, :goh + 1ssw]); - with layer = -2 marker(:de.bbf :right, lp[:goh]); - slabel(:bottom, lp[:goh] >> 1.2ssw, "Göhl"); + track(:first :station, lp[:goh - 0.5sw, :goh + 0.5sw]); + marker(:right :de.bbf, lp[:goh]); + marker(:right :de.exbf, lp[:goh]); + slabel(:bottom, lp[:goh] >> 1.7sh, "Göhl"); } with link = "line.de.1100" { - track(:first, lp[:goh + 1ssw, :her - 1ssw]); + track(:first, lp[:goh + 0.5sw, :her - 0.5sw]); } with link = "point.de.Heringsdorf-Holst" { - track(:first :station, lp[:her - 1ssw, :her + 1ssw]); - with layer = -1 marker(:de.bf :closed :right, lp[:her]); - with layer = -2 slabel(:right :closed, - lp[:her - 0.4ssw] >> 2.2ssw, - hbox(:center:base, - span(:regular, "Heringsdorf "), - span(:light, "(Holst)") - ) + track(:first :station, lp[:her - 0.5sw, :her + 0.5sw]); + marker(:right :de.bf :removed, lp[:her]); + slabel(:right :removed, lp[:her] >> 1.4sh + (-1.5sw, 0dt), + hbox(:left:top, hbox(:left:base, + "Heringsdorf ", span(:light, "(Holst)") + )) ); } with link = "line.de.1100" { - track(:first, lp[:her + 1ssw, :nki - 1ssw]); + track(:first, lp[:her + 0.5sw, :nki - 0.5sw]); } with link = "point.de.Neukirchen-Holst" { - track(:first :station, lp[:nki - 1ssw, :nki + 1ssw]); - with layer = -2 marker(:de.bbf :left, lp[:nki]); - slabel(:left, lp[:nki - 0.5ssw] << 1.3ssw, - hbox(:center:base, - span(:regular, "Neukirchen "), - span(:light, "(Holst)") - ) + track(:first :station, lp[:nki - 0.5sw, :nki + 0.5sw]); + marker(:left :de.bbf, lp[:nki]); + marker(:left :de.exbf, lp[:nki]); + slabel(:left, lp[:nki] << 2.2sh + (2.0sw, 0dt), + hbox(:right:base, "Neukirchen ", span(:light, "(Holst)")) ); } with link = "line.de.1100" { - track(:first, lp[:nki + 1ssw, :lus - 1ssw]); + track(:first, lp[:nki + 0.5sw, :lus - 0.5sw]); + line_label(:right:w, lp[:nki + 1.6km], "1100"); } with link = "point.de.Lütjenbrode-Süd" { - track(:first :station, lp[:lus - 1ssw, :lus + 1ssw]); - with layer = -1 marker(:de.abzw :removed :right, lp[:lus]); + track(:first :station, lp[:lus - 0.5sw, :lus.yh + 0.5sw]); + marker(:left :de.abzw :removed, lp[:lus]); + slabel(:left :removed, lp[:lus - 0.7sw] << 1.5sh, + "L. Süd" + ); } with link = "line.de.1100" { - track(:first, lp[:lus + 1ssw, :luo - 1ssw]); + track(:first, lp[:lus.yh + 0.5sw, :luo - 0.5sw]); } with link = "point.de.Lütjenbrode-Ost" { - track(:first :station, lp[:luo - 1ssw, :luo + 1ssw]); - with layer = -1 marker(:de.anst :removed :left, lp[:luo]); - with layer = -2 marker(:de.abzw :gone :left, lp[:luo]); + track(:first :station, lp[:luo - 0.5sw, :luo + 0.5sw]); + marker(:left :de.abzw :removed, lp[:luo]); + slabel(:top :removed, lp[:luo] << 1.2sh, + "L. Ost" + ); } with link = "line.de.1100" { - track(:first, lp[:luo + 1ssw, :gbr - 1ssw]); + track(:first, lp[:luo + 0.5sw, :gbr - 0.5sw]); } with link = "point.de.Großenbrode" { - track(:first :station, lp[:gbr - 1ssw, :gbr + 1ssw]); - marker(:de.bf :left, lp[:gbr]); - with layer = -1 slabel(:right, lp[:gbr - 0.4ssw] + (5pt, 3pt), - span(:bold, "Großenbrode") - ); + track(:first :station, lp[:gbr - 0.5sw, :gbr + 0.5sw]); + marker(:left :de.bf, lp[:gbr]); + slabel(:left :bold, lp[:gbr - 0.4sw] << 1.3sh, "Großenbrode"); } with link = "line.de.1100" { - track(:first, lp[:gbr + 1ssw, :bfea]); + track(:first, lp[:gbr + 0.5sw, :bfea]); } with link = "struct.de.Fehmarnsundbrücke" { track(:first, lp[:bfea, :bfef]); - slabel(:left, lp[:bfea + 450m] << 2dt, - span(:italic, "Fehmarnsundbrücke") + slabel(:left :italic, lp[:bfea + 0.2km] << 1.5dt, + "Fehmarnsundbrücke" ); } with link = "line.de.1100" { - track(:first, lp[:bfef, :str - 1ssw]); + track(:first, lp[:bfef, :str - 0.5sw]); + line_label(:left:e, lp[:str - 1.5km], "1100"); } with link = "point.de.Strukkamp" { - track(:first :station, lp[:str - 1ssw, :str + 1ssw]); - with layer = -1 marker(:de.bbf :left, lp[:str]); - slabel(:left, lp[:str - 0.4ssw] << 1.3ssw, "Strukkamp"); + track(:first :station, lp[:str - 0.5sw, :str + 0.5sw]); + marker(:left :de.bbf, lp[:str]); + slabel(:left, lp[:str - 0.5sw] << 1.4sh, "Strukkamp"); } with link = "line.de.1100" { - track(:first, lp[:str + 1ssw, :buw - 1ssw]); + track(:first, lp[:str + 0.5sw, :buw - 0.5sw]); } with link = "point.de.Burg-Fehmarn-West" { - track(:first :station, lp[:buw - 1ssw, :buw + 1ssw]); - with layer = -1 marker(:de.bbf :right, lp[:buw]); - with layer = -1 marker(:de.hp.casing :right, lp[:buw]); + track(:first :station, lp[:buw - 0.5sw, :buw + 0.5sw]); + with layer = 2 marker(:right :de.bbf, lp[:buw]); + with layer = 1 marker(:right :de.bf.casing, lp[:buw]); + slabel(:left, lp[:buw] << 0.5dt, + vbox(:right:bottom, + hbox(:right:base, span(:bold, "Burg "), "(F.)"), + span(:bold, "West") + ) + ); } with link = "line.de.1100" { - track(:first, lp[:buw + 1ssw, :put - 1ssw]); - with layer = 1 line_badge(:open, lp[:buw + 3.2km], "1100"); + track(:first, lp[:buw + 0.5sw, :put - 0.5sw]); + line_label(:right:nw, lp[:put - 3km], "1100"); } with link = "point.de.Puttgarden" { - track(:first :station, lp[:put - 1ssw, :put + 0.6ssw]); - marker(:de.bf :left, lp[:put]); - slabel(:left, lp[:put - 0.7ssw] << 1.5ssw, - span(:bold, "Puttgarden") - ); + track(:first :station, lp[:put - 0.5sw, :put + 0.5sw]); + marker(:left :de.bf, lp[:put]); + slabel(:left :bold, lp[:put - 0.5sw] << 1.4sh, "Puttgarden"); } } diff --git a/rules/de/a/d3/11/1103.map b/rules/de/a/d3/11/1103.map index adf163a1..7ca8c8b8 100644 --- a/rules/de/a/d3/11/1103.map +++ b/rules/de/a/d3/11/1103.map @@ -1,146 +1,124 @@ # DE 1103. Fehmarnsund - Orth (Fehmarn) # -let fo = path("d4.de.1103"); +let fo = path("d3.de.1103"); with detail = 3 { with link = "point.de.Fehmarnsund" { - track(:third:station :removed, fo[:feh.a, :feh.a + 1.5ssw]); - marker(:de.bf :removed :right, fo[:feh.a + 0.5sw]); - slabel(:right :removed, fo[:feh.a] >> 2.1ssw, - span(:bold, "Fehmarnsund") - ); + track(:third :station :removed, fo[:feh - 0.5sw, :feh + 0.5sw]); + marker(:right :de.bf :removed, fo[:feh]); + slabel(:right :removed :bold, fo[:feh - 0.5sw] >> 2.0sh, "Fehmarnsund"); } with link = "line.de.1103" { - track(:third :removed, fo[:feh.f, :wul - 1ssw]); + track(:third :removed, fo[:feh + 0.5sw, :wul - 0.5sw]); } with link = "point.de.Wulfen-Fehmarn" { - track(:third:station :removed, fo[:wul - 1ssw, :wul + 1ssw]); - marker(:de.hp :removed :left, fo[:wul]); - slabel(:right :removed, fo[:wul - 0.4ssw] >> 1dt >> 3pt, - hbox(:center:base, - span(:regular, "Wulfen "), - span(:light, "(Fehmarn)") - ) + track(:third :station :removed, fo[:wul - 0.5sw, :wul + 0.5sw]); + marker(:left :de.hp :removed, fo[:wul]); + slabel(:right :removed, fo[:wul - 0.7sw] >> 3.0dt, + hbox(:left:base, "Wulfen ", span(:light, "(Fehmarn)")) ); } with link = "line.de.1103" { - track(:third :removed, fo[:wul + 1ssw, :bus - 1ssw]); - - guide(:linenum :removed, - fo[:wul + 1km] << 0.7dt - -- fo[:wul + 1km] << 2dt - ); - label(:linenum, fo[:wul + 1km] << 2dt, - hbox(:center:bottom :badgesize :removed, "1103") - ); + track(:third :removed, fo[:wul + 0.5sw, :bus - 0.5sw]); + line_label(:left:s :removed, fo[:wul + 1.4km], "1103 "); } with link = "point.de.Burgstaaken" { - track(:third:station :removed, fo[:bus - 1ssw, :bus + 1ssw]); - marker(:de.hp :removed :right, fo[:bus]); - slabel(:right :removed, fo[:bus - 0.1ssw] >> 1.8ssw, + track(:third :station :removed, fo[:bus - 0.5sw, :bus + 0.5sw]); + marker(:right :de.hp :removed, fo[:bus]); + slabel(:right :removed, fo[:bus] >> 1.5sh + (0dt, 0.4sh), "Burgstaaken" ); } with link = "line.de.1103" { - track(:third :removed, fo[:bus + 1ssw, :bur - 1ssw]); + track(:third :removed, fo[:bus + 0.5sw, :bur - 0.5sw]); } with link = "point.de.Burg-Fehmarn" { - track(:second:station :removed, fo[:bur - 1ssw, :bur - 0.5ssw]); - track(:second:station, fo[:bur - 0.5ssw, :bur + 1ssw]); - - marker(:de.bft :right, fo[:bur]); - with layer = -1 marker(:de.bf :gone :right, fo[:bur]); - slabel(:right, fo[:bur - 0.6ssw] >> 1.4ssw, - span(:bold, "Fehmarn-Burg") + track(:third :station, fo[:bur - 0.5sw, :bur + 0.5sw]); + marker(:right :de.bf, fo[:bur]); + slabel(:right, fo[:bur - 0.5sw] >> 1.5sh, + hbox(:left:base, span(:bold, "Fehmarn-Burg"), "*") ); } - with link = "line.de.1103", layer = -2 { - let lp = path("d4.de.1100"); + with link = "line.de.1103" { + track(:third, fo[:bur + 0.5sw, :bua - 0.2sw]); + with zoom = :high line_label(:right:sw, fo[:bur + 0.4km], "1103"); + } - track(:second, - fo[:bur + 1ssw, :bur + 1.1ssw] - .. lp[:fort + 0.1ssw, :fort] - ); - track(:second :removed, - lp[:fort + 0.1ssw, :fort] - .. fo[:fort + 300m, :lan - 1ssw] + with link = "point.de.Burg-Fehmarn-Abzw" { + track(:third :station, fo[:bua - 0.2sw, :bua + 0.2sw]); + marker(:right :de.abzw, fo[:bua]); + } + + with link = "line.de.1103" { + track(:third, fo[:bua + 0.2sw, :buw.ys]); + + with layer = -1 track(:third :removed, + path("d3.de.1103.bur")[:bur.yl, :lan - 0.5sw] ); } with link = "point.de.Landkirchen" { - track(:third:station :removed, fo[:lan - 1ssw, :lan + 1ssw]); - marker(:de.bf :removed :left, fo[:lan]); - slabel(:left:removed, fo[:lan - 0.7ssw] << 2.8ssw + (1ssw, 0ssw), - "Landkirchen" + track(:third :station :removed, fo[:lan - 0.5sw, :lan + 0.5sw]); + marker(:left :de.bf :removed, fo[:lan]); + slabel(:left :removed, fo[:lan] << 1.2sh + (1.5sw, 0dt), + hbox(:right:top, "Landkirchen") ); } with link = "line.de.1103" { - track(:third :removed, fo[:lan + 1ssw, :aje - 1ssw]); - - guide(:linenum :removed, - fo[:lan + 1km] >> 0.7dt - -- fo[:lan + 1km] >> 2dt - ); - label(:linenum, fo[:lan + 1km] >> 2dt, - hbox(:center:bottom :badgesize :removed, " 1103") - ); + track(:third :removed, fo[:lan + 0.5sw, :aje - 0.5sw]); } with link = "point.de.Alt-Jellingsdorf" { - track(:third:station :removed, fo[:aje - 1ssw, :aje + 1ssw]); - marker(:de.hp :removed :left, fo[:aje]); - slabel(:left :removed, fo[:aje - 0.7ssw] << 3.0ssw + (2ssw, 0ssw), - "Alt Jellingsd." + track(:third :station :removed, fo[:aje - 0.5sw, :aje + 0.5sw]); + marker(:left :de.hp :removed, fo[:aje]); + slabel(:right :removed, fo[:aje - 0.7sw] >> 1.0dt, + "Alt Jellingsdorf" ); } with link = "line.de.1103" { - track(:third :removed, fo[:aje + 1ssw, :lem - 1ssw]); + track(:third :removed, fo[:aje + 0.5sw, :lem - 0.5sw]); } with link = "point.de.Lemkendorf" { - track(:third:station :removed, fo[:lem - 1ssw, :lem + 1ssw]); - marker(:de.hst :removed :right, fo[:lem]); - with layer = -1 marker(:de.bf :gone :right, fo[:lem]); - slabel(:right :removed, fo[:lem] >> 1.4ssw, "Lemkendorf"); + track(:third :station :removed, fo[:lem - 0.5sw, :lem + 0.5sw]); + marker(:right :de.hst :removed, fo[:lem]); + marker(:right :de.exbf :removed, fo[:lem]); + slabel(:right :removed, fo[:lem] >> 1.8sh + (0.3sw, 0.5sw), + "Lemkendorf" + ); } with link = "line.de.1103" { - track(:third :removed, fo[:lem + 1ssw, :pet - 1ssw]); + track(:third :removed, fo[:lem + 0.5sw, :pet - 0.5sw]); } with link = "point.de.Petersdorf-Fehmarn" { - track(:third:station :removed, fo[:pet - 1ssw, :pet + 1ssw]); - marker(:de.bf :removed :right, fo[:pet]); - slabel(:top :removed, fo[:pet] >> 1.4ssw, - vbox(:center:base, - span(:regular, "Petersdorf"), - span(:light, "(Fehmarn)") - ) + track(:third :station :removed, fo[:pet - 0.5sw, :pet + 0.5sw]); + marker(:right :de.bf :removed, fo[:pet]); + slabel(:top :removed, fo[:pet] >> 1.2sh, + vbox(:center:bottom, "Petersdorf", span(:light, "(Fehmarn)")) ); } with link = "line.de.1103" { - track(:third :removed, fo[:pet + 1ssw, :ort - 1ssw]); + track(:third :removed, fo[:pet + 0.5sw, :ort - 0.5sw]); + line_label(:right:e :removed, fo[:pet + 1.8km], "1103"); } with link = "point.de.Orth-Fehmarn" { - track(:third:station :removed, fo[:ort - 1ssw, :ort.f]); - marker(:de.hst :removed :left, fo[:ort]); - with layer = -1 marker(:de.bf :gone :left, fo[:ort]); - slabel(:left :removed, fo[:ort + 0.4ssw] >> 1dt, - hbox(:center:base, - span(:bold, "Orth "), - span(:regular, "(Fehmarn)") - ) + track(:third :station :removed, fo[:ort - 0.5sw, :ort]); + marker(:top :de.bf :removed, fo[:ort]); + slabel(:bottom :removed, fo[:ort] + (0.3sw, 1.2sh), + vbox(:center:top, span(:bold, "Orth"), "(Fehmarn)") ); } } diff --git a/rules/de/a/d3/11/1104.map b/rules/de/a/d3/11/1104.map new file mode 100644 index 00000000..ebb3f097 --- /dev/null +++ b/rules/de/a/d3/11/1104.map @@ -0,0 +1,15 @@ +# DE 1104. Burg (Fehmarn) Abzw - Burg West Nordkurve +# +let bb = path("d3.de.1104"); + +with detail = 3 { + # point.de.Burg-Fehmarn-Abzw line.de.1103 + + with link = "line.de.1104" { + track(:second, bb[:bua, :buw.yn]); + } + + # point.de.Burg-West-Nordkurve line.de.1100 + +} + diff --git a/rules/de/a/d3/11/1110.map b/rules/de/a/d3/11/1110.map index b50b395a..def4f66b 100644 --- a/rules/de/a/d3/11/1110.map +++ b/rules/de/a/d3/11/1110.map @@ -1,81 +1,76 @@ -# DE 1110. Eutin - Bad Schwartau Abzw (ausschl.) +# DE 1110. Eutin - Lübeck Hbf # -let el = path("d4.de.1110"); +let el = path("d3.de.1110"); with detail = 3 { + # point.de.Eutin de.1023 + with link = "line.de.1110" { track(:first :pax, - el[:eut + 1ssw, :eut.x] >> 0.5dt - .. el[:eut.gg + 0.2km, :boc - 1ssw] + el[:eut + 0.5sw, :eut.yl] >> 0.5dt + .. el[:eut.yyl + 1sw, :boc - 0.5sw] ); + line_label(:right:e :pax, el[:boc - 1.2km], "1110"); } with link = "point.de.Bockholt" { - track(:first:station :pax, el[:boc - 1ssw, :boc + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, el[:boc]); - slabel(:left :removed, el[:boc + 0.35ssw] >> 1.7ssw, "Bockholt"); + track(:first :station :pax, el[:boc - 0.5sw, :boc + 0.5sw]); + marker(:right :de.hp :removed, el[:boc]); + slabel(:left :removed, el[:boc + 0.5sw] >> 1.7sh, "Bockholt"); } with link = "line.de.1110" { - track(:first :pax, el[:boc + 1ssw, :ott - 1ssw]); - with layer = 1 line_badge(:open :pax, el[:boc + 1.7km], "1110"); + track(:first :pax, el[:boc + 0.5sw, :ott - 0.5sw]); } with link = "point.de.Ottendorf-Holst" { - track(:first:station :pax, el[:ott - 1ssw, :ott + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, el[:ott]); - slabel(:left :removed, el[:ott + 0.5ssw] >> 1.5ssw, - hbox(:right:base, - span(:regular, "Ottendorf "), - span(:light, "(Holst)") - ) + track(:first :station :pax, el[:ott - 0.5sw, :ott + 0.5sw]); + marker(:right :de.bf :removed, el[:ott]); + slabel(:left :removed, el[:ott + 0.55sw] >> 1.5sh, + hbox(:right:base, "Ottendorf ", span(:light, "(Holst)")) ); } with link = "line.de.1110" { - track(:first :pax, el[:ott + 1ssw, :pon - 1ssw]); + track(:first :pax, el[:ott + 0.5sw, :pon - 0.5sw]); + line_label(:left:w :pax, el[:pon - 1.8km], "1110"); } with link = "point.de.Pönitz-Holst" { - track(:first:station :pax, el[:pon - 1ssw, :pon + 1ssw]); - marker(:de.bf :pax :right, el[:pon]); - label(el[:pon] << 1.0dt, - vbox(:left:middle :small :pax, - span(:bold, "Ponitz"), - span(:regular, " (Holst)") - ) + track(:first :station :pax, el[:pon - 0.5sw, :pon + 0.5sw]); + marker(:right :de.bf :pax, el[:pon]); + slabel(:right:pax, el[:pon + 0.6sw] << 1.2dt, + hbox(:left:base, span(:bold, "Pönitz "), "(Holst)*") ); } with link = "line.de.1110" { - track(:first :pax, el[:pon + 1ssw, :gle - 1ssw]); + track(:first :pax, el[:pon + 0.5sw, :gle - 0.5sw]); } with link = "point.de.Gleschendorf" { - track(:first:station :pax, el[:gle - 1ssw, :gle + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, el[:gle]); - slabel(:right :removed, el[:gle + 0.3ssw] << 0.7dt, - "Gleschend." - ); + track(:first :station :pax, el[:gle - 0.5sw, :gle + 0.5sw]); + marker(:right :de.hp :removed, el[:gle]); + slabel(:right :removed, el[:gle + 0.6sw] << 1.2dt, "Gleschendorf*"); } - + with link = "line.de.1110" { - track(:first :pax, el[:gle + 1ssw, :pan - 1ssw]); - with layer = 1 line_badge(:open :pax, el[:pan - 1.7km], "1110"); + track(:first :pax, el[:gle + 0.5sw, :pan - 0.5sw]); + line_label(:left:w :pax, el[:gle + 2km], "1110"); } with link = "point.de.Pansdorf" { - track(:first:station :pax, el[:pan - 1ssw, :pan + 1ssw]); - marker(:de.bf :pax :left, el[:pan]); - slabel(:left :pax, el[:pan + 0.4ssw] >> 2dt, "Pansdorf"); + track(:first :station :pax, el[:pan - 0.5sw, :pan + 0.5sw]); + marker(:right :de.bf :pax, el[:pan]); + slabel(:left :pax, el[:pan + 0.4sw] >> 1.8sh, "Pansdorf"); } with link = "line.de.1110" { track(:first :pax, - el[:pan + 1ssw, :f - 300m] - .. path("d4.de.1100")[:aeut, :swa + 0.5ssw] >> 0.5dt + el[:pan + 0.5sw, :swr.yye - 2dt] + .. el[:swr.ye, :swa - 0.5sw] >> 0.5dt ); + line_label(:right:e :pax, el[:swr.yye - 1km], "1110"); } } - diff --git a/rules/de/a/d3/11/1111.map b/rules/de/a/d3/11/1111.map index e16b940a..221be8c3 100644 --- a/rules/de/a/d3/11/1111.map +++ b/rules/de/a/d3/11/1111.map @@ -1,43 +1,48 @@ -# DE 1111. Pönitz (Holst) (ausschl.) - Ahrensbök +# DE 1111. Pönitz (Holst) - Ahrensbök # -let pa = path("d4.de.1111"); +let pa = path("d3.de.1111"); with detail = 3 { + # point.de.Pönitz-Holst de.1110 + with link = "line.de.1111" { - track(:second :removed, pa[:aahr, :bra - 1ssw]); - with layer = 1 line_badge(:removed, pa[:bra - 1.4km], "1111"); + track(:second :removed, + pa[:pon + 0.52sw, :pon.ya] >> 1dt + .. pa[:pon.ffa, :bra - 0.5sw] + ); } - + with link = "point.de.Brauner-Hirsch" { - track(:second:station :removed, pa[:bra - 1ssw, :bra + 1ssw]); - marker(:de.hp :removed :right, pa[:bra]); - slabel(:left :removed, pa[:bra - 1ssw] >> 1.5ssw, "Brauner Hirsch"); + track(:second :station :removed, pa[:bra - 0.5sw, :bra + 0.5sw]); + marker(:right :de.hp :removed, pa[:bra]); + slabel(:left :removed, pa[:bra] >> 1.5sh + (2sw, 0dt), + "Brauner Hirsch" + ); } with link = "line.de.1111" { - track(:second :removed, pa[:bra + 1ssw, :hol - 1ssw]); + track(:second :removed, pa[:bra + 0.5sw, :hol - 0.5sw]); + line_label(:left:nw :removed, pa[:bra + 1.0km], "1111"); } with link = "point.de.Holstendorf" { - track(:second:station :removed, pa[:hol - 1ssw, :hol + 1ssw]); - marker(:de.bf :removed :right, pa[:hol]); - slabel(:left :removed, pa[:hol + 0.8ssw] >> 1.5ssw, - "Holstendorf" + track(:second :station :removed, pa[:hol - 0.5sw, :hol + 0.5sw]); + marker(:right :de.hp :removed, pa[:hol]); + slabel(:left :removed, pa[:hol + 0.5sw] >> 1.0sh, + "Holstendorf*" ); } with link = "line.de.1111" { - track(:second :removed, pa[:hol + 1ssw, :ahr - 1ssw]); + track(:second :removed, pa[:hol + 0.5sw, :ahr - 0.5sw]); } - with link = "point.de.Ahrensbök" { - track(:second:station :removed, pa[:ahr - 1ssw, :f]); - marker(:de.bf :removed :right, pa[:ahr]); - slabel(:left :removed, pa[:ahr + 0.6ssw] >> 1.5ssw, - span(:bold, "Ahrensbök") + track(:second :station :removed, pa[:ahr - 0.5sw, :ahr + 0.5sw]); + marker(:right :de.bf :removed, pa[:ahr]); + slabel(:left :removed :bold, pa[:ahr + 0.5sw] >> 1.3sh, + "Ahrensbök" ); } - } diff --git a/rules/de/a/d3/11/1112.map b/rules/de/a/d3/11/1112.map index d84e55b3..5efc8843 100644 --- a/rules/de/a/d3/11/1112.map +++ b/rules/de/a/d3/11/1112.map @@ -1,125 +1,122 @@ -# DE 1112. Bad Malente-Gremsmühlen (ausschl.) - Lütjenburg +# DE 1112. Bad Malente-Gremsmühlen - Lütjenburg # -let ml = path("d4.de.1112"); +let ml = path("d3.de.1112"); with detail = 3 { + # point.de.Malente-Gremsmühlen de.1023 + with link = "line.de.1112" { - track(:second :closed, ml[:mal.bbb, :man - 1ssw]); + let kn = path("d3.de.1023"); + + track(:second :closed, + kn[:mal + 0.01sw, :mal] >> 1sh >> 0.5dt + .. ml[:mal.aal, :man - 0.5sw] + ); + line_label(:left:e :closed, ml[:mal.aal], "1112"); } with link = "point.de.Malente-Nord" { - track(:second:station :closed, ml[:man - 1ssw, :man + 1ssw]); - marker(:de.hp :closed :left, ml[:man]); - slabel(:left :closed, ml[:man + 1ssw] << 1.5ssw, "Malente Nord"); + track(:second :station :closed, ml[:man - 0.5sw, :man + 0.5sw]); + marker(:left :de.hp :removed, ml[:man]); + slabel(:left :removed, ml[:man] << 1.6sh + (1.5sw, 0dt), + "Malente Nord" + ); } with link = "line.de.1112" { - track(:second :closed, ml[:man + 1ssw, :hol - 1ssw]); + track(:second :closed, ml[:man + 0.5sw, :hol - 0.5sw]); } with link = "point.de.Holsteinische-Schweiz" { - track(:second:station :closed, ml[:hol - 1ssw, :hol + 1ssw]); - marker(:de.hp :closed :right, ml[:hol]); - with layer = -1 marker(:de.bf :gone :right, ml[:hol]); - slabel(:right :closed, ml[:hol] >> 2.2ssw, + track(:second :station :closed, ml[:hol - 0.5sw, :hol + 0.5sw]); + marker(:right :de.hp :removed, ml[:hol]); + slabel(:right :removed, ml[:hol] >> 1.4sh + (0.4sw, 0.6sw), "Holsteinische Schweiz" ); } with link = "line.de.1112" { - track(:second :closed, ml[:hol + 1ssw, :bru - 1ssw]); + track(:second :closed, ml[:hol + 0.5sw, :bru - 0.5sw]); } with link = "point.de.Bruhnskoppel" { - track(:second:station :closed, ml[:bru - 1ssw, :bru + 1ssw]); - marker(:de.hp :closed :left, ml[:bru]); - slabel(:left :closed, ml[:bru - 0.8ssw] << 1.4ssw, + track(:second :station :closed, ml[:bru - 0.5sw, :bru + 0.5sw]); + marker(:left :de.hp :removed, ml[:bru] << 0.1sh); + slabel(:left :removed, ml[:bru] << 1.4sh + (-0.4sw, 0.6sw), "Bruhnskoppel" ); } with link = "line.de.1112" { - track(:second :closed, ml[:bru + 1ssw, :maw - 1ssw]); + track(:second :closed, ml[:bru + 0.5sw, :maw - 0.5sw]); } with link = "point.de.Malkwitz" { - track(:second:station :closed, ml[:maw - 1ssw, :maw + 1ssw]); - marker(:de.hp :closed :left, ml[:maw]); - slabel(:left :closed, ml[:maw - 0.4ssw] << 1.4ssw, "Malkwitz"); + track(:second :station :closed, ml[:maw - 0.5sw, :maw + 0.5sw]); + marker(:left :de.hp :removed, ml[:maw]); + slabel(:left :removed, ml[:maw - 0.5sw] << 1.4sh, "Malkwitz"); } with link = "line.de.1112" { - track(:second :closed, ml[:maw + 1ssw, :ben - 1ssw]); + track(:second :closed, ml[:maw + 0.5sw, :ben - 0.5sw]); + line_label(:right:w :closed, ml[:maw + 0.7km], "1112"); } with link = "point.de.Benz" { - track(:second:station :closed, ml[:ben - 1ssw, :ben + 1ssw]); - marker(:de.anst :closed :left, ml[:ben]); - with layer = -1 marker(:de.bf :removed :left, ml[:ben]); - slabel(:left :closed, ml[:ben - 0.6ssw] << 1.4ssw, "Benz"); + track(:second :station :closed, ml[:ben - 0.5sw, :ben + 0.5sw]); + marker(:left :de.bf :closed, ml[:ben]); + slabel(:left :closed, ml[:ben - 0.55sw] << 1.4sh, "Benz"); } with link = "line.de.1112" { - track(:second :closed, ml[:ben + 1ssw, :fle - 1ssw]); + track(:second :closed, ml[:ben + 0.5sw, :fle - 0.5sw]); } with link = "point.de.Flehm" { - track(:second:station :closed, ml[:fle - 1ssw, :fle + 1ssw]); - marker(:de.hp :closed :right, ml[:fle]); - slabel(:right :closed, ml[:fle - 0.6ssw] >> 1.6ssw, "Flehm"); + track(:second :station :closed, ml[:fle - 0.5sw, :fle + 0.5sw]); + marker(:right :de.hp :removed, ml[:fle]); + slabel(:right :removed, ml[:fle - 0.6sw] >> 1.4sh, "Flehm"); } with link = "line.de.1112" { - track(:second :closed, ml[:fle + 1ssw, :kle - 1ssw]); + track(:second :closed, ml[:fle + 0.5sw, :kle - 0.5sw]); } with link = "point.de.Kletkamp" { - track(:second:station :closed, ml[:kle - 1ssw, :kle + 1ssw]); - marker(:de.hst :closed :right, ml[:kle]); - with layer = -1 marker(:de.bf :gone :right, ml[:kle]); - slabel(:right :closed, ml[:kle] >> 1.6ssw + (0ssw, 0.5ssw), - "Kletkamp" - ); + track(:second :station :closed, ml[:kle - 0.5sw, :kle + 0.5sw]); + marker(:right :de.bf :removed, ml[:kle] >> 0.1sh); + slabel(:right :removed, ml[:kle] >> 1.6sh + (0dt, 0.5sw), "Kletkamp"); } with link = "line.de.1112" { - track(:second :closed, ml[:kle + 1ssw, :ble - 1ssw]); + track(:second :closed, ml[:kle + 0.5sw, :ble - 0.5sw]); } with link = "point.de.Blekendorf" { - track(:second:station :closed, ml[:ble - 1ssw, :ble + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, ml[:ble]); - slabel(:right :closed, ml[:ble - 0.7ssw] >> 1.4ssw, "Blekendorf"); + track(:second :station :closed, ml[:ble - 0.5sw, :ble + 0.5sw]); + marker(:right :de.hp :removed, ml[:ble]); + slabel(:right :removed, ml[:ble - 0.6sw] >> 1.2sh, "Blekendorf"); } with link = "line.de.1112" { - track(:second :closed, ml[:ble + 1ssw, :fre - 1ssw]); - with layer = 1 line_badge(:closed, ml[:ble + 1.0km], "1112"); + track(:second :closed, ml[:ble + 0.5sw, :fre - 0.5sw]); } with link = "point.de.Frederikental" { - track(:second:station :closed, ml[:fre - 1ssw, :fre + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, ml[:fre]); - slabel(:right :removed, ml[:fre - 0.5ssw] >> 1dt, - "Frederikental" - ); + track(:second :station :closed, ml[:fre - 0.5sw, :fre + 0.5sw]); + marker(:left :de.hp :removed, ml[:fre]); + slabel(:right :removed, ml[:fre - 0.6sw] >> 1dt, "Frederikental"); } with link = "line.de.1112" { - track(:second :closed, ml[:fre + 1ssw, :lut - 1ssw]); + track(:second :closed, ml[:fre + 0.5sw, :lut - 0.5sw]); + line_label(:right:w :closed, ml[:lut - 1.2km], "1112"); } with link = "point.de.Lütjenburg" { - track(:second:station :closed, ml[:lut - 1ssw, :lut + 1ssw]); - with layer = -1 track(:third:station :removed, - path("d4.de.AK2")[:lut.bb + 0.1dl, :lut.bb] - .. ml[:lut - 1.1ssw, :lut - 1ssw] - ); - - marker(:de.bf :closed :left, ml[:lut]); - slabel(:right :closed, ml[:lut - 0.5ssw] >> 1dt, - span(:bold, "Lütjenburg") - ); + track(:second :station :closed, ml[:lut - 0.5sw, :lut + 0.5sw]); + marker(:left :de.bf :closed, ml[:lut] << 1dt); + slabel(:right :closed :bold, ml[:lut - 0.7sw] >> 1.0dt, "Lütjenburg"); } } diff --git a/rules/de/a/d3/11/1113.map b/rules/de/a/d3/11/1113.map index 55954575..1ebba4e7 100644 --- a/rules/de/a/d3/11/1113.map +++ b/rules/de/a/d3/11/1113.map @@ -1,139 +1,158 @@ # DE 1113. Schwartau Waldhalle - Lübeck-Travemünde Strand # -let wt = path("d4.de.1113"); +let wt = path("d3.de.1113"); with detail = 3 { # point.de.Schwartau-Waldhalle-Wr de.1100 with link = "line.de.1113" { - track(:first :double :cat:ac15 :pax, wt[:aa, :dan - 1ssw]); + track(:first :double :cat:ac15 :pax, wt[:wal + 2sw, :wab - 0.5sw]); } - with link = "point.de.Lübeck-Dänischburg" { - track(:first:station :double :cat:ac15 :pax, - wt[:dan - 1ssw, :dan + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, wt[:dan] << 0.5dt); - slabel(:bottom :cat:ac15 :pax, wt[:dan] >> 1dt, - vbox(:center:bottom, - span(:bold, "L.-"), - span(:bold, "Dänischbg.") - ) + with link = "point.de.Schwartau-Waldhalle" { + track(:first :double:station :cat:ac15 :pax, + wt[:wab - 0.5sw, :wab + 0.5sw] ); + marker(:right :de.bf :removed, wt[:wab] >> 0.5dt); } with link = "line.de.1113" { - track(:first :double :cat:ac15 :pax, wt[:dan + 1ssw, :kuc - 1ssw]); + track(:first :double :cat:ac15 :pax, wt[:wab + 0.5sw, :dan - 1sw]); + line_label(:right:n :cat:ac15 :pax, wt[:wab + 1km] >> 0.5dt, "1113"); } - with link = "point.de.Lübeck-Kücknitz" { - track(:first:station :double :cat:ac15 :pax, - wt[:kuc - 1ssw, :kua - 1ssw] + with link = "point.de.Lübeck-Dänischburg" { + track(:first :double:station :cat:ac15 :pax, wt[:dan - 1sw, :dan]); + marker(:left :de.bf :cat:ac15 :pax, wt[:dan - 0.5sw] << 0.5dt); + slabel(:top :cat:ac15 :pax :bold, wt[:dan] << 0.5dt << 1.2sh, + "L.-Dänischburg" ); - with layer = -1 marker(:de.bf :removed :left, wt[:kuc] << 0.5dt); } - with link = "point.de.Lübeck-Kücknitz-Abzw" { - track(:first:station :cat:ac15 :pax, - wt[:kua - 1ssw, :kua + 0.5ssw] >> 0.5dt + with link = "point.de.Lübeck-IKEA-Abzw" { + # DE 1113 + track(:first :double:station :cat:ac15 :pax, wt[:dan, :dan + 1sw]); + + # DE 1115 + track(:station, + wt[:dan + 0.49dl, :dan + 0.5sw] >> 0.5dt + -- wt[:dan + 0.5sw + 1dl, :dan + 1sw] >> 1.5dt ); - track(:first:station :cat:ac15 :pax, - wt[:kua - 1ssw, :kua] << 0.5dt + marker(:left :de.abzw :cat:ac15 :pax, wt[:dan + 0.5sw] << 0.5dt); + } + + with link = "line.de.1113" { + track(:first :double:rightother :cat:ac15 :pax, + wt[:dan + 1sw, :dan + 1km] ); - with layer = -2 track(:first:station :cat:ac15, - wt[:kua, :kua + 0.5ssw] << 0.5dt + track(:first :double :cat:ac15 :pax, + wt[:dan + 1km, :kuc - 0.5sw] ); + } - with layer = -2 marker(:de.abzw :cat:ac15 :left, wt[:kua] << 0.5dt); - label(:cat:ac15, wt[:kua - 0.5ssw] << 0.5dt << 1.2ssw, - hbox(:right:bottom, - vbox(:center:bottom :small, - span(:bold, "L.-Kücknitz") - ) - ) + with link = "point.de.Lübeck-Kücknitz" { + track(:first :double:station :cat:ac15 :pax, + wt[:kuc - 0.5sw, :kuc + 0.5sw] + ); + marker(:left :de.bf :removed, wt[:kuc] << 0.5dt); + slabel(:left :removed, wt[:kuc] << 0.5dt << 1.6sh + (2sw, 0dt), + "L.-Kücknitz" ); } - with link = "line.de.1113" { - track(:first :cat:ac15 :pax :tight, - wt[:kua + 0.5ssw, :kua + 0.51ssw] >> 0.5dt - .. wt[:kur - 1.1ssw, :kur - 1ssw] + track(:first :double :cat:ac15 :pax, wt[:kuc + 0.5sw, :kua - 0.5sw]); + } + + with link = "point.de.Lübeck-Kücknitz-Abzw" { + track(:first :double:station :cat:ac15 :pax, + wt[:kua - 0.5sw, :kua + 0.5sw] + ); + marker(:right :de.abzw :cat:ac15, wt[:kua] >> 0.5dt); + slabel(:right :cat:ac15, wt[:kua] >> 0.5dt >> 1.2sh + (-1sw, 0dt), + hbox(:left:top, "L.-Kücknitz") ); - with layer = -1 casing(:first, wt[:kua.x - 200m, :kua.x + 400m]); } + with link = "line.de.1113" { + track(:first :leftother :cat:ac15 :pax, + wt[:kua + 0.5sw, :kur - 0.5sw] >> 0.5dt + ); + } with link = "point.de.Lübeck-Kücknitz-Roter-Hahn" { - track(:first:station :cat:ac15 :pax, wt[:kur - 1ssw, :kur + 1ssw]); - marker(:de.hp:cat:ac15 :pax :right, wt[:kur]); - slabel(:right:cat:ac15 :pax, wt[:kur - 0.2ssw] >> 2.4ssw, - "L.-K. Roter Hahn" + track(:first :station :cat:ac15 :pax, + wt[:kur - 0.5sw, :kua.ys] >> 0.5dt + ); + marker(:right :de.hp :cat:ac15 :pax, wt[:kur] >> 0.5dt); + slabel(:right :cat:ac15 :pax, + wt[:kur - 0.5sw] >> 0.5dt >> 1.1sh + (-0.7sw, 0dt), + hbox(:left:top, "L.-Kücknitz Roter Hahn") ); } with link = "line.de.1113" { - track(:first :cat:ac15 :pax, wt[:kur + 1ssw, :pop - 1ssw]); + track(:first :cat:ac15 :pax, + wt[:kua.ys, :kua.ys + 0.1dl] >> 0.5dt + .. wt[:pop - 0.6sw, :pop - 0.5sw] + ); + line_label(:left:se :cat:ac15 :pax, wt[:pop - 0.8km], "1113"); } with link = "point.de.Lübeck-Pöppendorf" { - track(:first:station :cat:ac15 :pax, wt[:pop - 1ssw, :pop + 1ssw]); - with layer = -1 marker(:de.bf :removed :left, wt[:pop]); - slabel(:left :removed, wt[:pop - 0.4ssw] << 1.4ssw, + track(:first :station :cat:ac15 :pax, wt[:pop - 0.5sw, :pop + 0.5sw]); + marker(:left :de.bf :removed, wt[:pop]); + slabel(:left :removed, wt[:pop] << 1.5sh + (1.5sw, 0dt), "L.-Pöppendorf" ); } with link = "line.de.1113" { - track(:first :cat:ac15 :pax, wt[:pop + 1ssw, :ska - 1ssw]); + track(:first :cat:ac15 :pax, wt[:pop + 0.5sw, :ska - 0.5sw]); } - with link = "point.de.Lübeck-Travemünde-Skandinavienkai" { - track(:first:station :cat:ac15 :pax, wt[:ska - 1ssw, :ska + 1ssw]); - marker(:de.hp:cat:ac15 :pax :left, wt[:ska]); - slabel(:right:cat:ac15 :pax, wt[:ska - 0.6ssw] >> 1dt + (0dt, 0.5dt), + track(:first :station :cat:ac15 :pax, wt[:ska - 0.5sw, :ska + 0.5sw]); + marker(:right :de.hp :cat:ac15 :pax, wt[:ska]); + slabel(:left :cat:ac15 :pax, wt[:ska] + (-1.5dt, 0.5sw), "L.-T. Skandinavienkai" ); } - - with link = "line.de.1113" { - track(:first :cat:ac15 :pax, wt[:ska + 1ssw, :trh - 1ssw]); - guide(:linenum :cat:ac15 :pax, - wt[:ska + 1ssw] << 1.0dt - -- wt[:ska + 1.2ssw] << 1.0dt - (2.0dt, 0dt) - ); - label(:linenum :cat:ac15 :pax, - wt[:ska + 1.2ssw] << 1.0dt - (2.0dt, 0dt), - hbox(:right:middle :badgesize, "1113 ") - ); + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:ska + 0.5sw, :trh - 1sw]); } with link = "point.de.Lübeck-Travemünde-Hafen" { - track(:first:station :cat:ac15 :pax, wt[:trh - 1ssw, :trh + 1ssw]); - marker(:de.hp:cat:ac15 :pax :right, wt[:trh]); - with layer = -1 marker(:de.bf :gone :right, wt[:trh]); - slabel(:right:cat:ac15 :pax, wt[:trh] >> 1ssw + (1.3ssw, 0ssw), - span(:bold, "L.-Travemünde Hafen") + # DE 1113 + track(:first :station :cat:ac15 :pax, wt[:trh - 1sw, :trh + 0.5sw]); + + # DE 1114 + track(:second :station :removed, + wt[:trh - 0.5sw - 1.1dl, :trh - 0.5sw - 1dl] + -- wt[:trh - 0.5sw, :trh + 0.5sw] << 1dt + ); + + marker(:right :de.bf :cat:ac15 :pax, wt[:trh]); + slabel(:right :cat:ac15 :pax, wt[:trh - 0.5sw] >> 1.1sh, + hbox(:left:top :bold, "Lübeck-Travemünde Hafen") ); } with link = "line.de.1113" { - track(:first :cat:ac15 :pax, wt[:trh + 1ssw, :trs - 1ssw]); + track(:first :leftother :cat:ac15 :pax, wt[:trh + 0.5sw, :trh.yn]); + track(:first :cat:ac15 :pax, wt[:trh.yn, :trs - 0.5sw]); + line_label(:right:nw :cat:ac15 :pax, wt[:trh + 0.6km], "1113"); } - with link = "point.de.Lübeck-Travemünde-Hafen" { - track(:first:station :cat:ac15 :pax, wt[:trs - 1ssw, :trs]); - - marker(:de.hp:cat:ac15 :pax :top, wt[:trs]); - with layer = -1 marker(:de.bf :gone :top, wt[:trs]); - track(:first:pax:cat:ac15, wt[:trs] << 0.5ssw -- wt[:trs] >> 0.5ssw); - slabel(:right:cat:ac15 :pax, wt[:trs] + (1.4ssw, -0.6ssw), - span(:bold, "Lübeck-Travemünde Strand") + with link = "point.de.Lübeck-Travemünde-Strand" { + track(:first :station :cat:ac15 :pax, wt[:trs - 0.5sw, :trs]); + marker(:top :de.hp :cat:ac15 :pax, wt[:trs]); + marker(:top :de.exbf :cat:ac15 :pax, wt[:trs]); + slabel(:right :cat:ac15 :pax :bold, wt[:trs] + (1.7sh, -0.7sw), + "Lübeck-Travemünde Strand" ); } - } diff --git a/rules/de/a/d3/11/1114.map b/rules/de/a/d3/11/1114.map index 92283e4d..aee02121 100644 --- a/rules/de/a/d3/11/1114.map +++ b/rules/de/a/d3/11/1114.map @@ -1,54 +1,48 @@ # DE 1114. Lübeck-Travemünde Hafen - Niendorf (Ostsee) # -let tn = path("d4.de.1114"); +let tn = path("d3.de.1114"); with detail = 3 { - with link = "point.de.Lübeck-Travemünde-Nord" { - with layer = -1 track(:second:station :removed, - tn[:anie, :anie + 2ssw] + # point.de.Lübeck-Travemünde-Hafen de.1113 + + with link = "line.de.1114" { + track(:second :removed, + tn[:trh + 0.5sw, :trh.yn] << 1dt + .. tn[:trn + 0.9dt, :trn + 1dt] ); - marker(:de.hp :removed :left, tn[:anie + 1ssw]); - slabel(:left :removed, tn[:anie + 0.2ssw] << 1.8ssw, + } + + with link = "point.de.Lübeck-Travemünde-Nord" { + track(:second :station :removed, tn[:trn + 1dt, :trn + 1dt + 1sw]); + marker(:left :de.hp :removed, tn[:trn + 1dt + 0.5sw]); + slabel(:left :removed, tn[:trn + 1.3dt] << 1.8sh, "L.-T. Nord" ); } with link = "line.de.1114" { - track(:second :removed, tn[:anie + 2ssw, :bro - 1ssw]); - - guide(:linenum :removed, - tn[:bro - 0.6km] << 0.7dt - -- tn[:bro - 0.6km] << 2.5dt - ); - label(:linenum, tn[:bro - 0.6km] << 2.5dt, - hbox(:right:middle :badgesize :removed, "1114 ") - ); + track(:second :removed, tn[:trn + 1dt + 1sw, :bro - 0.5sw]); + line_label(:left:e :removed, tn[:trn + 1.4km], "1114"); } with link = "point.de.Lübeck-Brodten" { - track(:second:station :removed, - tn[:bro - 1ssw, :bro + 1ssw] - ); - marker(:de.hst :removed :right, tn[:bro]); - slabel(:right :removed, tn[:bro - 0.7ssw] >> 1.4ssw, + track(:second :station :removed, tn[:bro - 0.5sw, :bro + 0.5sw]); + marker(:right :de.hp :removed, tn[:bro]); + slabel(:right :removed, tn[:bro - 0.5sw] >> 1.4sh, "Lübeck-Brodten" ); } with link = "line.de.1114" { - track(:second :removed, tn[:bro + 1ssw, :nie - 1ssw]); + track(:second :removed, tn[:bro + 0.5sw, :nie - 0.5sw]); } with link = "point.de.Niendorf-Ostsee" { - track(:second:station :removed, tn[:f - 2ssw, :f]); - marker(:de.bf :removed :right, tn[:f - 1ssw]); - slabel(:right :removed, tn[:f] >> 1.4ssw, - hbox(:center:base, - span(:bold, "Niendorf "), - "(Ostsee)" - ) + track(:second :station :removed, tn[:nie - 0.5sw, :nie + 0.5sw]); + marker(:right :de.bf :removed, tn[:nie]); + slabel(:right :removed, tn[:nie] >> 1.5sh + (-2sw, 0dt), + hbox(:left:base, span(:bold, "Niendorf "), "(Ostsee)") ); } } - diff --git a/rules/de/a/d3/11/1115.map b/rules/de/a/d3/11/1115.map index 81f0a77e..373fbc5d 100644 --- a/rules/de/a/d3/11/1115.map +++ b/rules/de/a/d3/11/1115.map @@ -1,14 +1,33 @@ -# DE 1115. Lübeck-Dänischburg (ausschl.) - Lübeck Herrenwyk +# DE 1115. Lübeck-Dänischburg - Lübeck Herrenwyk # -let dh = path("d4.de.1115"); -let wt = path("d4.de.1113"); +let dh = path("d3.de.1115"); with detail = 3 { + # point.de.Lübeck-Dänischburg de.1113 + # point.de.Lübeck-IKEA-Abzw de.1113 + with link = "line.de.1115" { - track(:private, - wt[:aher, :aher + 1m] >> 0.5dt - .. dh[:a + 300m, :f] + track(:station, + dh[:dan + 1sw, :dan + 1.1sw] >> 1.5dt + .. dh[:fle - 1.1sw, :fle - 1sw] ); + line_label(:left:s, dh[:fle - 1sw], " 1115"); + } + + with link = "point.de.Lübeck-Herrenwyk-Flenderwerke" { + track(:station, dh[:fle - 1sw, :fle.yn]); + slabel(:left :italic, dh[:fle], + hbox(:right:top, "Flenderwerke") + ); + } + + with link = "line.de.1115" { + track(:station, dh[:fle.yn, :her - 1sw]); + } + + with link = "point.de.Lübeck-Herrenwyk" { + track(:station, dh[:her - 1sw, :f]); + slabel(:right :italic, dh[:her] << 1dt, "L.-Herrenwyk"); } } diff --git a/rules/de/a/d3/11/1116.map b/rules/de/a/d3/11/1116.map new file mode 100644 index 00000000..30772d01 --- /dev/null +++ b/rules/de/a/d3/11/1116.map @@ -0,0 +1,12 @@ +# DE 1116. Lübeck-Herrenwyk Flenderwerke - Norddeutsche Kraftwerke +# +let fn = path("d3.de.1116"); + +with detail = 3 { + # point.de.Lübeck-Herrenwyk-Flenderwerke de.1115 + + with link = "point.de.Lübeck-Norddeutsche-Kraftwerke" { + track(:station, fn[:fle.yn, :f]); + } +} + diff --git a/rules/de/a/d3/11/1117.map b/rules/de/a/d3/11/1117.map index 937a2293..0d99b295 100644 --- a/rules/de/a/d3/11/1117.map +++ b/rules/de/a/d3/11/1117.map @@ -1,21 +1,27 @@ -# DE 1117. Lübeck-Kücknitz (ausschl.) - Lübeck Skandinavienkai +# DE 1117. Lübeck-Kücknitz - Lübeck Skandinavienkai # -let ks = path("d4.de.1117"); +let ks = path("d3.de.1117"); with detail = 3 { + # point.de.Lübeck-Kücknitz-Abzw de.1113 + with link = "line.de.1117" { - with layer = -2 track(:second :cat:ac15, - ks[:kua + 0.5ssw, :kua + 0.51ssw] << 0.5dt - .. ks[:kur - 1.1ssw, :kur + 0.5ssw] << 1dt - .. ks[:ska + 499m, :ska + 500m] + track(:second :rightother :cat:ac15, + ks[:kua + 0.5sw, :kua.ys - 1dt] << 0.5dt + ); + track(:second :cat:ac15, + ks[:kua.ys - 1dt, :kua.ys - 0.9dt] << 0.5dt + .. ks[:ska - 0.51sw, :ska - 0.5sw] ); + + line_label(:left:se :cat:ac15, ks[:kua + 1km] << 0.5dt, "1117"); } with link = "point.de.Lübeck-Skandinavienkai" { - track(:second:station :cat:ac15, ks[:ska + 500m, :ska + 500m + 2ssw]); - marker(:de.gbf :cat:ac15 :right, ks[:ska + 500m + 1ssw]); - slabel(:right :cat:ac15, ks[:ska + 500m + 2ssw] >> 1.2ssw, - span(:bold, "Lübeck Skandinavienkai") + track(:second :station :cat:ac15, ks[:ska - 0.5sw, :ska.f]); + marker(:right :de.gbf :cat:ac15, ks[:ska]); + slabel(:right :cat:ac15, ks[:ska] >> 1.5sh + (0.5dt, 0.5sh), + "Lübeck Skandinavienkai" ); } } diff --git a/rules/de/a/d3/11/1120.map b/rules/de/a/d3/11/1120.map index 3d380e67..83a62001 100644 --- a/rules/de/a/d3/11/1120.map +++ b/rules/de/a/d3/11/1120.map @@ -1,259 +1,395 @@ # DE 1120. Lübeck Hbf - Hamburg Hbf # -let lh = path("d4.de.1120"); +let lh = path("d3.de.1120"); with detail = 3 { - with link = "point.de.Lübeck-Hbf" { - track(:first:station :double :cat:ac15 :pax, lh[:lub.a, :lub.f]); - marker(:de.bf :cat:ac15 :pax :left, lh[:lub] << 0.5dt); - slabel(:right :cat:ac15 :pax, - lh[:lub] << 0.5dt << 3.2ssw - (2ssw, 0ssw), - span(:bold, "Lübeck Hbf") + # point.de.Lübeck-Hbf de.1100 + + with link = "line.de.1120" { + track(:first :double:leftother:rightother :cat:ac15 :pax, + lh[:lub + 1sw, :lug - 1sw] ); } with link = "point.de.Lübeck-Hgbf" { - track(:first:station :double :cat:ac15 :pax, lh[:lub.f, :lua - 1ssw]); - with layer = -1 marker(:de.bbf :cat:ac15 :left, - lh[:lua - 2ssw] << 0.5dt + # DE 1120 + track(:first :double:station :cat:ac15 :pax, + lh[:lug - 1sw, :lug + 1sw] + ); + + # DE 1121 + track(:first :station :removed, + lh[:lug - 1sw, :lug + 1sw] << 1.5dt + ); + + # DE 1122 + track(:first :station :cat:ac15 :pax, + lh[:lug - 1sw, :lug + 1sw] << 2.5dt + ); + track(:first :station :removed, + lh[:lug - 1sw, :lug + 1sw] << 3.5dt ); + + marker(:left :de.gbf :cat:ac15, lh[:lug] << 3.5dt); + slabel(:left :cat:ac15, lh[:lug + 0.5sw] >> 2.5dt, "Lübeck Hgbf"); } with link = "point.de.Lübeck-Hgbf-Abzw" { - let lb = path("d4.de.1121"); + # DE 1120 + track(:first :double:station :cat:ac15 :pax, + lh[:lug + 1sw, :lua + 0.5sw] + ); - # Str. 1120 - track(:first:station :double :cat:ac15 :pax, - lh[:lua - 1ssw, :lua.k + 1ssw] + # DE 1121 + track(:first :station :removed, + lh[:lug + 1sw, :lua] << 1.5dt + ); + track(:first :station :pax, + lh[:lua - 1.01dl, :lua - 1dl] << 0.5dt + -- lh[:lua, :lua + 0.5sw] << 1.5dt ); - # Str. 1121 - with layer = -1 track(:first :pax, - lh[:lua.k, :lua.k + 0.1dl] << 0.5dt - .. lb[:lua.yb - 0.1dl, :lua.yb] >> 1dt + # DE 1122 + track(:first :station :cat:ac15 :pax, + lh[:lug + 1sw, :lua] << 2.5dt + ); + track(:first :station :pax, + lh[:lua, :lua + 0.5sw] << 2.5dt + ); + track(:first :station :removed, + lh[:lug + 1sw, :lua + 0.5sw] << 3.5dt ); - # Str. 1122 - with layer = -1 track(:first :pax, - lh[:lua - 0.1dl, :lua] << 0.5dt - -- lh[:lua + 1dl, :lua.k] << 1.5dt - .. lb[:lua.yb - 0.1dl, :lua.yb] + marker(:right :de.abzw :cat:ac15, lh[:lua] >> 0.5dt); + slabel(:left :cat:ac15 :light, lh[:lua + 0.5sw] >> 0.5dt >> 1.6sh, + "Lübeck Hgbf Abzw" ); - with layer = -4 track(:first :removed, - lh[:lua + 0.9dl, :lua + 1dl] << 1.5dt - -- lh[:lua + 2dl, :lua.k] << 2.5dt - .. lb[:lua.yb - 0.1dl, :lua.yb] << 1dt + } + + with link = "line.de.1120" { + track(:first :double:leftother :cat:ac15 :pax, + lh[:lua + 0.5sw, :lua.i] ); + track(:first :double :cat:ac15 :pax, lh[:lua.i, :gea - 0.5sw]) + } - with layer = -1 marker(:de.abzw :cat:ac15 :right, lh[:lua] >> 0.5dt); + with link = "point.de.Lübeck-Genin-Abzw" { + track(:first :double:station :cat:ac15 :pax, + lh[:gea - 0.5sw, :gea + 0.5sw] + ); + marker(:right :de.abzw :removed, lh[:gea] >> 0.5dt); + slabel(:left :removed :light, lh[:gea + 0.7sw] >> 0.5dt >> 1sh, + "Genin Abzw" + ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:lua.k + 1ssw, :nie - 1ssw]); + track(:first :double :cat:ac15 :pax, lh[:gea + 0.5sw, :nie - 1sw]); } with link = "point.de.Lübeck-Niendorf" { - track(:first:station :double :cat:ac15 :pax, - lh[:nie - 1ssw, :nie + 1ssw] - ); - with layer = -1 marker(:de.bf :removed :right, lh[:nie] >> 0.5dt); - slabel(:top :removed, lh[:nie + 2ssw] >> 0.5dt >> 1.4ssw, + track(:first :double :cat:ac15 :pax, lh[:nie - 1sw, :nie + 1sw]); + marker(:right :de.bf :removed, lh[:nie] >> 0.5dt); + slabel(:left :removed, lh[:nie + 1.2sw] >> 1sh, "L.-Niendorf" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:nie + 1ssw, :rei - 1ssw]); + track(:first :double :cat:ac15 :pax, lh[:nie + 1sw, :wes - 0.5sw]); + line_label(:left:n :cat:ac15 :pax, lh[:nie + 2.5km] << 0.5dt, "1120"); } with link = "point.de.Wesenberg-Holst" { - with layer = -1 marker(:de.bk :removed :left, lh[:wes] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + lh[:wes - 0.5sw, :wes + 0.5sw] + ); + marker(:left :de.bk :removed, lh[:wes] << 0.5dt); + slabel(:left :removed :light, lh[:wes] << 0.5dt << 1.0sh + (1sw, 0dt), + hbox(:right:top, "Wesenberg") + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:wes + 0.5sw, :rei - 1sw]); } with link = "point.de.Reinfeld-Holst" { - track(:first:station :double :cat:ac15 :pax, - lh[:rei - 1ssw, :rei + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lh[:rei] >> 0.5dt); - slabel(:left :cat:ac15 :pax, lh[:rei - 1ssw] >> 0.5dt >> 1.4ssw, - hbox(:center:base, - span(:regular, "Reinfeld "), - span(:light, "(Holst)") - ) + track(:first :double :cat:ac15 :pax, lh[:rei - 1sw, :rei + 1sw]); + marker(:right :de.bf :cat:ac15 :pax, lh[:rei] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:rei + 0.5sw] >> 1.4sh, + hbox(:right:base, "Reinfeld ", span(:light, "(Holst)")) ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:rei + 1ssw, :old.yn - 2ssw]); + track(:first :double :cat:ac15 :pax, lh[:rei + 1sw, :ste - 0.5sw]); } with link = "point.de.Steinfeld" { - with layer = -4 marker(:de.bk :removed :left, lh[:ste] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + lh[:ste - 0.5sw, :ste + 0.5sw] + ); + marker(:left :de.bk :removed, lh[:ste] << 0.5dt); + slabel(:bottom :removed :light, lh[:ste] << 0.5dt << 1.2sh, + "Steinfeld" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:ste + 0.5sw, :old - 1sw]); + line_label(:left:n :cat:ac15 :pax, lh[:old - 2.3km] << 0.5dt, " 1120"); } with link = "point.de.Bad-Oldesloe" { - # Str. 1120 - track(:first:station :double :cat:ac15 :pax, - lh[:old.yn - 2ssw, :old + 1ssw] + # DE 1043 + track(:first :station :pax, + lh[:old - 1sw, :old + 0.5sw] >> 1sh >> 0.5dt ); - - # Str. 1043 - let no = path("d4.de.1043"); - with layer = -1 track(:first:station :pax, - no[:old.yn - 2ssw, :old.yn] >> 0.5dt + track(:first :station :removed, + lh[:old + 0.5sw, :old + 1sw] >> 1sh >> 0.5dt ); - with layer = -4 track(:first:station :removed, - no[:old.yn - 2ssw, :old - 0.5ssw] >> 1.5dt + track(:first :station :removed, + lh[:old - 1sw, :old + 1sw] >> 1sh >> 1.5dt ); - # Str. 1141/6928/9120 - with layer = -4 track(:second:station :closed, - lh[:old + 0.5ssw, :old + 1ssw] >> 1.5dt + # DE 1120 + track(:first :station:double :cat:ac15 :pax, + lh[:old - 1sw, :old + 1sw] ); - marker(:de.bf :cat:ac15 :pax :right, lh[:old] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lh[:old + 0.4ssw] << 2.0dt, - span(:bold, "Bad Oldesloe") + marker(:right :de.inbf :cat:ac15 :pax, lh[:old] >> 0.5dt); + slabel(:left :cat:ac15 :pax :bold, + lh[:old + 0.5sw] >> 2.0dt >> 1.4sh, + "Bad Oldesloe" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:old + 1ssw, :kup - 1ssw]); - with layer = -5 casing(:first :double :cat, lh[:old.yr, :old.f]); + track(:first :double:rightother :cat:ac15 :pax :casing, + lh[:old + 1sw, :old.ys] + ); + track(:first :double :cat:ac15 :pax, lh[:old.ys, :kup - 1sw]); } with link = "point.de.Kupfermühle" { - track(:first:station :double :cat:ac15 :pax, - lh[:kup - 1ssw, :kup + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :right, lh[:kup] >> 0.5dt); - slabel(:left :cat:ac15 :pax, lh[:kup + 0.6ssw] >> 0.5dt >> 1.4ssw, + track(:first :double :cat:ac15 :pax, lh[:kup - 1sw, :kup + 1sw]); + marker(:right :de.hp :cat:ac15 :pax, lh[:kup] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:kup + 0.5sw] >> 0.5dt >> 1.2sh, "Kupfermühle" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:kup + 1ssw, :bar - 1ssw]); + track(:first :double :cat:ac15 :pax, lh[:kup + 1sw, :tre - 0.5sw]); } with link = "point.de.Tremsbüttel" { - with layer = -1 marker(:de.bk :removed :left, lh[:tre] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + lh[:tre - 0.5sw, :tre + 0.5sw] + ); + marker(:left :de.bk :removed, lh[:tre] << 0.5dt); + slabel(:right :removed :light, lh[:tre + 0.3sw] << 0.5dt << 2.0sh, + "Tremsbüttel" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:tre + 0.5sw, :bar - 1sw]); + line_label(:right:se :cat:ac15 :pax, lh[:tre + 1.4km] >> 0.5dt, "1120"); } with link = "point.de.Bargteheide" { - track(:first:station :double :cat:ac15 :pax, - lh[:bar - 1ssw, :bar + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lh[:bar] >> 0.5dt); - slabel(:left :cat:ac15 :pax, lh[:bar + 0.6ssw] >> 0.5dt >> 1.4ssw, + track(:first :double :cat:ac15 :pax, lh[:bar - 1sw, :bar + 1sw]); + marker(:right :de.bf :cat:ac15 :pax, lh[:bar] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:bar + 0.6sw] >> 0.5dt >> 1.4sh, "Bargteheide" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:bar + 1ssw, :gar - 1ssw]); - with layer = 1 line_badge(:pax :cat:ac15, lh[:bar + 1.7km], "1120"); + track(:first :double :cat:ac15 :pax, lh[:bar + 1sw, :del - 0.5sw]); + line_label(:left:w :cat:ac15 :pax, lh[:bar + 1.7km] << 0.5dt, "1120"); } with link = "point.de.Delingsdorf" { - with layer = -1 marker(:de.bk :removed :right, lh[:del] >> 0.5dt); - } - - with link = "point.de.Ahrensburg-Gartenholz" { - track(:first:station :double :cat:ac15 :pax, - lh[:gar - 1ssw, :gar + 1ssw] + track(:first :double:station :cat:ac15 :pax, + lh[:del - 0.5sw, :del + 0.5sw] ); - marker(:de.hp :cat:ac15 :pax :left, lh[:gar] << 0.5dt); - label(lh[:gar] << 0.5dt << 1.6ssw, - vbox(:left:middle :cat:ac15 :pax :small, - " Ahrensburg-", "Gartenholz" - ) + marker(:right :de.bk :removed, lh[:del] >> 0.5dt); + slabel(:left :removed :light, lh[:del + 0.7sw] >> 0.5dt >> 1.4sh, + "Delingsdorf" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:gar + 1ssw, :ahr - 1ssw]); + track(:first :double :cat:ac15 :pax, lh[:del + 0.5sw, :gar - 0.5sw]); + } + + with link = "point.de.Ahrensburg-Gartenholz" { + track(:first :double :cat:ac15 :pax, lh[:gar - 0.5sw, :gar + 0.5sw]); + marker(:left :de.hp :cat:ac15 :pax, lh[:gar] << 0.5dt); + slabel(:right :cat:ac15 :pax, lh[:gar + 0.6sw] << 0.5dt << 1.6sh, + "A.-Gartenholz" + ); } with link = "point.de.Ahrensburg-Nord" { - with layer = -1 marker(:de.awanst :cat:ac15 :right, lh[:ahn] >> 0.5dt); + track(:first :double :cat:ac15 :pax, lh[:gar + 0.5sw, :gar + 1.7sw]); + marker(:left :de.awanst :cat:ac15, lh[:gar + 1.2sw] << 0.5dt); + slabel(:left :cat:ac15 :light, lh[:gar + 1.9sw] >> 2.0dt, + "A. Nord" + ); } + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:gar + 1.7sw, :ahr - 1sw]); + } with link = "point.de.Ahrensburg" { - track(:first:station :double :cat:ac15 :pax, - lh[:ahr - 1ssw, :ahr + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lh[:ahr] >> 0.5dt); - slabel(:left :cat:ac15 :pax, lh[:ahr + 0.8ssw] >> 0.5dt >> 1.4ssw, + track(:first :double :cat:ac15 :pax, lh[:ahr - 1sw, :ahr + 1sw]); + marker(:right :de.bf :cat:ac15 :pax, lh[:ahr] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:ahr] >> 1.6sh + (-0.2sw, 0dt), "Ahrensburg" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:ahr + 1ssw, :rab - 1ssw]); + track(:first :double :cat:ac15 :pax, lh[:ahr + 1sw, :gahr - 0.5sw]); + } + + with link = "point.de.Ahrensburg-LGr" { + track(:first :double:station :cat:ac15 :pax, + lh[:gahr - 0.5sw, :mei - 0.5sw] + ); + marker(:right :de.lgr :cat:ac15, lh[:gahr] >> 0.5dt); + marker(:left :de.lgr :cat:ac15, lh[:gahr] << 0.5dt); + slabel(:right :italic :cat:ac15, lh[:gahr] << 0.5dt << 1.4sh, + hbox(:left:middle, + vbox(:center:middle, " SH ", hrule(), " HH ") + ) + ); } with link = "point.de.Meiendorf" { - with layer = -1 marker(:de.bk :removed :right, lh[:mei] >> 0.5dt); + track(:first :double:station :cat:ac15 :pax, + lh[:mei - 0.5sw, :mei + 0.5sw] + ); + marker(:right :de.bk :removed, lh[:mei] >> 0.5dt); + slabel(:left :removed :light, lh[:mei + 0.8sw] >> 0.5dt >> 1.4sh, + "Meiendorf" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:mei + 0.5sw, :rab - 1sw]); } with link = "point.de.Hamburg-Rahlstedt-Bbf" { - track(:first:station :double :cat:ac15 :pax, - lh[:rab - 1ssw, :rab + 1ssw] + track(:first :double :cat:ac15 :pax, lh[:rab - 1sw, :rab + 1sw]); + marker(:right :de.bft :cat:ac15 :pax, lh[:rab] >> 0.5dt); + slabel(:right :cat:ac15 :pax :light, lh[:rab - 0.8sw] << 1.0dt, + hbox(:left:top, "H.-Rahlstedt Bbf") ); - with layer = -1 marker(:de.bft :cat:ac15 :right, lh[:rab] >> 0.5dt); } with link = "point.de.Hamburg-Rahlstedt" { - track(:first:station :double :cat:ac15 :pax, - lh[:rab + 1ssw, :rah + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, lh[:rah] << 0.5dt); - slabel(:right :cat:ac15 :pax, lh[:rah + 0.3ssw] << 0.5dt << 2.0ssw, - "Hamburg-Rahlstedt" + track(:first :double :cat:ac15 :pax, lh[:rab + 1sw, :rah + 1sw]); + marker(:left :de.bf :cat:ac15 :pax, lh[:rah] << 0.5dt); + slabel(:right :cat:ac15 :pax, lh[:rah + 0.3sw] << 0.5dt << 2.0sh, + "H.-Rahlstedt" ); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:ahr + 1ssw, :ton - 1ssw]); + track(:first :double :cat:ac15 :pax, lh[:rah + 1sw, :wab - 0.5sw]); } with link = "point.de.Wandsbek-Ost-Bk" { - with layer = -1 marker(:de.bk :removed :left, lh[:wab] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, lh[:wab - 0.5sw, :wab]); + marker(:left :de.bk :removed, lh[:wab] << 0.5dt); + slabel(:right :removed :light, lh[:wab - 0.8sw] << 0.5dt << 1.0sh, + hbox(:left:top, "Wandsbek Ost Bk") + ); } with link = "point.de.Hamburg-Tonndorf" { - track(:first:station :double :cat:ac15 :pax, - lh[:ton - 1ssw, :ton + 1ssw] + track(:first :double:station :cat:ac15 :pax, lh[:wab, :ton + 1sw]); + marker(:right :de.hp :cat:ac15 :pax, lh[:ton] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:ton + 0.3sw] >> 0.5dt >> 1.0sh, + "H.-Tonndorf*" ); - marker(:de.hp :cat:ac15 :pax :right, lh[:ton] >> 0.5dt); } -} + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:ton + 1sw, :waf - 1sw]); + line_label(:left:nw :cat:ac15 :pax, lh[:ton + 1km] << 0.5dt, "1120"); + } -let lh = path("d3.de.1120"); + with link = "point.de.Hamburg-Wandsbek-Wf" { + # DE 1120 + track(:first :double:station :cat:ac15 :pax, + lh[:waf - 1sw, :waf + 1sw] + ); -with detail = 3 { - with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, - lh[:ton + 1ssw, :wan - 1ssw] + # DE 1242 + track(:first :station :cat:ac15 :pax, + lh[:waf - 0.5sw - 1.1dl, :waf - 0.5sw - 1dl] << 0.5dt + -- lh[:waf - 0.5sw, :waf + 1sw] << 1.5dt ); + + marker(:left :de.bft :cat:ac15 :pax, lh[:waf] << 1.5dt); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:waf + 1sw, :wan - 1sw]); } with link = "point.de.Hamburg-Wandsbek" { - track(:first:station :double :cat:ac15 :pax, - lh[:wan - 1ssw, :wan + 1ssw] + # DE 1120 + track(:first :double:station :cat:ac15 :pax, + lh[:wan - 1sw, :wan + 1sw] + ); + + # DE 1242 + track(:first :station :cat:ac15 :pax, + lh[:wan - 1sw, :wan + 1sw] << 1.5dt + ); + + marker(:right :de.bf :cat:ac15 :pax, lh[:wan] >> 0.5dt); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:wan + 1sw, :has - 1sw]); + } + + with link = "point.de.Hamburg-Hasselbrook" { + track(:first :double:station :cat:ac15 :pax, + lh[:has - 1sw, :has + 1sw] ); - marker(:de.bf :cat:ac15 :pax :right, lh[:wan] >> 0.5dt); + marker(:left :de.hp :cat:ac15 :pax, lh[:has] << 0.5dt); } with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, lh[:wan + 1ssw, :ham.aa - 1ssw]); - with layer = -1 casing(:first :double :cat, lh[:wan + 1ssw, :has]); + track(:first :double:rightother :cat:ac15 :pax, + lh[:has + 1sw, :btu - 0.5sw] + ); + } - track(:first:station :double :cat:ac15 :pax, - lh[:ham.aa - 1ssw, :ham.aa] + with link = "point.de.Hamburg-Berliner-Tor-Üst" { + track(:first :double:station :cat:ac15 :pax, + lh[:btu - 0.5sw, :btu + 0.5sw] + ); + marker(:left :de.uest :cat:ac15, lh[:btu] << 0.5dt); + } + + with link = "line.de.1120" { + track(:first :double:rightother:leftother :cat:ac15 :pax, + lh[:btu - 0.1dl, :btu] + .. lh[:ham.yo, :ham.yo + 0.1dl] >> 1dt + ); + track(:first :double:rightother:leftother :cat:ac15 :pax, + lh[:ham.yo, :ham - 1sw] >> 1dt ); } } diff --git a/rules/de/a/d3/11/1121.map b/rules/de/a/d3/11/1121.map index bddb0375..b9d1a9ad 100644 --- a/rules/de/a/d3/11/1121.map +++ b/rules/de/a/d3/11/1121.map @@ -1,157 +1,198 @@ # DE 1121. Lübeck Hbf - Büchen # -let lb = path("d4.de.1121"); +let lb = path("d3.de.1121"); with detail = 3 { # point.de.Lübeck-Hbf de.1100 + + with link = "line.de.1121" { + track(:first :leftother:rightother :removed, + lb[:lub + 1sw, :lug - 1sw] << 1.5dt + ); + } + # point.de.Lübeck-Hgbf de.1120 # point.de.Lübeck-Hgbf-Abzw de.1120 with link = "line.de.1121" { - track(:first:pax, - lb[:lua.yb, :lua.yb + 0.1dl] >> 1dt - .. lb[:hoc - 1.1ssw, :hoc - 1ssw] + track(:first :leftother :pax, + lb[:lua + 0.5sw, :lua.yk] << 1.5dt + .. lb[:lua.yyk, :lua.yb] >> 1.5dt + .. lb[:jur - 0.51sw, :jur - 0.5sw] >> 1.0dt ); } - with link = "point.de.Lübeck-Hochschulstadtteil" { - track(:first:station :pax, lb[:hoc - 1ssw, :hoc + 1ssw]); - marker(:de.hp :pax :right, lb[:hoc]); - slabel(:left :pax, lb[:hoc - 0.6ssw] >> 1.2ssw, - vbox(:right:top, - span(:open, "L. Hochschul-"), - span(:open, "stadtteil") - ) + with link = "point.de.Lübeck-Jürgen-Bk" { + track(:first :station :pax, lb[:jur - 0.5sw, :jur + 0.5sw] >> 1.0dt); + marker(:left :de.bk :removed, lb[:jur] >> 1.0dt); + slabel(:left :removed :light, lb[:jur] + (1.0dt, 2.0dt), + hbox(:right:top, "St Jürgen") ); } with link = "line.de.1121" { - track(:first :pax, lb[:hoc + 1ssw, :flu - 1ssw]); + track(:first :pax, + lb[:jur + 0.5sw, :jur + 0.51sw] >> 1.0dt + .. lb[:hoc - 0.51sw, :hoc - 0.5sw] + ); } - with link = "point.de.Lübeck-Flughafen" { - track(:first:station :pax, lb[:flu - 1ssw, :flu + 100m]); - marker(:de.hp :pax :left, lb[:flu]); - slabel(:right :pax, lb[:flu + 0.4ssw] << 1.3ssw, - "Lübeck Flughafen" + with link = "point.de.Lübeck-Hochschulstadtteil" { + track(:first :station :pax, lb[:hoc - 0.5sw, :hoc + 0.5sw]); + marker(:right :de.hp :pax, lb[:hoc]); + slabel(:left :pax, lb[:hoc + 1.1sw] >> 1.5sh, + vbox(:right:middle, "L.-Hochschul-", "stadtteil") ); } + with link = "line.de.1121" { + track(:first :pax, lb[:hoc + 0.5sw, :flu - 0.5sw]); + line_label(:left:w :pax, lb[:hoc + 1.5km], "1121"); + } + + with link = "point.de.Lübeck-Flughafen" { + track(:first :station :pax, lb[:flu - 0.5sw, :flu + 0.5sw]); + marker(:right :de.hp :pax, lb[:flu]); + slabel(:left :pax, lb[:flu + 0.5sw] >> 1.7sh, "L. Flughafen"); + } with link = "point.de.Lübeck-Blankensee" { - track(:first:station :pax, lb[:flu + 100m, :bla + 1ssw]); - with layer = -1 marker(:de.bf :removed :left, lb[:bla]); - slabel(:left :removed, lb[:bla + 0.4ssw] >> 1dt, - "Lübeck-Blankensee" - ); + track(:first :station :pax, lb[:flu + 0.5sw, :flu + 1.7sw]); + marker(:right :de.bf :removed, lb[:flu + 1.2sw]); + slabel(:right :removed, lb[:flu + 1.7sw] << 1.0dt, "L.-Blankensee"); } with link = "line.de.1121" { - track(:first :pax, lb[:bla + 1ssw, :sar - 1ssw]); - with layer = 1 line_badge(:pax, lb[:bla + 2.5km], "1121"); + track(:first :pax, lb[:flu + 1.7sw, :sar - 0.5sw]); } - with link = "point.de.Sarau" { - track(:first:station :pax, lb[:sar - 1ssw, :sar + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, lb[:sar]); - slabel(:right :removed, lb[:sar + 0.6ssw] << 1.4ssw, "Sarau"); + track(:first :station :pax, lb[:sar - 0.5sw, :sar + 0.5sw]); + marker(:left :de.hp :removed, lb[:sar]); + slabel(:right :removed, lb[:sar + 0.5sw] << 1.3sh, "Sarau"); } with link = "line.de.1121" { - track(:first :pax, lb[:sar + 1ssw, :pog - 1ssw]); + track(:first :pax, lb[:sar + 0.5sw, :pog - 1sw]); } with link = "point.de.Pogeez" { - track(:first:station :pax, lb[:pog - 1ssw, :pog + 1ssw]); - with layer = -1 marker(:de.bbf :left, lb[:pog]); - slabel(:right, lb[:pog + 0.6ssw] << 1.4ssw, "Pogeez"); + track(:first :station :pax, lb[:pog - 1sw, :pob - 0.5sw]); + marker(:left :de.bbf, lb[:pog]); + slabel(:right, lb[:pog + 0.5sw] << 1.4sh, "Pogeez"); } - with link = "line.de.1121" { - track(:first :pax, lb[:pog + 1ssw, :rat.a]); + with link = "point.de.Pogeez-Bk" { + track(:first :station :pax, lb[:pob - 0.5sw, :pob + 0.5sw]); + marker(:right :de.bk :removed, lb[:pob]); + slabel(:left :removed :light, lb[:pob + 0.5sw] >> 1.4sh, "Pogeez"); } - with link = "point.de.Pogeez-Bk" { - with layer = -1 marker(:de.bk :removed :right, lb[:pob]); + with link = "line.de.1121" { + track(:first :pax, + lb[:pob + 0.5sw, :rat.aal] + .. lb[:rat - 1.1sw, :rat - 1sw] >> 0.5sh + ); + line_label(:left:w :pax, lb[:pob + 2.4km], "1121"); } with link = "point.de.Ratzeburg" { - track(:first:station :pax, lb[:rat.a, :rat.f]); - marker(:de.bf :pax :left, lb[:rat] >> 0.5ssw); - slabel(:left :pax, lb[:rat + 0.5ssw] >> 1.5dt, - span(:bold, "Ratzeburg ") + # DE 1121 + track(:first :station :pax, lb[:rat - 1sw, :rat + 1sw] >> 0.5sh); + + # DE 6928 + track(:second :station :removed, lb[:rat - 1sw, :rat + 1sw] << 0.5sh); + + marker(:left :de.inbf :pax, lb[:rat] >> 0.5sh); + slabel(:left :pax :bold, lb[:rat + 0.5sw] >> 0.5sh >> 2.5dt, + "Ratzeburg" ); } with link = "line.de.1121" { - track(:first :pax, lb[:rat.f, :mol - 1ssw]); - with layer = 1 line_badge(:open :pax, lb[:rat + 4.7km], "1121"); + track(:first :pax, + lb[:rat + 1sw, :rat + 1.1sw] >> 0.5sh + .. lb[:rat.yh - 500m, :mol - 1sw] + ); + line_label(:right:e :pax, lb[:rat.yh + 3km], "1121"); } with link = "point.de.Mölln-Lauenburg" { - track(:first:station :pax, lb[:mol - 1sw, :mol + 1sw]); - marker(:de.bf :pax :left, lb[:mol]); - slabel(:left :pax, lb[:mol + 0.4ssw] >> 1.5dt, - hbox(:center:base, - span(:bold, "Mölln "), - span(:regular, "(Lauenburg)") - ) + # DE 1121 + track(:first :station :pax, lb[:mol - 1sw, :mol + 1sw]); + + # DE A50 + track(:second :station :removed, lb[:mol + 0.5sw, :mol + 1sw] << 1dt); + + marker(:left :de.bf :pax, lb[:mol]); + slabel(:left :pax, lb[:mol + 0.7sw] >> 1.5dt, + hbox(:right:base, span(:bold, "Mölln "), "(Lauenburg)") ); } with link = "line.de.1121" { - track(:first :pax, lb[:mol + 1ssw, :moi - 0.5ssw]); + track(:first :pax, lb[:mol + 1sw, :moi - 0.5sw]); } with link = "point.de.Mölln-Lauenburg-Industriegleis" { - track(:first:station :pax, lb[:moi - 0.5ssw, :moi + 0.5ssw]); - marker(:de.awanst :right, lb[:moi]); + track(:first :station :pax, lb[:moi - 0.5sw, :moi + 0.5sw]); + marker(:right :de.awanst, lb[:moi]); + slabel(:left :light, lb[:moi + 0.6sw] >> 1.4sh, + "M. (L.) Industriegleis" + ); } with link = "line.de.1121" { - track(:first :pax, lb[:moi + 0.5ssw, :gub - 1ssw]); + track(:first :pax, lb[:moi + 0.5sw, :gub - 0.5sw]); + line_label(:left:w :pax, lb[:moi + 2km], "1121"); } with link = "point.de.Güster-Bahnsteig" { - track(:first:station :pax, lb[:gub - 1ssw, :gub + 1ssw]); - with layer = -1 marker(:de.bft :removed :left, lb[:gub]); + track(:first :station :pax, lb[:gub - 0.5sw, :gub + 0.5sw]); + marker(:left :de.hp :removed, lb[:gub]); + slabel(:right :removed, lb[:gub] << 1.6sh + (0dt, 0.5sw), + "Güster Bahnsteig" + ); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:gub + 0.5sw, :gus - 1sw]); } with link = "point.de.Güster" { - track(:first:station :pax, lb[:gub + 1ssw, :gus + 1ssw]); - with layer = -1 marker(:de.bbf :left, lb[:gus]); - slabel(:right, lb[:gus + 0.4ssw] << 2.2ssw, "Güster"); + track(:first :station :pax, lb[:gus - 1sw, :gus + 1sw]); + marker(:left :de.bbf, lb[:gus]); + slabel(:left, lb[:gus + 0.3sw] >> 1.0dt, "Güster"); } with link = "line.de.1121" { - track(:first :pax, lb[:gus + 1ssw, :ros - 1ssw]); + track(:first :pax, lb[:gus + 1sw, :ros - 1sw]); } with link = "point.de.Roseburg" { - track(:first:station :pax, lb[:ros - 1ssw, :ros + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, lb[:ros]); - slabel(:left :removed, lb[:ros + 0.6ssw] >> 1.6ssw, "Roseburg"); + track(:first :station :pax, lb[:ros - 1sw, :ros + 1sw]); + marker(:right :de.bf :removed, lb[:ros]); + slabel(:left :removed, lb[:ros + 0.5sw] >> 1.4sh, "Roseburg"); } with link = "line.de.1121" { - track(:first :pax, lb[:ros + 1ssw, :nus - 1ssw]); - with layer = 1 line_badge(:open :pax, lb[:nus - 2.0km], "1121"); + track(:first :pax, lb[:ros + 1sw, :nus - 0.5sw]); + line_label(:right:e :pax, lb[:nus - 2km], "1121"); } with link = "point.de.Büchen-Nüssau" { - track(:first:station :pax, lb[:nus - 1ssw, :nus + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, lb[:nus]); - slabel(:right :removed, lb[:nus + 0.6ssw] << 1.4ssw, - "Büchen-Nüssau" - ); + track(:first :station :pax, lb[:nus - 0.5sw, :nus + 0.5sw]); + marker(:left :de.hp :removed, lb[:nus]); + slabel(:right :removed, lb[:nus + 0.6sw] << 1.4sh, "Büchen-Nüssau"); } with link = "line.de.1121" { track(:first :pax, - lb[:nus + 1ssw, :buc.g - 1.5dt] - .. path("d4.de.a.6100")[:buc + 0.51ssw, :buc + 0.5ssw] << 0.5dt + lb[:nus + 0.5sw, :buc.yyr - 1dt] + .. lb[:buc - 0.5sw - 2.2dl, :buc - 0.5sw - 2.1dl] << 1.5dt ); } + + # point.de.Büchen de.6100 } diff --git a/rules/de/a/d3/11/1122.map b/rules/de/a/d3/11/1122.map index e7d6e0b6..58ba31cb 100644 --- a/rules/de/a/d3/11/1122.map +++ b/rules/de/a/d3/11/1122.map @@ -1,50 +1,100 @@ # DE 1122. Lübeck Hbf - Strasburg (Meckl) # -let ls = path("d4.de.a.1122"); +let ls = path("d3.de.a.1122"); with detail = 3 { - # point.de.Lübeck-Hbf de.1120 + # point.de.Lübeck-Hbf de.1100 + + with link = "line.de.1122" { + track(:first :leftsame:rightother :cat:ac15 :pax, + ls[:lub + 1sw, :lug - 1sw] << 2.5dt + ); + track(:first :leftother:rightsame :removed, + ls[:lub + 1sw, :lug - 1sw] << 3.5dt + ); + } + # point.de.Lübeck-Hgbf de.1120 # point.de.Lübeck-Hgbf-Abzw de.1120 - with link = "line.de.1122" { - track(:first :pax, - ls[:lua.yb, :lua.yb + 0.1dl] - .. ls[:lua.xb, :stn - 0.5ssw] >> 0.5dt + with link = "line.de.1121" { + track(:first :leftsame:rightother :pax, + ls[:lua + 0.5sw, :lua.yk] << 2.5dt + .. ls[:lua.yyk, :stn - 0.5sw] >> 0.5dt ); - track(:first :removed, - ls[:lua.yb, :lua.yb + 0.1dl] << 1dt - .. ls[:lua.xb, :stn - 0.5ssw] << 0.5dt + track(:first :leftother:rightsame :removed, + ls[:lua + 0.5sw, :lua.yk] << 3.5dt + .. ls[:lua.yyk, :stn - 0.5sw] << 0.5dt ); } with link = "point.de.Strecknitz" { - track(:first:station :pax, ls[:stn - 0.5ssw, :stn + 0.5ssw] >> 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:stn - 0.5ssw, :stn] << 0.5dt + # DE 1122 + track(:first :station :removed, + ls[:stn - 0.5sw, :stn + 0.5sw] << 0.5dt ); - with layer = -1 track(:second:station, - ls[:stn - 1.1dl, :stn - 1dl] >> 0.5dt - -- ls[:stn, :stn + 0.5ssw] << 0.5dt + track(:first :station :pax, + ls[:stn - 0.5sw, :stn + 0.5sw] >> 0.5dt + ); + + # DE 1131 + track(:second :station, + ls[:stn - 2.1dl, :stn - 2dl] >> 0.5dt + -- ls[:stn, :stn + 0.5sw] << 1.5dt + ); + + marker(:left :de.abzw, ls[:stn] << 1.5dt); + slabel(:top :light, ls[:stn] << 1.5dt << 1.2sh + (1sw, 0dt), + "Strecknitz" + ); + } + + with link = "line.de.1121" { + track(:first :leftother:rightsame :removed, + ls[:stn + 0.5sw, :sju - 0.5sw] << 0.5dt + ); + track(:first :leftsame:rightother :pax, + ls[:stn + 0.5sw, :sju - 0.5sw] >> 0.5dt ); - marker(:de.abzw :left, ls[:stn] << 0.5dt); } with link = "point.de.Lübeck-St-Jürgen" { - track(:first:station :pax, ls[:stn + 0.5ssw, :sju + 1ssw] >> 0.5dt); - track(:second:station, ls[:stn + 0.5ssw, :sju + 1ssw] << 0.5dt); - marker(:de.hp :pax :right, ls[:sju] >> 0.5dt); - slabel(:right :pax, ls[:sju - 1ssw] >> 1.2ssw, - vbox(:left:top, - span(:open, "L. St"), - span(:open, "Jürgen") - ) + track(:first :station :removed, + ls[:sju - 0.5sw, :sju + 0.5sw] << 0.5dt + ); + track(:first :station :pax, + ls[:sju - 0.5sw, :sju + 0.5sw] >> 0.5dt + ); + marker(:right :de.hp :pax, ls[:sju] >> 0.5dt); + slabel(:bottom :pax, ls[:sju] >> 0.5dt >> 1.2sh + (1.5sw, 0dt), + "L. St Jürgen" ); } - with link = "line.de.1122" { - track(:first :pax, ls[:sju + 1ssw, :heg - 0.5ssw] >> 0.5dt); - track(:first :removed, ls[:stn.ys, :heg - 0.5ssw] << 0.5dt); + with link = "line.de.1121" { + track(:first :leftother:rightsame :removed, + ls[:sju + 0.5sw, :heg - 0.5sw] << 0.5dt + ); + track(:first :leftsame:rightother :pax, + ls[:sju + 0.5sw, :heg - 0.5sw] >> 0.5dt + ); } + + with link = "point.de.Herrnburg-LGr" { + track(:first :station :removed, + ls[:heg - 0.5sw, :heg + 0.5sw] << 0.5dt + ); + track(:first :station :pax, + ls[:heg - 0.5sw, :heg + 0.5sw] >> 0.5dt + ); + marker(:right :de.lgr :pax, ls[:heg] >> 0.5dt); + marker(:left :de.lgr :pax, ls[:heg] << 0.5dt); + slabel(:right :pax :roman:italic, + ls[:heg] << 0.5dt << 1.4sh + (-1.2sw, 0dt), + "SH/MV" + ); + } + + # DE-W } diff --git a/rules/de/a/d3/11/1131.map b/rules/de/a/d3/11/1131.map index 784ab01c..f18ee241 100644 --- a/rules/de/a/d3/11/1131.map +++ b/rules/de/a/d3/11/1131.map @@ -1,55 +1,65 @@ # DE 1131. Lübeck Hgbf - Lübeck-Schlutup # -let lp = path("d4.de.1131"); +let ls = path("d3.de.1131"); with detail = 3 { - # point.de.Lübeck-Hgbf de.1130 - # point.de.Strecknitz de.1122 with link = "line.de.1131" { track(:second, - lp[:stn + 0.5ssw, :stn.ys] << 0.5dt - .. lp[:stn.yys + 2dt, :bra - 1ssw] + ls[:stn + 0.5sw, :stn.ys] << 1.5dt + .. ls[:stn.yys, :bra - 0.5sw] ); + line_label(:left:e, ls[:bra - 0.6km], "1131"); } with link = "point.de.Brandenbaum" { - track(:second:station, lp[:bra - 1ssw, :bra + 1ssw]); - marker(:de.abzw :right, lp[:bra]); - slabel(:right, lp[:bra - 0.4ssw] >> 1.4ssw, - span(:bold, "Brandenbaum") + # DE 1131 + track(:second :station, ls[:bra - 0.5sw, :bra + 0.5sw]); + + # DE 1137 + track(:station, + ls[:bra - 1.1dl, :bra - 1dl] + -- ls[:bra, :bra + 0.5sw] << 1dt ); - } + marker(:right :de.abzw, ls[:bra]); + slabel(:right :light, ls[:bra - 0.5sw] >> 1.4sh, "Brandenbaum"); + } + with link = "line.de.1131" { - track(:second :flip, lp[:bra + 1ssw, :kir - 0.5ssw]); + track(:second, ls[:bra + 0.5sw, :kir - 0.5sw]); } with link = "point.de.Lübeck-Kirschenallee" { - track(:second:station, lp[:kir - 0.5ssw, :kir + 0.5ssw]); - with layer = -1 marker(:de.anst :removed :right, lp[:kir]); + track(:second :station, ls[:kir - 0.5sw, :kir + 0.5sw]); + marker(:right :de.anst :removed, ls[:kir]); + slabel(:right :removed :light, ls[:kir - 0.5sw] >> 1.4sh, + "Kirschenallee" + ); } with link = "line.de.1131" { - track(:second :flip, lp[:kir + 0.5ssw, :tan - 0.5ssw]); + track(:second, ls[:kir + 0.5sw, :tan - 0.5sw]); + line_label(:right:n, ls[:tan - 0.5km], "1131"); } with link = "point.de.Lübeck-Schlutuper-Tannen" { - track(:second:station, lp[:tan - 0.5ssw, :tan + 0.5ssw]); - marker(:de.anst :left, lp[:tan]); + track(:second :station, ls[:tan - 0.5sw, :tan + 0.5sw]); + marker(:left :de.anst, ls[:tan]); + slabel(:right :light, ls[:tan + 0.2sw] >> 0.5dt, + hbox(:left:top, "Schlutuper Tannen") + ); } with link = "line.de.1131" { - track(:second :flip, lp[:tan + 0.5ssw, :slu - 1ssw]); + track(:second, ls[:tan + 0.5sw, :slu.w31]); } with link = "point.de.Lübeck-Schlutup" { - track(:second:station, lp[:slu - 1ssw, :f]); - marker(:de.gbf :left, lp[:slu]); - slabel(:right, lp[:slu - 0.3ssw] >> 6pt, - span(:bold, "Lübeck-Schlutup") - ); + track(:second :station, ls[:slu.w31, :slu + 1sw]); + marker(:left :de.gbf, ls[:slu]); + slabel(:right :bold, ls[:slu] + (1sw, 0.5sh), "L.-Schlutup"); } } diff --git a/rules/de/a/d3/11/1132.map b/rules/de/a/d3/11/1132.map index f1643cc1..28e4d4a4 100644 --- a/rules/de/a/d3/11/1132.map +++ b/rules/de/a/d3/11/1132.map @@ -1,23 +1,14 @@ # DE 1132. Lübeck-Schlutup - Lübeck-Schlutup Fischereihafen # -let sf = path("d4.de.1132"); +let sf = path("d3.de.1132"); with detail = 3 { - with link = "line.de.1132" { - track(:private, sf[:slu.w31, :slu.w51 - 0.5ssw]); - } - - with link = "point.de.Lübeck-Schlutup-W51" { - track(:private:station, sf[:slu.w51 - 0.5ssw, :slu.w51 + 0.5ssw]); - } + # point.de.Lübeck-Schlutup de.1131 with link = "line.de.1132" { - track(:private, sf[:slu.w51 + 0.5ssw, :slh - 1ssw]); - } + track(:station, sf[:slu.w31, :f]); - - with link = "point.de.Lübeck-Schlutup-Fischereihafen" { - track(:private:station, sf[:slh - 1ssw, :f]); + with zoom = :high line_label(:left:s, sf[:slh], "1132"); } } diff --git a/rules/de/a/d3/11/1133.map b/rules/de/a/d3/11/1133.map index 33571d84..156718d9 100644 --- a/rules/de/a/d3/11/1133.map +++ b/rules/de/a/d3/11/1133.map @@ -1,21 +1,12 @@ # DE 1133. Lübeck-Schlutup - Lübeck-Schlutup Breitling # -let sb = path("d4.de.1133"); +let sb = path("d3.de.1133"); with detail = 3 { - with link = "point.de.Lübeck-Schlutup-W51" { - with layer = -1 { - track(:private:station :removed, - sb[:slu.w51, :slu.w51 + 0.5ssw] - ); - } - } - with link = "line.de.1133" { - track(:private :removed, sb[:slu.w51 + 0.5ssw, :bre - 1ssw]); - } + track(:station, sb[:slu.w51, :f]); - with link = "point.de.Lübeck-Schlutup-Breitling" { - track(:private:station :removed, sb[:bre - 1ssw, :f]); + with zoom = :high line_label(:left:n, sb[:bre - 0.1km], "1133"); } } + diff --git a/rules/de/a/d3/11/1135.map b/rules/de/a/d3/11/1135.map new file mode 100644 index 00000000..0d8685ab --- /dev/null +++ b/rules/de/a/d3/11/1135.map @@ -0,0 +1,14 @@ +# DE 1135. Lübeck Hgbf - Lübeck St Jürgen Steintor +# +let lj = path("d3.de.1135"); + +with detail = 3 { + with link = "line.de.1135" { + track(:station :removed, + lj[:lua.yk - 1.2dl, :lua.yk - 1.1dl] << 3.5dt + -- lj[:lua.yk - 0.1dl, :lua.yk] << 4.5dt + .. lj[:a + 7dt, :f] + ); + } +} + diff --git a/rules/de/a/d3/11/1136.map b/rules/de/a/d3/11/1136.map new file mode 100644 index 00000000..9dac92c9 --- /dev/null +++ b/rules/de/a/d3/11/1136.map @@ -0,0 +1,8 @@ +# DE 1136. Lübeck St Jürgen Gaswerk II - Lübeck St Jürgen Walkmühlenweg +# +with detail = 3 { + with link = "line.de.1136" { + track(:station :removed, path("d3.de.1136")[:gas.yw, :f]); + } +} + diff --git a/rules/de/a/d3/11/1137.map b/rules/de/a/d3/11/1137.map index 9bd0c580..c887a9ed 100644 --- a/rules/de/a/d3/11/1137.map +++ b/rules/de/a/d3/11/1137.map @@ -1,20 +1,24 @@ # DE 1137. Brandenbaum - Lübeck Konstinbahnhof # -let bk = path("d4.de.1137"); +let bk = path("d3.de.1137"); with detail = 3 { # point.de.Brandenbaum de.1131 with link = "line.de.1137" { - track(:second, - bk[:bra.yk - 0.1dl, :bra.yk] - .. bk[:aa, :kon - 1ssw] + track(:station, + bk[:bra + 0.5sw, :bra.yk] << 1dt + .. bk[:aa + 1dt, :kon - 1sw] ); + line_label(:right:sw, bk[:kon - 2.2km], "1137"); } with link = "point.de.Lübeck-Konstinbahnhof" { - track(:second:station, bk[:kon - 1ssw, :kon + 1ssw]); - marker(:de.gbf :left, bk[:kon]); + track(:station, bk[:kon - 1sw, :kon + 1sw]); + marker(:left :de.gbf, bk[:kon]); + slabel(:bottom, bk[:kon] << 1.2sh, + vbox(:center:top, "Konstin-", "bahnhof") + ); } } diff --git a/rules/de/a/d3/11/1141.map b/rules/de/a/d3/11/1141.map index f1f5e10b..c1d523ac 100644 --- a/rules/de/a/d3/11/1141.map +++ b/rules/de/a/d3/11/1141.map @@ -1,174 +1,155 @@ # DE 1141. Schwarzenbek - Bad Oldesloe # -let so = path("d4.de.1141"); +let so = path("d3.de.1141"); with detail = 3 { + # point.de.Schwarzenbek de.6100 + with link = "line.de.1141" { - with layer = -1 track(:second :removed, - so[:swa.x, :swa.x + 0.1dl] >> 0.5dt - .. so[:swa.gg, :hav - 1ssw] + track(:second :removed, + so[:swa + 1sw, :swa.yo] >> 1.5dt + .. so[:swa.ffo, :hav - 1sw] ); + line_label(:right:w :removed, so[:swa.ffo + 1.3km], "1141"); } with link = "point.de.Havekost" { - track(:second:station :removed, so[:hav - 1ssw, :hav + 1ssw]); - marker(:de.hp :removed :left, so[:hav]); - slabel(:right :removed, so[:hav - 0.5ssw] >> 1dt, "Havekost"); + track(:second :station :removed, so[:hav - 1sw, :hav + 1sw]); + marker(:left :de.hp :removed, so[:hav]); + slabel(:right :removed, so[:hav - 0.55sw] >> 1dt, "Havekost"); } with link = "line.de.1141" { - track(:second :removed, so[:hav + 1ssw, :moh - 1ssw]); + track(:second :removed, so[:hav + 1sw, :moh - 1sw]); } with link = "point.de.Möhnsen" { - track(:second:station :removed, so[:moh - 1ssw, :moh + 1ssw]); - marker(:de.hst :removed :right, so[:moh]); - with layer = -1 marker(:de.bf :gone :right, so[:moh]); - slabel(:right :removed, so[:moh - 0.7ssw] >> 1.4ssw, - "Möhnsen" - ); + track(:second :station :removed, so[:moh - 1sw, :moh + 1sw]); + marker(:right :de.bf :removed, so[:moh]); + slabel(:right :removed, so[:moh - 0.6sw] >> 1.3sh, "Möhnsen"); } with link = "line.de.1141" { - track(:second :removed, so[:moh + 1ssw, :dah - 1ssw]); - with layer = 1 line_badge(:removed, so[:moh + 1.9km], "1141"); + track(:second :removed, so[:moh + 1sw, :dah - 1sw]); } with link = "point.de.Dahmker" { - track(:second:station :removed, so[:dah - 1ssw, :dah + 1ssw]); - marker(:de.hp :removed :left, so[:dah]); - slabel(:left :removed, so[:dah - 0.3ssw] << 1.8ssw, "Dahmker"); + track(:second :station :removed, so[:dah - 1sw, :dah + 1sw]); + marker(:left :de.hp :removed, so[:dah]); + slabel(:right :removed, so[:dah - 0.55sw] >> 1dt, "Dahmker"); } with link = "line.de.1141" { - track(:second :removed, so[:dah + 1ssw, :ham - 1ssw]); + track(:second :removed, so[:dah + 1sw, :ham - 1sw]); } with link = "point.de.Hamfelde" { - track(:second:station :removed, so[:ham - 1ssw, :ham + 1ssw]); - marker(:de.hp :removed :left, so[:ham]); - slabel(:left :removed, so[:ham - 0.3ssw] << 1.8ssw, "Hamfelde"); + track(:second :station :removed, so[:ham - 1sw, :ham + 1sw]); + marker(:left :de.hp :removed, so[:ham]); + slabel(:right :removed, so[:ham - 0.5sw] >> 1dt, "Hamfelde"); } with link = "line.de.1141" { - track(:second :removed, so[:ham + 1ssw, :vor - 1ssw]); + track(:second :removed, so[:ham + 1sw, :vor - 1sw]); } with link = "point.de.Vorburg-Trittau" { - track(:second:station :removed, so[:vor - 1ssw, :vor + 1ssw]); - marker(:de.hp :removed :left, so[:vor]); - slabel(:right :removed, so[:vor - 0.3ssw] >> 0.5dt, - "Vorburg-Trittau" - ); + track(:second :station :removed, so[:vor - 1sw, :vor + 1sw]); + marker(:left :de.hp :removed, so[:vor]); + slabel(:right :removed, so[:vor - 0.5sw] >> 0.7dt, "Vorburg-Trittau"); } with link = "line.de.1141" { - track(:second :removed, so[:vor + 1ssw, :tri - 1ssw]); + track(:second :removed, so[:vor + 1sw, :tri - 1sw]); } with link = "point.de.Trittau" { - track(:second:station :removed, so[:tri - 1ssw, :tri + 1ssw]); - marker(:de.bf :removed :left, so[:tri]); - slabel(:right :removed, so[:tri - 0.5ssw] >> 0.8dt, - span(:bold, "Trittau") - ); + track(:second :station :removed, so[:tri - 1sw, :tri + 1sw]); + marker(:left :de.bf :removed, so[:tri]); + slabel(:right :removed :bold, so[:tri - 0.6sw] >> 1dt, "Trittau"); } with link = "line.de.1141" { - track(:second :removed, so[:tri + 1ssw, :gro - 1ssw]); + track(:second :removed, so[:tri + 1sw, :gro - 1sw]); } with link = "point.de.Grönwohld" { - track(:second:station :removed, so[:gro - 1ssw, :gro + 1ssw]); - marker(:de.hp :removed :left, so[:gro]); - slabel(:right :removed, so[:gro - 0.5ssw] >> 1dt, - "Gröhnwohld" - ); + track(:second :station :removed, so[:gro - 1sw, :gro + 1sw]); + marker(:left :de.hp :removed, so[:gro]); + slabel(:right :removed, so[:gro - 0.55sw] >> 1dt, "Grönwohld"); } with link = "line.de.1141" { - track(:second :removed, so[:gro + 1ssw, :dwe - 1ssw]); + track(:second :removed, so[:gro + 1sw, :dwe - 1sw]); + line_label(:right:w :removed, so[:gro + 1.3km], "1141"); } with link = "point.de.Dwerkathen" { - track(:second:station :removed, so[:dwe - 1ssw, :dwe + 1ssw]); - marker(:de.hst :removed :right, so[:dwe]); - with layer = -1 marker(:de.bf :gone :right, so[:dwe]); - slabel(:right :removed, so[:dwe - 0.6ssw] >> 1.4ssw, - "Dwerkathen" - ); + track(:second :station :removed, so[:dwe - 1sw, :dwe + 1sw]); + marker(:left :de.bf :removed, so[:dwe]); + slabel(:right :removed, so[:dwe - 0.55sw] >> 1dt, "Dwerkathen"); } with link = "line.de.1141" { - track(:second :removed, so[:dwe + 1ssw, :spr - 1ssw]); + track(:second :removed, so[:dwe + 1sw, :spr - 1sw]); } with link = "point.de.Sprenge" { - track(:second:station :removed, so[:spr - 1ssw, :spr + 1ssw]); - marker(:de.hp :removed :left, so[:spr]); - slabel(:right :removed, so[:spr - 0.3sw] >> 1.3dt, - "Sprenge" - ); + track(:second :station :removed, so[:spr - 1sw, :spr + 1sw]); + marker(:left :de.hp :removed, so[:spr]); + slabel(:right :removed, so[:spr - 0.55sw] >> 1.3dt, "Sprenge"); } with link = "line.de.1141" { - track(:second :removed, so[:spr + 1ssw, :mol - 1ssw]); + track(:second :removed, so[:spr + 1sw, :mol - 1sw]); } with link = "point.de.Mollhagen" { - track(:second:station :removed, so[:mol - 1ssw, :mol + 1ssw]); - marker(:de.bf :removed :left, so[:mol]); - slabel(:left :removed, so[:mol - 0.3ssw] << 1.8ssw, - "Mollhagen" - ); + track(:second :station :removed, so[:mol - 1sw, :mol + 1sw]); + marker(:left :de.bf :removed, so[:mol]); + slabel(:right :removed, so[:mol - 0.6sw] >> 1dt, "Mollhagen"); } with link = "line.de.1141" { - track(:second :removed, so[:mol + 1ssw, :bar - 1ssw]); - with layer = 1 line_badge(:removed, so[:mol + 1.9km], "1141"); + track(:second :removed, so[:mol + 1sw, :bar - 1sw]); } with link = "point.de.Barkhorst" { - track(:second:station :removed, so[:bar - 1ssw, :bar + 1ssw]); - marker(:de.hst :removed :left, so[:bar]); - with layer = -1 marker(:de.bf :gone :left, so[:bar]); - slabel(:right :removed, so[:bar - 0.6ssw] >> 0.8dt, - "Barkhorst" - ); + track(:second :station :removed, so[:bar - 1sw, :bar + 1sw]); + marker(:left :de.hst :removed, so[:bar]); + slabel(:right :removed, so[:bar - 0.6sw] >> 1dt, "Barkhorst"); } with link = "line.de.1141" { - track(:second :removed, so[:bar + 1ssw, :roh - 1ssw]); + track(:second :removed, so[:bar + 1sw, :roh - 1sw]); + line_label(:right:w :removed, so[:bar + 1.3km], "1141"); } with link = "point.de.Rohlfshagen" { - track(:second:station :removed, so[:roh - 1ssw, :roh + 1ssw]); - marker(:de.hst :removed :left, so[:roh]); - with layer = -1 marker(:de.bf :gone :left, so[:roh]); - slabel(:right :removed, so[:roh - 0.6ssw] >> 0.8dt, - "Rohlfshagen" - ); + track(:second :station :removed, so[:roh - 1sw, :roh + 1sw]); + marker(:left :de.bf :removed, so[:roh]); + slabel(:right :removed, so[:roh - 0.6sw] >> 1dt, "Rohlfshagen"); } with link = "line.de.1141" { - with layer = 2 track(:second :removed, - so[:roh + 1ssw, :rup - 1ssw] + with layer = 1 track(:second :removed :casing, + so[:roh + 1sw, :rup - 0.5sw] ); - with layer = 1 casing(:second, so[:rup.x - 2dt, :rup.x + 2dt]); } - with link = "point.de.Rümpel", layer = 2 { - track(:second:station :removed, so[:rup - 1ssw, :rup + 1ssw]); - marker(:de.hp :removed :left, so[:rup]); - slabel(:left :removed, so[:rup - 0.5ssw] + (-1.4ssw, 0.6ssw), - "Rümpel" + with link = "point.de.Rümpel" { + track(:second :station :removed, + so[:rup - 0.5sw, :rup + 0.5sw] ); + marker(:left :de.hp :removed, so[:rup]); + slabel(:left :removed, so[:rup] << 1.5sh + (0dt, 0.8sw), "Rümpel"); } with link = "line.de.1141" { - with layer = -1 track(:second:station :removed, - so[:rup + 1ssw, :rup + 1.1ssw] - .. so[:old.ys, :old.ys + 0.1dt] << 0.5dt + track(:second :removed :casing, + so[:rup + 0.5sw, :rup + 0.6sw] + .. so[:old.ys, :old - 2sw] << 1.5dt + .. so[:old - 1.1sw, :old - 1sw] << 1sh << 0.5dt ); } } diff --git a/rules/de/a/d3/11/1150.map b/rules/de/a/d3/11/1150.map index 4a38ae46..3276cf2a 100644 --- a/rules/de/a/d3/11/1150.map +++ b/rules/de/a/d3/11/1150.map @@ -1,106 +1,114 @@ # DE 1150. Lüneburg - Büchen # -let lb = path("d4.de.1150"); +let lb = path("d3.de.1150"); with detail = 3 { # point.de.Lüneburg de.1720 with link = "line.de.1150" { - track(:first :pax, lb[:lun.kk, :jag - 1ssw]); + track(:first :pax, + lb[:lun + 1sw, :lbn] >> 1.5dt + .. lb[:lun.yyb, :jag - 1sw] + ); } with link = "point.de.Jäger" { - track(:first:station :pax, lb[:jag - 1ssw, :jag + 1ssw]); - with layer = -4 marker(:de.anst :removed :left, lb[:jag]); - with layer = -5 marker(:de.hp :gone:left, lb[:jag]); - slabel(:left :removed, lb[:jag + 0.7ssw] << 1.2ssw, "Jäger"); + track(:first :station :pax, lb[:jag - 1sw, :jag + 1sw]); + marker(:left :de.hp :removed, lb[:jag]); + slabel(:left :removed, lb[:jag - 0.5sw] << 1.4sh, "Jäger"); } with link = "line.de.1150" { - track(:first :pax, lb[:jag + 1ssw, :ade - 1ssw]); + track(:first :pax, lb[:jag + 1sw, :ade - 1sw]); } with link = "point.de.Adendorf" { - track(:first:station :pax, lb[:ade - 1ssw, :ade + 1ssw]); - with layer = -2 marker(:de.bbf :left, lb[:ade]); - with layer = -4 marker(:de.bf :removed :left, lb[:ade]); - slabel(:left, lb[:ade - 0.6ssw] << 1.4ssw, "Adendorf"); + track(:first :station :pax, lb[:ade - 1sw, :ade + 1sw]); + marker(:left :de.bf :pax, lb[:ade]); + slabel(:left :pax, lb[:ade - 0.7sw] << 1.4sh, "Adendorf"); } with link = "line.de.1150" { - track(:first :pax, lb[:ade + 1ssw, :ech - 1ssw]); - with layer = 1 line_badge(:pax, lb[:ade + 4.0km], "1150"); + track(:first :pax, lb[:ade + 1sw, :ech - 1sw]); + line_label(:left:se :pax, lb[:ade + 2km], "1150"); } with link = "point.de.Echem" { - track(:first:station :pax, lb[:ech - 1ssw, :ech + 1ssw]); - marker(:de.hp :pax :left, lb[:ech]); - with layer = -4 marker(:de.bf :removed :left, lb[:ech]); - slabel(:left :pax, lb[:ech - 0.8ssw] << 1.5ssw, - span(:bold, "Echem") - ); + track(:first :station :pax, lb[:ech - 1sw, :ech + 1sw]); + marker(:left :de.hp :pax, lb[:ech]); + marker(:left :de.exbf :pax, lb[:ech]); + slabel(:left :pax :bold, lb[:ech - 0.7sw] << 1.8sh, "Echem"); } with link = "line.de.1150" { - track(:first :pax, lb[:ech + 1ssw, :hoh - 1ssw]); + track(:first :pax, lb[:ech + 1sw, :lag - 1.5sw]); + line_label(:left:e :pax, lb[:hoh - 1.2km], "1150"); } with link = "point.de.Hohnstorf" { - track(:first:station :pax, lb[:hoh - 1ssw, :hoh + 1ssw]); - with layer = -4 marker(:de.hp :removed :left, lb[:hoh]); - slabel(:left :removed, lb[:hoh - 1ssw] << 1.0ssw, - "Hohnstorf" - ); + track(:first :station :pax, lb[:lag - 1.5sw, :lag - 0.5sw]); + marker(:left :de.hp :removed, lb[:lag - 1sw]); + slabel(:left :removed, lb[:lag - 1.5sw] << 1.4sh, "Hohnstorf"); } - with link = "line.de.1150" { - track(:first :pax, lb[:hoh + 1ssw, :lau - 1ssw]); + with link = "point.de.Lauenburg-Elbe-LGr" { + track(:first :station :pax, lb[:lag - 0.5sw, :lag + 0.5sw]); + marker(:left :de.lgr, lb[:lag]); + marker(:right :de.lgr, lb[:lag]); + slabel(:right, lb[:lag] >> 1.2sh + (-0.5sw, 0dt), + hbox(:left:top :roman:italic, "NI/SH") + ); } with link = "point.de.Lauenburg-Elbe" { - track(:first:station :pax, lb[:lau - 1ssw, :lau + 1ssw]); - marker(:de.bf :pax :left, lb[:lau]); - slabel(:left :pax, lb[:lau + 1ssw] << 1.5ssw, - hbox(:center:base, - span(:regular, "Lauenburg "), - span(:light, "(Elbe)") - ) + track(:first :station :pax, lb[:lag + 0.5sw, :lau + 1sw]); + marker(:left :de.bf :pax, lb[:lau]); + slabel(:left :pax, lb[:lau - 0.3sw] << 1.4sh, + hbox(:right:base, "Lauenburg ", span(:light, "(Elbe)")) ); } with link = "line.de.1150" { - track(:first :pax, lb[:lau + 1ssw, :dan - 0.5ssw]); + track(:first :pax, lb[:lau + 1sw, :dak - 0.5sw]); } with link = "point.de.Dalldorf-Kreuz" { - with layer = -1 marker(:de.bk :removed :left, lb[:dak]); + track(:first :station :pax, lb[:dak - 0.5sw, :dak + 0.5sw]); + marker(:left :de.bk :removed, lb[:dak]); + slabel(:left :removed :light, lb[:dak - 0.5sw] << 1.4sh, + "Dalldorf Kreuz" + ); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:dak + 0.5sw, :dan - 1sw]); } with link = "point.de.Dalldorf" { - track(:first:station :pax, lb[:dan - 1ssw, :dal + 1ssw]); - marker(:de.bbf :right, lb[:dan]); - with layer = -4 marker(:de.bf :removed :right, lb[:dal]); - slabel(:left, lb[:dan] << 1.2dt, "Dalldorf"); + track(:first :station :pax, lb[:dan - 1sw, :dal + 0.5sw]); + marker(:right :de.bbf, lb[:dan]); + slabel(:right :pax, lb[:dan - 0.5sw] >> 1.6sh, "Dalldorf"); + + marker(:right :de.bf :removed, lb[:dal]); + slabel(:left :removed, lb[:dal - 0.5sw] << 1.0dt, "Dalldorf"); } with link = "line.de.1150" { - track(:first :pax, lb[:dal + 1ssw, :wit - 1ssw]); + track(:first :pax, lb[:dal + 0.5sw, :wit - 1sw]); } with link = "point.de.Witzeeze" { - track(:first:station :pax, lb[:wit - 1ssw, :wit + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, lb[:wit]); - slabel(:left :removed, lb[:wit - 0.6ssw] << 1dt, "Witzeeze"); + track(:first :station :pax, lb[:wit - 1sw, :wit + 1sw]); + marker(:right :de.hp :removed, lb[:wit]); + slabel(:left :removed, lb[:wit - 0.5sw] << 1.0dt, "Witzeeze"); } with link = "line.de.1150" { track(:first :pax, - lb[:wit + 1ssw, :buc.b - 500m] - .. path("d4.de.a.6100")[:buc - 0.51ssw, :buc - 0.5ssw] - << 0.5dt << 1ssw + lb[:wit + 1sw, :buc.yyl - 3dt] + .. path("d3.de.a.6100")[:buc - 0.1dl, :buc] << 1sh << 0.5dt ); + line_label(:left:e :pax, lb[:buc.yyl - 1.2km], "1150"); } - - # point.de.Büchen de.6100 } diff --git a/rules/de/a/d3/11/1151.map b/rules/de/a/d3/11/1151.map index 2a2752d5..fc9ae0b6 100644 --- a/rules/de/a/d3/11/1151.map +++ b/rules/de/a/d3/11/1151.map @@ -1,321 +1,356 @@ # DE 1151. Wittenberge - Buchholz (Nordh) # -let wb = path("d4.de.a.1151"); +let wb = path("d3.de.a.1151"); with detail = 3 { + # DE-W + with link = "line.de.1151" { - track(:first :removed, wb[:dog + 0.5ssw, :dan - 1ssw]); + track(:first :removed, wb[:dog + 0.5sw, :doy - 0.5sw]); + } + + with link = "point.de.Dömitz-LGr-II" { + track(:first :station :removed, wb[:doy - 0.5sw, :doy + 0.5sw]); + marker(:right :de.lgr :removed, wb[:doy]); + marker(:left :de.lgr :removed, wb[:doy]); + slabel(:top :removed :roman:italic, wb[:doy] >> 1.2sh, "Pre/Msw"); + } + + with link = "line.de.1151" { + track(:first :removed, wb[:doy + 0.5sw, :qui - 0.5sw]); } with link = "point.de.Quickborn-Dannenberg" { - track(:first:station :removed, wb[:qui - 0.5ssw, :qui + 0.5ssw]); - marker(:de.bk :removed :left, wb[:qui]); + track(:first :station :removed, wb[:qui - 0.5sw, :qui + 0.5sw]); + marker(:left :de.bk :removed, wb[:qui]); + slabel(:bottom :removed :light, wb[:qui] << 1.2sh + (1sw, 0dt), + "Quickborn" + ); + } + + with link = "line.de.1151" { + track(:first :removed, wb[:qui + 0.5sw, :dan - 0.5sw - 3dl]); + line_label(:right:s :removed, wb[:qui + 1.8km], "1151"); } with link = "point.de.Dannenberg-Ost" { - track(:first:station :pax, wb[:dan - 1ssw, :dan.yl]); - marker(:de.bf :pax :left, wb[:dan]); - slabel(:right :pax, wb[:dan + 1ssw] << 2.8ssw, - span(:bold, "Dannenberg Ost") + # DE 1151 + track(:second :station :pax, wb[:dan - 0.5sw - 3dl, :dan + 1sw]); + + # DE 6905 + track(:second :station, + wb[:dan - 0.5sw - 2.1dl, :dan - 0.5sw - 2dl] + -- wb[:dan - 0.5sw - 1dl, :dan + 1sw] << 1dt + ); + + marker(:left :de.bf :pax, wb[:dan] << 1dt); + slabel(:right :pax :bold, wb[:dan] << 1dt << 1.2sh + (-1.5sw, 0dt), + hbox(:left:top, "Dannenberg Ost") ); } with link = "line.de.1151" { - track(:second :pax, wb[:dan.yl, :pis - 1ssw]); + track(:first :pax, wb[:dan + 1sw, :pis - 1sw]); } with link = "point.de.Pisselberg" { - track(:second:station :pax, wb[:pis - 1ssw, :pis + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, wb[:pis]); - slabel(:left :removed, wb[:pis - 0.5ssw] << 2.4ssw, - "Pisselberg" - ); + track(:second :station :pax, wb[:pis - 1sw, :pis + 1sw]); + marker(:left :de.hp :removed, wb[:pis]); + slabel(:right :removed, wb[:pis - 0.5sw] >> 1.0dt, "Pisselberg"); } with link = "line.de.1151" { - track(:second :pax, wb[:pis + 1ssw, :hit - 1ssw]); + track(:first :pax, wb[:pis + 1sw, :hit - 1sw]); + line_label(:left:ne :pax, wb[:pis + 2km], "1151"); } with link = "point.de.Hitzacker" { - track(:second:station :pax, wb[:hit - 1ssw, :hit + 1ssw]); - marker(:de.hp :pax :right, wb[:hit]); - marker(:de.bk :pax :right, wb[:hit]); - with layer = -1 marker(:de.bf :removed, wb[:hit]); - slabel(:right :pax, wb[:hit - 0.6ssw] >> 1.6ssw, "Hitzacker"); + track(:second :station :pax, wb[:hit - 1sw, :hit + 1sw]); + marker(:right :de.hp :pax, wb[:hit]); + marker(:right :de.exbf :pax, wb[:hit]); + slabel(:right :pax, wb[:hit - 0.5sw] >> 1.8sh, "Hitzacker"); } with link = "line.de.1151" { - track(:second :pax, wb[:hit + 1ssw, :har - 1ssw]); + track(:first :pax, wb[:hit + 1sw, :sar - 0.5sw]); } with link = "point.de.Sarchern" { - track(:second:station, wb[:sar - 0.5ssw, :sar + 0.5ssw]); - with layer = -1 marker(:de.bk :removed, wb[:sar]); + track(:second :station :pax, wb[:sar - 0.5sw, :sar + 0.5sw]); + marker(:right :de.bk :removed, wb[:sar]); + slabel(:top :removed :light, wb[:sar] >> 1.2sh, "Sarchern"); + } + + with link = "line.de.1151" { + track(:first :pax, wb[:sar + 0.5sw, :har - 1sw]); } with link = "point.de.Harlingen" { - track(:second:station :pax, wb[:har - 1ssw, :har + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, wb[:har]); - slabel(:bottom :removed, wb[:har] << 1.2ssw, "Harlingen"); + track(:second :station :pax, wb[:har - 1sw, :har + 1sw]); + marker(:left :de.hp :pax, wb[:har]); + slabel(:bottom :pax, wb[:har] << 1.2sh, "Harlingen"); } with link = "line.de.1151" { - track(:second :pax, wb[:har + 1ssw, :lei - 1ssw]); + track(:first :pax, wb[:har + 1sw, :lei - 1sw]); } with link = "point.de.Leitstade" { - track(:second:station :pax, wb[:lei - 1ssw, :lei + 1ssw]); - marker(:de.hp :pax :right, wb[:lei]); - with layer = -1 marker(:de.bf :removed :right, wb[:lei]); - slabel(:top :pax, wb[:lei - 0.1ssw] >> 1.8ssw, "Leitstade"); + track(:second :station :pax, wb[:lei - 1sw, :lei + 1sw]); + marker(:right :de.hp :pax, wb[:lei]); + marker(:right :de.exbf :pax, wb[:lei]); + slabel(:right :pax, wb[:lei - 0.5sw] >> 1.8sh, "Leitstade"); } with link = "line.de.1151" { - track(:second :pax, wb[:lei + 1ssw, :goh - 1ssw]); + track(:first :pax, wb[:lei + 1sw, :goh - 1sw]); } with link = "point.de.Göhrde" { - track(:second:station :pax, wb[:goh - 1ssw, :goh + 1ssw]); - marker(:de.hp :pax :left, wb[:goh]); - with layer = -1 marker(:de.bf :removed :left, wb[:goh]); - slabel(:bottom :pax, wb[:goh] << 1.6ssw, "Göhrde"); + track(:second :station :pax, wb[:goh - 1sw, :goh + 1sw]); + marker(:left :de.hp :pax, wb[:goh]); + marker(:left :de.exbf :pax, wb[:goh]); + slabel(:bottom :pax, wb[:goh] << 1.8sh, "Göhrde"); } with link = "line.de.1151" { - track(:second :pax, wb[:goh + 1ssw, :old - 1ssw]); + track(:first :pax, wb[:goh + 1sw, :old - 1sw]); } with link = "point.de.Oldendorf" { - track(:second:station :pax, wb[:old - 1ssw, :old + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, wb[:old]); - slabel(:top :pax :removed, wb[:old] >> 1.2ssw, "Oldendorf"); + track(:second :station :pax, wb[:old - 1sw, :old + 1sw]); + marker(:right :de.hp :removed, wb[:old]); + slabel(:top :removed, wb[:old] >> 1.2sh + (-0.5sw, 0dt), "Oldendorf"); } with link = "line.de.1151" { - track(:second :pax, wb[:old + 1ssw, :nee - 1ssw]); + track(:first :pax, wb[:old + 1sw, :suc - 0.5sw]); } with link = "point.de.Süschendorf" { - track(:second:station, wb[:suc - 0.5ssw, :suc + 0.5ssw]); - with layer = -1 marker(:de.bk :removed :left, wb[:suc]); + track(:second :station :pax, wb[:suc - 0.5sw, :suc + 0.5sw]); + marker(:left :de.bk :removed, wb[:suc]); + slabel(:right :removed :light, wb[:suc] << 1.0sh + (-1.5sw, 0dt), + hbox(:left:top, "Süschendorf") + ); + } + + with link = "line.de.1151" { + track(:first :pax, wb[:suc + 0.5sw, :nee - 1sw]); } with link = "point.de.Neetzendorf" { - track(:second:station :pax, wb[:nee - 1ssw, :nee + 1ssw]); - marker(:de.hp :pax :left, wb[:nee]); - slabel(:left :pax, wb[:nee - 1ssw] << 1.1ssw, + track(:second :station :pax, wb[:nee - 1sw, :nee + 1sw]); + marker(:left :de.hp :pax, wb[:nee]); + slabel(:left :pax, wb[:nee] << 1.2sh + (1.5sw, 0dt), hbox(:right:top, "Neetzendorf") ); } with link = "line.de.1151" { - track(:second :pax, wb[:nee + 1ssw, :dah - 1ssw]); - with layer = 1 line_badge(:open :pax, wb[:nee + 1.6km], "1151"); + track(:first :pax, wb[:nee + 1sw, :dah - 1sw]); } with link = "point.de.Dahlenburg" { - track(:second:station :pax, wb[:dah - 1ssw, :dah + 1ssw]); - marker(:de.bf :pax :right, wb[:dah]); - slabel(:left :pax, wb[:dah - 1ssw] << 6pt, - span(:bold, "Dahlenburg") + track(:second :station :pax, wb[:dah - 1sw, :dah + 1sw]); + marker(:right :de.bf :pax, wb[:dah]); + slabel(:left :pax :bold, wb[:dah] << 0.5dt + (1sw, 0dt), + hbox(:right:top, "Dahlenburg") ); } with link = "line.de.1151" { - track(:second :pax, wb[:dah + 1ssw, :dum - 1ssw]); + track(:first :pax, wb[:dah + 1sw, :dum - 1sw]); } with link = "point.de.Dumstorf" { - track(:second:station :pax, wb[:dum - 1ssw, :dum + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, wb[:dum]); - slabel(:left :removed, wb[:dum - 0.4ssw] << 2.4ssw, - "Dumstorf" + track(:second :station :pax, wb[:dum - 1sw, :dum + 1sw]); + marker(:left :de.hp :removed, wb[:dum]); + slabel(:left :removed, wb[:dum + 0.9sw] << 1.2sh, + hbox(:right:top, "Dumstorf") ); } with link = "line.de.1151" { - track(:second :pax, wb[:dum + 1ssw, :bav - 1ssw]); + track(:first :pax, wb[:dum + 1sw, :bav - 1sw]); + line_label(:right:s :pax, wb[:dum + 1.5km], "1151"); } with link = "point.de.Bavendorf" { - track(:second:station :pax, wb[:bav - 1ssw, :bav + 1ssw]); - marker(:de.hp :pax :left, wb[:bav]); - with layer = -1 marker(:de.bf :removed :left, wb[:bav]); - slabel(:bottom :pax, wb[:bav] << 1.0ssw, "Bavendorf"); + track(:second :station :pax, wb[:bav - 1sw, :bav + 1sw]); + marker(:left :de.hp :pax, wb[:bav]); + marker(:left :de.exbf :pax, wb[:bav]); + slabel(:bottom :pax, wb[:bav] << 1.5sh, "Bavendorf"); } with link = "line.de.1151" { - track(:second :pax, wb[:bav + 1ssw, :roh - 1ssw]); + track(:second :pax, wb[:bav + 1sw, :roh - 1sw]); } with link = "point.de.Rohstorf" { - track(:second:station :pax, wb[:roh - 1ssw, :roh + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, wb[:roh]); - slabel(:left :removed, wb[:roh - 1.5ssw] << 2.6ssw, "Rohstorf"); + track(:second :station :pax, wb[:roh - 1sw, :roh + 1sw]); + marker(:left :de.hp :removed, wb[:roh]); + slabel(:bottom :removed, wb[:roh] << 1.2sh + (-1sw, 0dt), "Rohstorf"); } with link = "line.de.1151" { - track(:second :pax, wb[:roh + 1ssw, :vas - 1ssw]); + track(:second :pax, wb[:roh + 1sw, :vas - 1sw]); } with link = "point.de.Vastorf" { - track(:second:station :pax, wb[:vas - 1ssw, :vas + 1ssw]); - marker(:de.hp :pax :left, wb[:vas]); - with layer = -1 marker(:de.bf :removed :left, wb[:vas]); - slabel(:left :pax, wb[:vas - 1.5ssw] << 2.4ssw, "Vastorf"); + track(:second :station :pax, wb[:vas - 1sw, :vas + 1sw]); + marker(:left :de.hp :pax, wb[:vas]); + marker(:left :de.exbf :pax, wb[:vas]); + slabel(:bottom :pax, wb[:vas] << 1.7sh + (-1sw, 0dt), "Vastorf"); } with link = "line.de.1151" { - track(:second :pax, wb[:vas + 1ssw, :wen - 1ssw]); + track(:second :pax, wb[:vas + 1sw, :wen - 1sw]); + line_label(:left:ne :pax, wb[:wen - 3km], "1151"); } with link = "point.de.Wendisch-Evern" { - track(:second:station :pax, wb[:wen - 1ssw, :wen + 1ssw]); - marker(:de.hp :pax :right, wb[:wen]); - with layer = -1 marker(:de.bf :removed :right, wb[:wen]); - slabel(:right :pax, wb[:wen + 1.5ssw] >> 1.2ssw, - "Wendisch Evern" + track(:second :station :pax, wb[:wen - 1sw, :wen + 1sw]); + marker(:right :de.hp :pax, wb[:wen]); + marker(:right :de.exbf :pax, wb[:wen]); + slabel(:top :pax, wb[:wen] >> 1.6sh, + vbox(:center:bottom, "Wendisch", "Evern") ); } with link = "line.de.1151" { - with layer = 2 track(:second :pax, - wb[:wen + 1ssw, :wen + 800m] - .. wb[:lun.r - 0.1dl, :lun.r] << 0.5dt << 1.25ssw + with layer = 1 track(:second :pax :casing, + wb[:wen + 1sw, :lun.xa] + .. wb[:lun.yd, :lun - 1sw] << 1sh << 0.5dt ); - with layer = 1 casing(:second :pax, - wb[:wen + 1ssw, :wen + 800m] - .. wb[:lun.r - 0.1dl, :lun.r] << 0.5dt << 1.25ssw + } + + with link = "point.de.Lüneburg-Westseite" { + track(:second :station :cat:ac15 :pax, + wb[:lun - 1sw, :lun + 1sw] << 1sh << 0.5dt ); } - # point.de.Lüneburg de.1720 + with link = "line.de.1151" { + track(:second :cat:ac15 :pax, + wb[:lun + 1sw, :lun + 1.1sw] << 1sh << 0.5dt + .. wb[:lkn - 0.51sw, :lkn - 0.5sw] << 1.5dt + ); + } + + # point.de.Lüneburg-Nordkopf de.1720 with link = "line.de.1151" { - with layer = -1 track(:second:removed, - wb[:lkn + 1ssw, :ste - 1ssw] << 1.5dt + track(:second :removed, + wb[:lun.yj - 0.1dl, :lun.yj] << 1.5dt + .. wb[:lun.yyj + 2dt, :ste - 0.5sw] ); } with link = "point.de.Sternkamp" { - track(:second:station :removed, - wb[:ste - 1ssw, :ste + 1ssw] << 1.5dt - ); - marker(:de.hp :removed :left, wb[:ste] << 1.5dt); - slabel(:left :removed, wb[:ste - 0.5ssw] << 1.5dt << 2.6ssw, - "Sternkamp" + track(:second :station :removed, wb[:ste - 0.5sw, :ste + 1sw]); + marker(:left :de.hp :removed, wb[:ste]); + slabel(:left :removed, wb[:ste] << 0.1sh + (-1.3sw, 0dt), + hbox(:right:top, "Sternkamp") ); } with link = "line.de.1151" { - track(:second :removed, wb[:ste + 1ssw, :och - 1ssw] << 1.5dt); + track(:second :removed, wb[:ste + 1sw, :och - 1sw]); } with link = "point.de.Ochtmissen" { - track(:second:station :removed, - wb[:och - 1ssw, :och + 1ssw] << 1.5dt); - marker(:de.hp :removed :left, wb[:och] << 1.5dt); - slabel(:left :removed, wb[:och - 0.5ssw] << 1.5dt << 2.2ssw, - "Ochtmissen" + track(:second :station :removed, wb[:och - 1sw, :och + 1sw]); + marker(:left :de.hp :removed, wb[:och]); + slabel(:left :removed, wb[:och] << 0.1sh + (-1.3sw, 0dt), + hbox(:right:top, "Ochtmissen") ); } with link = "line.de.1151" { - track(:second :removed, wb[:och + 1ssw, :vog - 1ssw] << 1.5dt); + track(:second :removed, wb[:och + 1sw, :vog - 1sw]); } with link = "point.de.Vögelsen" { - track(:second:station :removed, - wb[:vog - 1ssw, :vog + 1ssw] << 1.5dt - ); - marker(:de.hp :removed :left, wb[:vog] << 1.5dt); - slabel(:left :removed, wb[:vog - 0.5ssw] << 1.5dt << 2.2ssw, - "Vögelsen" + track(:second :station :removed, wb[:vog - 1sw, :vog + 1sw]); + marker(:left :de.hp :removed, wb[:vog]); + slabel(:left :removed, wb[:vog] << 0.1sh + (-1.3sw, 0dt), + hbox(:right:top, "Vögelsen") ); } with link = "line.de.1151" { - track(:second :removed, - wb[:vog + 1ssw, :vog + 1.1ssw] << 1.5dt - .. wb[:mec - 1.1ssw, :mec - 1ssw] - ); + track(:second :removed, wb[:vog + 1sw, :mec - 1sw]); } with link = "point.de.Mechtersen" { - track(:second:station :removed, wb[:mec - 1ssw, :mec + 1ssw]); - marker(:de.bf :removed :left, wb[:mec]); - with layer = -1 slabel(:left :removed, wb[:mec - 1ssw] << 2.4ssw, - "Mechtersen" + track(:second :station :removed, wb[:mec - 1sw, :mec + 1sw]); + marker(:left :de.bf :removed, wb[:mec]); + slabel(:left :removed, wb[:mec] << 0.1sh + (-1.3sw, 0dt), + hbox(:right:top, "Mechtersen") ); } with link = "line.de.1151" { - track(:second :removed, wb[:mec + 1ssw, :bah - 1ssw]); - with layer = 1 line_badge(:removed, wb[:mec + 4.2km], "1151"); + track(:second :removed, wb[:mec + 1sw, :bah - 1sw]); + line_label(:left:n :removed, wb[:mec + 5km], "1151"); } with link = "point.de.Bahlburg" { - track(:second:station :removed, wb[:bah - 1ssw, :bah + 1ssw]); - marker(:de.hp :removed :left, wb[:bah]); - slabel(:right :removed, wb[:bah] >> 0.7dt, "Bahlburg"); + track(:second :station :removed, wb[:bah - 1sw, :bah + 1sw]); + marker(:left :de.hp :removed, wb[:bah]); + slabel(:bottom :removed, wb[:bah] << 1.2sh, "Bahlburg"); } with link = "line.de.1151" { - track(:second :removed, wb[:bah + 1ssw, :wul - 1ssw]); + track(:second :removed, wb[:bah + 1sw, :wul - 1sw]); } with link = "point.de.Wulfsen-Lüneburg" { - track(:second:station :removed, wb[:wul - 1ssw, :wul + 1ssw]); - marker(:de.bf :removed :left, wb[:wul]); - label(wb[:wul + 0.5ssw] >> 1.5dt, - vbox(:right:bottom :small :removed, - span(:bold, "Wulfsen"), - span(:regular, "(b L.b.)") - ) + track(:second :station :removed, wb[:wul - 1sw, :wul + 1sw]); + marker(:left :de.bf :removed, wb[:wul]); + slabel(:bottom :removed, wb[:wul] << 1.2sh, + vbox(:center:top, "Wulfsen", span(:light, "(b Lüneburg)")) ); } with link = "line.de.1151" { - track(:second :removed, wb[:wul + 1ssw, :tan - 1ssw]); + track(:second :removed, wb[:wul + 1sw, :tan - 1sw]); } with link = "point.de.Tangendorf" { - track(:second:station :removed, wb[:tan - 1ssw, :tan + 1ssw]); - marker(:de.hp :removed :left, wb[:tan]); - with layer = -1 marker(:de.bf :gone :left, wb[:tan]); - slabel(:bottom :removed, wb[:tan] << 1.2ssw, "Tangendorf"); + track(:second :station :removed, wb[:tan - 1sw, :tan + 1sw]); + marker(:left :de.hp :removed, wb[:tan]); + marker(:left :de.exbf :removed, wb[:tan]); + slabel(:bottom :removed, wb[:tan] << 1.5sh, "Tangendorf"); } with link = "line.de.1151" { - track(:second :removed, wb[:tan + 1ssw, :bra - 1ssw]); + track(:second :removed, wb[:tan + 1sw, :bra - 1sw]); } with link = "point.de.Brackel-Lüneburg" { - track(:second:station :removed, wb[:bra - 1ssw, :bra + 1ssw]); - marker(:de.hst :removed :left, wb[:bra]); - with layer = -1 marker(:de.bf :gone :left, wb[:bra]); - slabel(:left :removed, wb[:bra - 1ssw] << 1.2ssw, - vbox(:right:top, - span(:regular, "Brackel"), - span(:light, "(b Lüneburg)") - ) + track(:second :station :removed, wb[:bra - 1sw, :bra + 1sw]); + marker(:left :de.hst :removed, wb[:bra]); + marker(:left :de.exbf :removed, wb[:bra]); + slabel(:bottom :removed, wb[:bra] << 1.5sh, + vbox(:center:top, "Brackel ", span(:light, "(b Lüneburg) ")) ); } with link = "line.de.1151" { - track(:second :removed, wb[:bra + 1ssw, :mar - 1ssw]); + track(:second :removed, wb[:bra + 1sw, :mar - 1sw]); + line_label(:right:s :removed, wb[:mar - 1.8km], "1151"); } with link = "point.de.Marxen" { - track(:second:station :removed, wb[:mar - 1ssw, :mar + 1ssw]); - marker(:de.bf :removed :left, wb[:mar]); - slabel(:right :removed, wb[:mar - 0.5ssw] >> 1dt, "Marxen"); + track(:second :station :removed, wb[:mar - 1sw, :mar + 1sw]); + marker(:left :de.bf :removed, wb[:mar]); + slabel(:bottom :removed, wb[:mar] << 1.2sh, "Marxen"); } with link = "line.de.1151" { - with layer = -1 track(:second:station :removed, - wb[:mar + 1ssw, :mar + 1.1ssw] - .. wb[:jes.yl - 0.1dl, :jes.yl] << 0.5dt - ); + track(:second :removed, wb[:mar + 1sw, :jes.yl]); } } + diff --git a/rules/de/a/d3/11/1153.map b/rules/de/a/d3/11/1153.map index fcb4d356..e6ef86d8 100644 --- a/rules/de/a/d3/11/1153.map +++ b/rules/de/a/d3/11/1153.map @@ -1,60 +1,69 @@ # DE 1153. Lüneburg - Stelle # -let lc = path("d4.de.a.1720"); +let lc = path("d3.de.a.1720"); with detail = 3 { - # point.de.Lüneburg-Nordkopf de.1720 - with link = "line.de.1153" { - track(:first :cat:ac15 :pax, lc[:lun.f, :bah - 1ssw] << 1.5dt); + track(:first :rightother :cat:ac15 :pax, + lc[:lkn + 0.5sw, :gos - 0.5sw] << 1.5dt + ); + track(:first :station :cat:ac15 :pax, + lc[:gos - 0.5sw, :gos + 0.5sw] << 1.5dt + ); + track(:first :rightother :cat:ac15 :pax, + lc[:gos - 0.5sw, :bar - 1sw] << 1.5dt + ); } with link = "point.de.Bardowick-Hp" { - track(:first:station :cat:ac15 :pax, - lc[:bah - 1ssw, :bah + 1ssw] << 1.5dt + track(:first :station :cat:ac15 :pax, + lc[:bar - 1sw, :bar + 1sw] << 1.5dt ); - marker(:de.hp :cat:ac15 :pax :left, lc[:bah] << 1.5dt); + marker(:left :de.hp :cat:ac15 :pax, lc[:bar] << 1.5dt); } with link = "line.de.1153" { - track(:first :cat:ac15 :pax, lc[:bah + 1ssw, :rad - 1ssw] << 1.5dt); + track(:first :rightother :cat:ac15 :pax, + lc[:bar + 1sw, :rad - 1sw] << 1.5dt + ); + line_label(:left:ne :cat:ac15 :pax, lc[:bar + 3km] << 1.5dt, "1153"); } # point.de.Radbruch de.1720 - with link = "line.de.1153" { - track(:first :cat:ac15 :pax, lc[:rad + 1ssw, :win - 1ssw] << 1.5dt); + with link = "line.de.1720" { + track(:first :rightother :cat:ac15 :pax, + lc[:rad + 1sw, :bor - 0.5sw] << 1.5dt + ); + track(:first :station :cat:ac15 :pax, + lc[:bor - 0.5sw, :bor + 0.5sw] << 1.5dt + ); + track(:first :rightother :cat:ac15 :pax, + lc[:bor + 0.5sw, :win - 1sw] << 1.5dt + ); } - # point.de.Winsen-Luhe de.1720 - - with link = "line.de.1153" { - track(:first :cat:ac15 :pax, lc[:win + 1ssw, :ash - 1ssw] << 1.5dt); + with link = "line.de.1720" { + track(:first :rightother :cat:ac15 :pax, + lc[:win + 1sw, :asa - 1sw] << 1.5dt + ); + line_label(:left:ne :cat:ac15 :pax, lc[:win + 2.5km] << 1.5dt, "1153"); } with link = "point.de.Ashausen" { - track(:first:station :double :cat:ac15 :pax, - lc[:ash - 1ssw, :ash + 1ssw] - ); - track(:first:station :cat:ac15 :pax, - lc[:ash - 1ssw, :ash + 1ssw] << 1.5dt + track(:first :station :cat:ac15 :pax, + lc[:asa - 1sw, :ash + 1sw] << 1.5dt ); - with layer = -1 track(:first:station :cat:ac15, - lc[:ash - 1.1dl, :ash - 1dl] >> 0.5dt - -- lc[:ash, :ash + 1ssw] >> 1.5dt - ); - with layer = -1 marker(:de.abzw :cat:ac15 :right, lc[:ash] >> 1.5dt); - marker(:de.hp :cat:ac15 :pax :left, lc[:ash] << 1.5dt); - with layer = -1 marker(:de.bf :removed :left, lc[:ash] << 1.5dt); - slabel(:left :cat:ac15 :pax, lc[:ash - 1ssw] << 1.5dt << 2.3ssw, - "Ashausen" + marker(:left :de.hp :cat:ac15 :pax, lc[:ash] << 1.5dt); + slabel(:left :cat:ac15 :pax, lc[:ash] << 1.5dt << 1.1sh + (1sw, 0dt), + hbox(:right:top, "Ashausen") ); } - with link = "line.de.1153" { - track(:first :cat:ac15 :pax, lc[:ash + 1ssw, :ste - 1ssw] << 1.5dt); + with link = "line.de.1720" { + track(:first :rightother :cat:ac15 :pax, + lc[:ash + 1sw, :ste - 1sw] << 1.5dt + ); } - - # point.de.Stelle de.1720 } diff --git a/rules/de/a/d3/12/1200.map b/rules/de/a/d3/12/1200.map index ad88a901..e51919bf 100644 --- a/rules/de/a/d3/12/1200.map +++ b/rules/de/a/d3/12/1200.map @@ -1,111 +1,111 @@ -# DE 1200. Niebüll (ausschl.) - Westerland (Sylt) +# DE 1200. Niebüll - Westerland (Sylt) # -let nw = path("d4.de.1200"); +let nw = path("d3.de.1200"); with detail = 3 { # point.de.Niebüll de.1210 with link = "line.de.1200" { track(:first :pax, - nw[:nie + 1ssw, :nie + 1.1ssw] << 0.5dt - .. nw[:nie.ff, :leh - 1ssw] + nw[:nie + 1sw, :nie.yt] << 0.5dt + .. nw[:nie.yyt, :leh - 1sw] ); + line_label(:left:ne :pax, nw[:nie.yyt + 2.5km], "1200"); } with link = "point.de.Lehnshallig" { - track(:first:station :pax, nw[:leh - 1ssw, :leh + 1ssw]); - with layer = -1 marker(:de.bbf :right, nw[:leh]); - slabel(:right, nw[:leh + 1ssw] >> 1.4ssw, - "Lehnshallig" - ); + track(:first :station :pax, nw[:leh - 1sw, :leh + 1sw]); + marker(:right :de.bbf, nw[:leh]); + slabel(:right, nw[:leh - 0.5sw] >> 1.2sh, "Lehnshallig"); } with link = "line.de.1200" { - track(:first :pax, nw[:leh + 1ssw, :emm - 1ssw]); + track(:first :pax, nw[:leh + 1sw, :emm - 1sw]); } with link = "point.de.Emmelsbüll" { - track(:first:station :pax, nw[:emm - 1ssw, :emm + 1ssw]); - with layer = -1 marker(:de.hst :removed :right, nw[:emm]); - with layer = -2 marker(:de.bf :gone :right, nw[:emm]); - slabel(:right :removed, nw[:emm - 0.6ssw] >> 1.3ssw, - "Emmelsbüll" - ); + track(:first :station :pax, nw[:emm - 1sw, :emm + 1sw]); + marker(:right :de.hst :removed, nw[:emm]); + slabel(:right :removed, nw[:emm - 0.5sw] >> 1.2sh, "Emmelsbüll"); } with link = "line.de.1200" { - track(:first :pax, nw[:emm + 1ssw, :kla - 1ssw]); + track(:first :pax, nw[:emm + 1sw, :kla.a]); } with link = "point.de.Klanxbüll" { - track(:first:station :pax, nw[:kla - 1ssw, :kla + 1ssw]); - track(:first:station :pax, - nw[:kla - 0.5ssw - 1.1dl, :kla - 0.5ssw - 1.0dl] - -- nw[:kla - 0.5ssw, :kla + 1ssw] << 1dt + track(:first :station :pax, + nw[:kla.a, :kla.a + 1dl] + -- nw[:kla.a + 2dl, :kla + 1sw] >> 0.5dt ); - - marker(:de.bf :pax :right, nw[:kla]); - slabel(:right :pax, nw[:kla - 0.6ssw] >> 1.3ssw, "Klanxbüll"); + track(:first :station :pax, + nw[:kla.a + 0.9dl, :kla.a + 1dl] + -- nw[:kla.a + 2dl, :kla + 1sw] << 0.5dt + ); + marker(:right :de.bf :pax, nw[:kla] >> 0.5dt); + slabel(:right :pax, nw[:kla - 0.5sw] >> 0.5dt >> 1.2sh, "Klanxbüll"); } with link = "line.de.1200" { - track(:first:double :pax, nw[:kla + 1ssw, :mor - 1ssw] << 0.5dt); - with layer = 1 line_badge(:pax, nw[:hin - 2.0km] << 0.5dt, "1200"); - line_badge(:pax, nw[:hin - 2.0km] << 0.5dt << 6pt, "(VzG: 1210)"); + track(:first :double :pax, nw[:kla + 1sw, :hin - 0.5sw]); + line_label(:left:n :pax, nw[:hin - 2km] << 0.5dt, "1200"); } with link = "point.de.Hindenburgdamm" { - with layer = -1 marker(:de.bk :removed :right, nw[:hin]); + track(:first :double:station :pax, nw[:hin - 0.5sw, :hin + 0.5sw]); + marker(:right :de.bk :removed, nw[:hin] >> 0.5dt); + slabel(:top :removed, nw[:hin] >> 0.5dt >> 1.1sh, "Hindenburgdamm"); + } + + with link = "line.de.1200" { + track(:first :double :pax, nw[:hin + 0.5sw, :mor - 1sw]); } with link = "point.de.Morsum-Sylt" { - track(:first:station :pax, nw[:mor - 1ssw, :mor + 1ssw]); - track(:first:station :pax, - nw[:mor - 1ssw, :mor + 0.5ssw] << 1dt - .. nw[:mor + 0.5sw + 1dl, :mor + 0.5sw + 1.1dl] + track(:first :station :pax, + nw[:mor - 1sw, :mor.f - 2dl] >> 0.5dt + -- nw[:mor.f - 1dl, :mor.f] ); - - marker(:de.bf :pax :left, nw[:mor] << 1dt); - slabel(:bottom :pax, nw[:mor] << 1dt << 1.2ssw, - hbox(:center:top, hbox(:center:base, - span(:regular, "Morsum "), - span(:light, "(Sylt)") - )) + track(:first :station :pax, + nw[:mor - 1sw, :mor.f - 2dl] << 0.5dt + -- nw[:mor.f - 1dl, :mor.f - 0.9dl] + ); + marker(:left :de.bf :pax, nw[:mor] << 0.5dt); + slabel(:bottom :pax, nw[:mor] << 0.5dt << 1.2sh, + hbox(:center:base, "Morsum ", span(:light, "(Sylt)")) ); } with link = "line.de.1200" { - track(:first :pax, nw[:mor + 1ssw, :kei - 1ssw]); + track(:first :pax, nw[:mor.f, :kei - 1sw]); } with link = "point.de.Keitum" { - track(:first:station :pax, nw[:kei - 1ssw, :kei + 1ssw]); - marker(:de.bf :pax :right, nw[:kei]); - slabel(:right :pax, nw[:kei + 1ssw] >> 1.2ssw, "Keitum"); + track(:first :station :pax, nw[:kei - 1sw, :kei + 1sw]); + marker(:right :de.hst :pax, nw[:kei]); + slabel(:right :pax, nw[:kei + 1sw] >> 1.1sh, "Keitum"); } with link = "line.de.1200" { - track(:first :pax, nw[:kei + 1ssw, :tin - 1ssw]); + track(:first :pax, nw[:kei + 1sw, :tin - 1sw]); + line_label(:left:ne :pax, nw[:kei + 1km], "1200"); } with link = "point.de.Tinnum" { - track(:first:station :pax, nw[:tin - 1ssw, :tin + 1ssw]); - with layer = -1 marker(:de.hp :removed, nw[:tin]); - slabel(:right :removed, nw[:tin + 1ssw] >> 1.2ssw, "Tinnum"); + track(:first :station :pax, nw[:tin - 1sw, :tin + 1sw]); + marker(:right :de.hp :removed, nw[:tin]); + slabel(:right :removed, nw[:tin + 1sw] >> 1.1sh, "Tinnum"); } with link = "line.de.1200" { - track(:first :pax, nw[:tin + 1ssw, :wes - 0.5ssw]); + track(:first :pax, nw[:tin + 1sw, :wes - 1sw]); } with link = "point.de.Westerland-Sylt" { - track(:first :pax :station :open, nw[:wes - 0.5sw, :wes]); - marker(:de.bf :pax :top, nw[:wes]); - slabel(:left :pax, nw[:wes] - (2ssw, 0ssw), - hbox(:center:base, - span(:bold, "Westerland "), - span(:regular, "(Sylt)") - ) + track(:first :station :pax, nw[:wes - 1sw, :wes]); + marker(:top :de.bf :pax, nw[:wes]); + slabel(:left :pax, nw[:wes] + (-1.5sh, -0.3sh), + hbox(:right:base, span(:bold, "Westerland "), "(Sylt)") ); } } diff --git a/rules/de/a/d3/12/1201.map b/rules/de/a/d3/12/1201.map index 9236aa92..f2ea8a67 100644 --- a/rules/de/a/d3/12/1201.map +++ b/rules/de/a/d3/12/1201.map @@ -1,79 +1,67 @@ # DE 1201. Niebüll - Süderlügum Grenze # -let ns = path("d4.de.1201"); +let ns = path("d3.de.1201"); with detail = 3 { + # point.de.Niebüll de.1210 + with link = "line.de.1201" { track(:second :pax, - ns[:nie + 1ssw, :nie + 1.1ssw] << 0.5dt - .. ns[:nie.gg + 500m, :uph - 1ssw] << 0.5dt + ns[:nie + 1sw, :nie.yt] >> 0.5dt + .. ns[:nie.yyt + 2dt, :uph - 1sw] << 0.5dt ); - track(:second:station :removed, - ns[:nie + 1ssw, :nie + 1.1ssw] >> 0.5dt - .. ns[:nie.gg + 500m, :uph - 1ssw] >> 0.5dt + track(:second :removed, + ns[:nie + 1sw, :nie.yt] >> 1.5dt + .. ns[:nie.yyt + 2dt, :uph - 1sw] >> 0.5dt ); + line_label(:right:w :pax, ns[:nie.yyt + 2.5km] >> 0.5dt, "1201"); } with link = "point.de.Uphusum" { - track(:second:station :pax, ns[:uph - 1ssw, :uph + 1ssw] << 0.5dt); - with layer = -1 track(:second:station :removed, - ns[:uph - 1ssw, :uph + 1ssw] >> 0.5dt - ); - marker(:de.hp :pax :right, ns[:uph] >> 0.5dt); - with layer = -1 marker(:de.bf :removed :right, ns[:uph] >> 0.5dt); - slabel(:right :pax, ns[:uph - 0.5ssw] >> 0.5dt >> 2.0ssw, "Uphusum"); + track(:second :station :pax, ns[:uph - 1sw, :uph + 1sw] << 0.5dt); + track(:second :station :removed, ns[:uph - 1sw, :uph + 1sw] >> 0.5dt); + marker(:right :de.hp :pax, ns[:uph] >> 0.5dt); + marker(:right :de.exbf :pax, ns[:uph] >> 0.5dt); + slabel(:left :pax, ns[:uph - 0.5sw] << 1.5dt, "Uphusum"); } with link = "line.de.1201" { - track(:second :pax, ns[:uph + 1ssw, :sua - 1ssw] << 0.5dt); - track(:second:station :removed, ns[:uph + 1ssw, :sua - 1ssw] >> 0.5dt); - with layer = 1 line_badge(:pax, ns[:uph + 1.8km], "1201"); + track(:second :pax, ns[:uph + 1sw, :sua - 1sw] << 0.5dt); + track(:second :removed, ns[:uph + 1sw, :sua - 1sw] >> 0.5dt); } with link = "point.de.Süderlügum-Awanst" { - track(:second:station :pax, ns[:sua - 1ssw, :sua + 0.5ssw] << 0.5dt); - track(:second:station :removed, - ns[:sua - 1ssw, :sua + 0.5ssw] >> 0.5dt + track(:second :station :pax, ns[:sua - 1sw, :sud - 0.5sw] << 0.5dt); + track(:second :station :removed, ns[:sua - 1sw, :sud - 0.5sw] >> 0.5dt); + marker(:left :de.awanst :pax, ns[:sua] << 0.5dt); + slabel(:left :pax :light, ns[:sua - 0.6sw] << 0.5dt << 1.5sh, + "Süderlügum Awanst" ); - marker(:de.awanst :left, ns[:sua] << 0.5dt); } with link = "point.de.Süderlügum" { - track(:second:station :pax, ns[:sua + 0.5ssw, :sua + 2.2ssw] << 0.5dt); - track(:second:station :removed, - ns[:sua + 0.5ssw, :sua + 2.2ssw] >> 0.5dt - ); - - with layer = -4 marker( - :de.bf :removed :right, ns[:sua + 0.7ssw] >> 0.5dt - ); - marker(:de.hp :pax :left, ns[:sua + 1.2ssw] << 0.5dt); - slabel(:left :pax, ns[:sua + 0.4ssw] << 0.5dt << 1.6ssw, "Süderlügum"); + track(:second :station :pax, ns[:sud - 0.5sw, :sud + 1sw] << 0.5dt); + track(:second :station :removed, ns[:sud - 0.5sw, :sud + 1sw] >> 0.5dt); + marker(:right :de.hp :pax, ns[:sud] >> 0.5dt); + marker(:right :de.exbf :pax, ns[:sud] >> 0.5dt); + slabel(:right :pax, ns[:sud - 0.6sw] >> 0.5dt >> 1.9sh, "Süderlügum"); } with link = "line.de.1201" { - track(:second :pax, ns[:sua + 2.2ssw, :sug - 0.5ssw] << 0.5dt); - track(:second:station :removed, - ns[:sua + 2.2ssw, :sug - 0.5ssw] >> 0.5dt - ); + track(:second :pax, ns[:sud + 1sw, :sug - 0.5sw] << 0.5dt); + track(:second :removed, ns[:sud + 1sw, :sug - 0.5sw] >> 0.5dt); + line_label(:right:w :pax, ns[:sud + 1.5km] >> 0.5dt, "1201"); } with link = "point.int.Süderlügum-Tønder" { - track(:second:station :pax, ns[:sug - 0.5ssw, :sug + 0.5ssw] << 0.5dt); - with layer = -1 track(:second:station :removed, - ns[:sug - 0.5ssw, :sug + 0.5ssw] >> 0.5dt - ); - - marker(:de.dirgr :right, ns[:sug] >> 0.5dt); - marker(:statdt :right, ns[:sug] << 0.5dt); - marker(:de.dirgr :left, ns[:sug] << 0.5dt); - - label(ns[:sug] << 5dt, - vbox(:right:middle, - span(:small, "DK"), - hbar(0.3), - span(:small, "DE") - ) + track(:second :station :pax, ns[:sug - 0.5sw, :sug + 1sw] << 0.5dt); + track(:second :station :removed, ns[:sug - 0.5sw, :sug + 1sw] >> 0.5dt); + marker(:left :de.dirgr :pax, ns[:sug] << 0.5dt); + marker(:right :de.dirgr :removed, ns[:sug] >> 0.5dt); + slabel(:left :roman:italic, ns[:sug] << 0.5dt << 1.2sh, + hbox(:right:middle, + vbox(:center:middle, " DK", hrule(), " DE SH ") + ) ); } } diff --git a/rules/de/a/d3/12/1203.map b/rules/de/a/d3/12/1203.map new file mode 100644 index 00000000..b160a340 --- /dev/null +++ b/rules/de/a/d3/12/1203.map @@ -0,0 +1,15 @@ +# DE 1203. Husum Nord - Husum Außenhafen +# +let ha = path("d3.de.1203"); + +with detail = 3 { + # point.de.Husum-Nord de.1210 + + with link = "line.de.1203" { + track(:station, + ha[:hun, :hun.ya] >> 1.5dt + .. ha[:hun.yya, :f] + ); + } +} + diff --git a/rules/de/a/d3/12/1204.map b/rules/de/a/d3/12/1204.map index 12bd8cef..e4a88cae 100644 --- a/rules/de/a/d3/12/1204.map +++ b/rules/de/a/d3/12/1204.map @@ -1,77 +1,80 @@ # DE 1204. Abzw Hörn - Tönning # -let ht = path("d4.de.1204"); +let ht = path("d3.de.1204"); with detail = 3 { + # point.de.Hörn de.1210 + with link = "line.de.1204" { track(:second :pax, - path("d4.de.1210")[:hor - 0.49sw, :hor - 0.5sw] >> 0.5dt - .. ht[:pla - 0.51ssw, :pla - 0.5ssw] + ht[:hor + 2dl, :hor + 3dl] >> 1.5dt + .. ht[:pla - 0.51sw, :pla - 0.5sw] ); } with link = "point.de.Platenhörn" { - track(:second:station :pax, ht[:pla - 0.5ssw, :pla + 0.5ssw]); - with layer = -1 marker(:de.hp :removed :left, ht[:pla]); - slabel(:left :removed, - path("d4.de.a15")[:pla + 0.4ssw] >> 1.5dt, + track(:second :station :pax, ht[:pla - 0.5sw, :pla + 0.5sw]); + marker(:left :de.hp :removed, ht[:pla]); + slabel(:left :removed, ht[:pla] + (-0.3km, 0dt) + (-1dt, 0.3sw), "Platenhörn" ); } with link = "line.de.1204" { - track(:second :pax, ht[:pla + 0.5ssw, :but - 1ssw]); + track(:second :pax, ht[:pla + 0.5sw, :but - 1sw]); + line_label(:right:e :pax, ht[:but - 2km], "1204"); } with link = "point.de.Büttel" { - track(:second:station :pax, ht[:but - 1ssw, :but + 1ssw]); - with layer = -1 marker(:de.hst :removed :left, ht[:but]); - with layer = -2 marker(:de.bf :gone :left, ht[:but]); - slabel(:left :removed, ht[:but + 0.4ssw] >> 1.0dt, "Büttel"); + track(:second :station :pax, ht[:but - 1sw, :but + 1sw]); + marker(:left :de.hst :removed, ht[:but]); + marker(:left :de.exbf :removed, ht[:but]); + slabel(:left :removed, ht[:but], "Büttel*"); } with link = "line.de.1204" { - track(:second :pax, ht[:but + 1ssw, :wit - 1ssw]); + track(:second :pax, ht[:but + 1sw, :wit - 1sw]); } with link = "point.de.Witzwort" { - track(:second:station :pax, ht[:wit - 1ssw, :wit + 1ssw]); - marker(:de.hp :pax :left, ht[:wit]); - slabel(:left :pax, ht[:wit + 0.4ssw] >> 1.0dt, "Witzwort"); + track(:second :station :pax, ht[:wit - 1sw, :wit + 1sw]); + marker(:left :de.hp :pax, ht[:wit]); + slabel(:right :pax, ht[:wit - 1.0sw] << 1.2sh, + hbox(:left:top, "Witzwort") + ); } with link = "line.de.1204" { - track(:second :pax, ht[:wit + 1ssw, :har - 1ssw]); - with layer = 1 line_badge(:open :pax, ht[:wit + 1.8km], "1204"); + track(:second :pax, ht[:wit + 1sw, :har - 1sw]); } with link = "point.de.Harblek" { - track(:second:station :pax, ht[:har - 1ssw, :har + 1ssw]); - marker(:de.hp :pax :right, ht[:har]); - with layer = -1 marker(:de.bf :removed :right, ht[:har]); - slabel(:left :pax, ht[:har + 0.4sw] >> 1.3ssw, "Harblek"); + track(:second :station :pax, ht[:har - 1sw, :har + 1sw]); + marker(:right :de.hp :pax, ht[:har]); + marker(:right :de.exbf :pax, ht[:har]); + slabel(:left :pax, ht[:har + 0.5sw] >> 1.7sh, "Harblek"); } with link = "line.de.1204" { - track(:second :pax, ht[:har + 1ssw, :ton - 1ssw]); + track(:second :pax, ht[:har + 1sw, :ton.y - 1sw]); + line_label(:left:w :pax, ht[:ton.y - 2.5km], "1204"); } with link = "point.de.Tönning" { - track(:second:station :pax, ht[:ton - 1ssw, :ton + 1ssw]); - track(:second:station :pax, - path("d4.de.1205")[:ton + 1.5ssw, :ton + 1.49ssw] - .. ht[:ton - 0.5ssw, :ton - 0.49ssw] - ); + # DE 1204 + track(:second :station :pax, ht[:ton.y - 1sw, :ton + 1sw]); + + # DE 1205 + track(:second :station :pax, path("d3.de.1205")[:ton.y + 1sw, :ton.y]); - marker(:de.bf :pax :left, ht[:ton]); - slabel(:left :pax, ht[:ton + 0.4ssw] >> 2.5dt, - span(:bold, "Tönning") + marker(:left :de.bf :pax, ht[:ton]); + slabel(:left :bold :pax, ht[:ton - 0.5sw] >> 0.5dt, + hbox(:right:top, "Tönning") ); - } + } - with link = "point.de.Tönning-Hafen" { - with layer = -1 track(:station :removed, ht[:ton + 1ssw, :f]); + with link = "line.de.1204" { + track(:station :removed, ht[:ton + 1sw, :f]); } } - diff --git a/rules/de/a/d3/12/1205.map b/rules/de/a/d3/12/1205.map index 23809b17..087315cb 100644 --- a/rules/de/a/d3/12/1205.map +++ b/rules/de/a/d3/12/1205.map @@ -1,101 +1,94 @@ # DE 1205. Tönning - Bad St Peter-Ording # -let tp = path("d4.de.1205"); +let ts = path("d3.de.1205"); with detail = 3 { # point.de.Tönning de.1204 with link = "line.de.1205" { - track(:second :pax, tp[:ton + 1.5ssw, :kat - 1ssw]); + track(:second :pax, ts[:ton.y + 1sw, :kat - 1sw]); + line_label(:right:s :pax, ts[:ton.y + 2.5km], "1205"); } with link = "point.de.Kating" { - track(:second:station :pax, tp[:kat - 1ssw, :kat + 1ssw]); - marker(:de.hp :pax :right, tp[:kat]); - slabel(:right :pax, tp[:kat + 1ssw] >> 1.5ssw, "Kating"); + track(:second :station :pax, ts[:kat - 1sw, :kat + 1sw]); + marker(:right :de.hp :pax, ts[:kat]); + slabel(:top :pax, ts[:kat] >> 1.2sh, "Kating"); } with link = "line.de.1205" { - track(:second :pax, tp[:kat + 1ssw, :kah - 1ssw]); + track(:second :pax, ts[:kat + 1sw, :kah - 1sw]); } with link = "point.de.Katharinenheerd" { - track(:second:station :pax, tp[:kah - 1ssw, :kah + 1ssw]); - marker(:de.hp :pax :right, tp[:kah]); - with layer = -1 marker(:de.bf :removed :right, tp[:kah]); - slabel(:top :pax, tp[:kah] >> 1.3ssw, "Katharinenheerd"); + track(:second :station :pax, ts[:kah - 1sw, :kah + 1sw]); + marker(:right :de.hp :pax, ts[:kah]); + slabel(:top :pax, ts[:kah] >> 1.2sh, "Katharinenheerd"); } with link = "line.de.1205" { - track(:second :pax, tp[:kah + 1ssw, :gar - 1ssw]); + track(:second :pax, ts[:kah + 1sw, :gar - 1sw]); } with link = "point.de.Garding" { - track(:second:station :pax, tp[:gar - 1ssw, :gar + 1ssw]); - marker(:de.hp :pax :right, tp[:gar]); - with layer = -1 marker(:de.bf :removed :right, tp[:gar]); - slabel(:left :pax, tp[:gar - 1.5ssw] >> 1.5ssw, "Garding"); + track(:second :station :pax, ts[:gar - 1sw, :gar + 1sw]); + marker(:right :de.hp :pax, ts[:gar]); + marker(:right :de.exbf :pax, ts[:gar]); + slabel(:top :pax, ts[:gar] >> 1.6sh, "Garding"); } with link = "line.de.1205" { - track(:second :pax, tp[:gar + 1ssw, :san - 1ssw]); + track(:second :pax, ts[:gar + 1sw, :san - 1sw]); } with link = "point.de.Sandwehle" { - track(:second:station :pax, tp[:san - 1ssw, :san + 1ssw]); - marker(:de.hp :pax :right, tp[:san]); - slabel(:right :pax, tp[:san + 1.5ssw] << 0.5dt, - hbox(:left:top, "Sandwehle") - ); + track(:second :station :pax, ts[:san - 1sw, :san + 1sw]); + marker(:right :de.hp :pax, ts[:san]); + slabel(:bottom :pax, ts[:san] << 1.0dt + (1sw, 0dt), "Sandwehle"); } with link = "line.de.1205" { - track(:second :pax, tp[:san + 1ssw, :hei - 1ssw]); + track(:second :pax, ts[:san + 1sw, :hei - 1sw]); } with link = "point.de.Heisternest" { - track(:second:station :pax, tp[:hei - 1ssw, :hei + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, tp[:hei]); - slabel(:left :removed, tp[:hei - 1.5ssw] >> 1.2ssw, - vbox(:right:bottom, "Heister-", "nest") - ); + track(:second :station :pax, ts[:hei - 1sw, :hei + 1sw]); + marker(:right :de.hp :removed, ts[:hei]); + slabel(:top :removed, ts[:hei] >> 1.1sh, "Heisternest"); } with link = "line.de.1205" { - track(:second :pax, tp[:hei + 1ssw, :tat - 1ssw]); + track(:second :pax, ts[:hei + 1sw, :tat - 1sw]); } with link = "point.de.Tating" { - track(:second:station :pax, tp[:tat - 1ssw, :tat + 1ssw]); - marker(:de.hp :pax :right, tp[:tat]); - with layer = -1 marker(:de.bf :removed :right, tp[:tat]); - slabel(:right :pax, tp[:tat + 1ssw] << 6pt, "Tating"); + track(:second :station :pax, ts[:tat - 1sw, :tat + 1sw]); + marker(:right :de.hp :pax, ts[:tat]); + marker(:right :de.exbf :pax, ts[:tat]); + slabel(:left :pax, ts[:tat + 0.5sw] >> 1.8sh, "Tating"); } with link = "line.de.1205" { - track(:second :pax, tp[:tat + 1ssw, :pes - 1ssw]); - with layer = 1 line_badge(:open :pax, tp[:tat + 2.0km], "1205"); + track(:second :pax, ts[:tat + 1sw, :pes - 1sw]); + line_label(:right:se :pax, ts[:tat + 2.2km], "1205"); } with link = "point.de.Bad-St-Peter-Süd" { - track(:second:station :pax, tp[:pes - 1ssw, :pes + 1ssw]); - marker(:de.hp :pax :left, tp[:pes]); - with layer = -1 marker(:de.bf :removed :left, tp[:pes]); - slabel(:bottom :pax, tp[:pes] << 1.4ssw, - "Bad St Peter Süd" - ); + track(:second :station :pax, ts[:pes - 1sw, :pes + 1sw]); + marker(:left :de.hp :pax, ts[:pes]); + marker(:left :de.exbf :pax, ts[:pes]); + slabel(:bottom :pax, ts[:pes] << 1.7sh, "Bad St Peter Süd"); } with link = "line.de.1205" { - track(:second :pax, tp[:pes + 1ssw, :f - 1.6ssw]); + track(:second :pax, ts[:pes + 1sw, :peo - 1sw]); } with link = "point.de.Bad-St-Peter-Ording" { - track(:second:station :pax, tp[:f - 1.6ssw, :f]); - marker(:de.hp :pax :right, tp[:f - 0.6ssw]); - with layer = -1 marker(:de.bf :removed :right, tp[:f - 0.6ssw]); - slabel(:top :pax, tp[:f - 0.6sw] >> 1.8ssw, - span(:bold, "Bad St Peter-Ording") + track(:second :station :pax, ts[:peo - 1sw, :peo + 0.5sw]); + marker(:right :de.bf :pax, ts[:peo]); + slabel(:left :pax :bold, ts[:peo] + (-1sw, -0.5dt), + "Bad St Peter-Ording" ); } } diff --git a/rules/de/a/d3/12/1206.map b/rules/de/a/d3/12/1206.map index 0efc76a5..e0c8994f 100644 --- a/rules/de/a/d3/12/1206.map +++ b/rules/de/a/d3/12/1206.map @@ -1,139 +1,22 @@ # DE 1206. Heide (Holst) - Büsum # -let hb = path("d4.de.1206"); -let en = path("d4.de.1210"); +let hb = path("d3.de.1206"); with detail = 3 { # point.de.Heide-Holst de.1210 with link = "line.de.1206" { - with layer = -2 track(:second :pax, - en[:hei + 1ssw, :weh.x - 800m] >> 1.5dt - .. en[:weh - 1.1ssw, :weh - 1ssw] << 1.5dt << 1ssw + track(:second :leftother :pax, + hb[:hei + 1sw, :awex] >> 1.5dt + .. hb[:awex + 2sw, :weh - 1sw] << 1sh << 0.5dt ); } with link = "point.de.Weddinghusen" { - track(:second:station :pax, - en[:weh - 1ssw, :weh + 0.5ssw] << 1.5dt << 1ssw + track(:second :station :pax, + hb[:weh - 1sw, :weh + 1sw] << 1sh << 0.5dt ); - with layer = -1 track(:second:station :removed, - en[:weh - 0.5ssw, :weh + 1ssw] << 1.5dt - ); - with layer = -1 marker(:de.bf :removed :left, en[:weh] << 1.5dt); - slabel(:right :removed, en[:weh - 0.6ssw] >> 1.0dt, - span(:bold, "Weddinghusen") - ); - } - - with link = "line.de.1206" { - track(:second :pax, - en[:weh + 0.5ssw, :weh + 0.51ssw] << 1.5dt << 1ssw - .. hb[:weh.ff + 1200m, :del - 1ssw] - ); - } - - with link = "point.de.Dellweg" { - track(:second:station :pax, hb[:del - 1ssw, :del + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, hb[:del]); - slabel(:top :removed, hb[:del] >> 1.4ssw, "Dellweg"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:del + 1ssw, :tie - 1ssw]); - } - - with link = "point.de.Tiebensee" { - track(:second:station :pax, hb[:tie - 1ssw, :tie + 1ssw]); - marker(:de.hp :pax :left, hb[:tie]); - with layer = -1 marker(:de.bf :removed :left, hb[:tie.bf]); - slabel(:right :pax, hb[:tie + 1.5ssw] << 2.6ssw, "Tiebensee"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:tie + 1ssw, :haf - 1ssw]); - } - - with link = "point.de.Haferwisch" { - track(:second:station :pax, hb[:haf - 1ssw, :haf + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, hb[:haf]); - with layer = -2 marker(:de.bf :gone :left, hb[:haf]); - slabel(:left :removed, hb[:haf - 1ssw] >> 1.0dt, "Haferwisch"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:haf + 1ssw, :jar - 1ssw]); - } - - with link = "point.de.Jarrenwisch" { - track(:second:station :pax, hb[:jar - 1ssw, :jar + 1ssw]); - marker(:de.hp :pax :left, hb[:jar]); - with layer = -1 marker(:de.bf :gone :left, hb[:jar]); - slabel(:right :pax, hb[:jar + 1.5ssw] << 2.4ssw, "Jarrenwisch"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:jar + 1ssw, :wes - 1ssw]); - } - - with link = "point.de.Wesselburen" { - track(:second:station :pax, hb[:wes - 1ssw, :wes + 1ssw]); - marker(:de.hp :pax :right, hb[:wes]); - with layer = -1 marker(:de.bf :removed :right, hb[:wes]); - slabel(:left :pax, hb[:wes - 1ssw] >> 1.4ssw, "Wesselburen"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:wes + 1ssw, :sde - 1ssw]); - } - - with link = "point.de.Süderdeich" { - track(:second:station :pax, hb[:sde - 1ssw, :sde + 1ssw]); - marker(:de.hp :pax :right, hb[:sde]); - with layer = -1 marker(:de.bf :gone :right, hb[:sde]); - slabel(:left :pax, hb[:sde + 0.3ssw] >> 1.4ssw, "Süderdeich"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:sde + 1ssw, :rei - 1ssw]); - } - - with link = "point.de.Reinsbüttel" { - track(:second:station :pax, hb[:rei - 1ssw, :rei + 1ssw]); - marker(:de.hp :pax :left, hb[:rei]); - with layer = -1 marker(:de.bf :removed :left, hb[:rei.bf]); - slabel(:right :pax, hb[:rei + 0.3ssw] << 2.0ssw, "Reinsbüttel"); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:rei + 1ssw, :oho - 1ssw]); - - guide(:linenum :pax, - hb[:rei + 1.2km] >> 0.5dt - -- hb[:rei + 1.2km] >> 3.0dt - ); - label(:linenum :pax, hb[:rei + 1.2km] >> 3.0dt, - hbox(:right:middle :badgesize, "1206 ") - ); - } - - with link = "point.de.Osterhof" { - track(:second:station :pax, hb[:oho - 1ssw, :oho + 1ssw]); - with layer = -1 marker(:de.hst :removed :left, hb[:oho]); - with layer = -2 marker(:de.bf :gone :left, hb[:oho]); - slabel(:right :removed, hb[:oho + 0.4ssw] << 1.6ssw, - "Osterhof" - ); - } - - with link = "line.de.1206" { - track(:second :pax, hb[:oho + 1ssw, :f - 1.6ssw]); - } - - with link = "point.de.Büsum" { - track(:second:station :pax, hb[:f - 1.6ssw, :f]); - marker(:de.bf :pax :right, hb[:f - 0.6ssw]); - slabel(:left :pax, hb[:f] >> 1.4ssw, span(:bold, "Büsum")); + marker(:right :de.inbf :removed, hb[:weh] << 1sh << 0.5dt); } } diff --git a/rules/de/a/d3/12/1220.map b/rules/de/a/d3/12/1220.map index c1afd033..6131ff97 100644 --- a/rules/de/a/d3/12/1220.map +++ b/rules/de/a/d3/12/1220.map @@ -1,432 +1,67 @@ # DE 1220. Altona Palmaille - Kiel Altonaer Bf # +let ak = path("d3.de.1220"); with detail = 3 { - let ak = path("d3.de.1220.hmb"); - - with link = "point.de.Hamburg-Altona" { - with layer = -2 track(:first:station :cat:ac15 :pax, - ak[:alt, :aham] >> 0.5dt - .. ak[:fham, :fham + 0.1dl] << 1.5dt - ); - - track(:first:station :double :cat:ac15 :pax, - ak[:alt, :aham] << 1dt - ); - - track(:first:station :cat:ac15 :pax, - ak[:alt, :aham] << 2.5dt - .. ak[:fham, :fham + 0.1dl] << 2.5dt - ); - - marker(:de.bf :cat:ac15 :pax :bottom, ak[:alt + 0.5ssw]); - marker(:de.bf :cat:ac15 :pax :bottom, ak[:alt + 0.5ssw] << 1dt); - marker(:de.bf :cat:ac15 :pax :bottom, ak[:alt + 0.5ssw] << 2dt); - } - - with link = "point.de.Hamburg-Altona-Gbf" { - track(:first:station :double :cat:ac15 :pax, - ak[:fham, :fham + 1ssw] - ); - track(:first:station :double :cat:ac15 :pax, - ak[:fham, :fham + 1ssw] << 2dt - ); - } - - with link = "line.de.1220" { - track(:first:station :cat:ac15 :pax :tight :flip, - ak[:fham + 1ssw, :alt.f] << 1.5dt - -- ak[:alt.f + 2dl, :ala - 1ssw] << 2.5dt - ); - - with layer = 2 track(:first:station :cat:ac15 :pax :tight, - ak[:fham + 1ssw, :alt.f] << 2.5dt - -- ak[:alt.f + 3dl, :ala - 1ssw] >> 0.5dt - ); - with layer = 1 casing(:first:station :cat:ac15 :pax :tight, - ak[:fham + 1ssw, :alt.f] << 2.5dt - -- ak[:alt.f + 3dl, :ala - 1ssw] >> 0.5dt - ); - } - - with link = "point.de.Hamburg-Langenfelde-Bbf" { - track(:first:station :cat:ac15 :pax, - ak[:ala - 1ssw, :ala + 1ssw] >> 0.5dt - ); - track(:first:station :cat:ac15 :pax, - ak[:ala - 1ssw, :ala + 1ssw] << 0.5dt - ); - track(:first:station :cat:ac15 :pax, - ak[:ala - 1ssw, :ala + 1ssw] << 1.5dt - ); - track(:first:station :cat:ac15 :pax, - ak[:ala - 1ssw, :ala + 1ssw] << 2.5dt - ); - with layer = -1 marker(:de.bbf :cat:ac15 :left, ak[:ala] << 2.5dt); - } - - with link = "line.de.1220" { - with layer = 2 track(:first:station :cat:ac15 :pax, - ak[:ala + 1ssw, :frot] >> 0.5dt - ); - with layer = 1 casing(:first:station :cat:ac15 :pax, - ak[:frot - 1ssw, :frot + 1ssw] >> 0.5dt - ); - track(:first:station :cat:ac15 :pax, - ak[:ala + 1ssw, :frot] << 2.5dt - ); - } - - with link = "point.de.Hamburg-Eidelstedt" { - with layer = 2 track(:first:station :cat:ac15 :pax, - ak[:frot, :eid + 6dl] >> 0.5dt - ); - - track(:first:station :cat:ac15 :pax, - ak[:frot, :eid + 2dl] << 0.5dt - -- ak[:eid + 3dl, :eid + 3.1dl] >> 0.5dt - ); - - track(:first:station :cat:ac15 :pax, - ak[:frot, :eid + 3dl] << 1.5dt - ); - - track(:first:station :cat:ac15 :pax, - ak[:frot, :eid + 2dl] << 2.5dt - -- ak[:eid + 4dl, :eid + 6dl] << 0.5dt - ); - - track(:first:station :cat:ac15 :pax, - path("d3.de.1234")[:aa + 0.1dl, :aa] - .. ak[:frot + 1ssw, :frot + 1.1ssw] << 0.5dt - ); - - with layer = -1 marker(:de.bbf :cat:ac15 :left, ak[:eid] << 2.5dt); - } - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, - ak[:eid + 6dl, :pin - 2ssw] + with zoom = :high, link = "point.de.Meimersdorf-Mf" { + # DE 1031 + track(:first :station :cat:ac15, + ak[:mef - 1.51dl, :mef - 1.5dl] >> 0.5dt + -- ak[:mef + 1.5dl, :mef + 1sw] << 2.5dt ); - } - with link = "point.de.Thesdorf-Bk" { - with layer = -1 marker(:de.bk :removed :left, ak[:the] << 0.5dt); - } - - with link = "point.de.Pinneberg" { - track(:first:station :double :cat:ac15 :pax, - ak[:pin - 2ssw, :pin + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, ak[:pin] >> 0.5dt); - slabel(:right :cat:ac15 :pax, ak[:pin] >> 0.5dt >> 1.6ssw, - span(:bold, "Pinneberg") + # DE 1033 + track(:first :station :cat:ac15, + ak[:mef + 0.5dl, :mef + 1sw] << 1.5dt ); - } - -} - -with detail = 3 { - let ak = path("d4.de.1220"); - with link = "line.de.1120" { - track(:first :double :cat:ac15 :pax, ak[:pin + 1ssw, :pri - 1ssw]); - } - - with link = "point.de.Prisdorf" { - track(:first:station :double :cat:ac15 :pax, - ak[:pri - 1ssw, :pri + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :right, ak[:pri] >> 0.5dt) - with layer = -1 marker(:de.bf :removed :right, ak[:pri] >> 0.5dt); - slabel(:right :cat:ac15 :pax, ak[:pri - 0.5ssw] >> 0.5dt >> 1.2ssw, - "Prisdorf" + # DE 1220 + track(:first :double:station :cat:ac15 :pax, + ak[:mef - 1sw, :mef + 1sw] ); } - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:pri + 1ssw, :tor - 1ssw]); - } - - with link = "point.de.Tornesch" { - track(:first:station :double :cat:ac15 :pax, - ak[:tor - 1ssw, :tor + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, ak[:tor] << 0.5dt); - slabel(:right :cat:ac15 :pax, ak[:tor - 0.5ssw] >> 1.0dt, - span(:bold, "Tornesch") + with zoom = :low, link = "point.de.Meimersdorf-Mf" { + # DE 1033 + track(:first :station :cat:ac15, + ak[:mef - 1.51dl, :mef - 1.5dl] >> 0.5dt + -- ak[:mef + 1.5dl, :mef + 1sw] << 1.5dt ); - } - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:tor + 1ssw, :els - 1ssw]); - } - - with link = "point.de.Himmel" { - with layer = -1 marker(:de.bk :removed :right, ak[:him] >> 0.5dt); - } - - with link = "point.de.Lieth" { - with layer = -1 marker(:de.bk :removed :right, ak[:lie] >> 0.5dt); - } - - with link = "point.de.Elmshorn-Els" { - track(:first:station :double :cat:ac15 :pax, ak[:els - 1ssw, :elm.r]); - with layer = -1 marker(:de.bft :removed :left, ak[:els] << 0.5dt); - } - - with link = "point.de.Elmshorn" { - track(:first:station :double :cat:ac15 :pax, ak[:elm.r, :elm.u]); - track(:first:station :double :cat:ac15 :pax, - ak[:elm.t - 0.1dl, :elm.t] - .. path("d4.de.1210")[:elw - 1.1ssw, :elw - 1ssw] - ); - with layer = -2 track(:third:station :pax, - ak[:elm + 0.5ssw, :elm.v] >> 1.5dt - .. path("d4.de.9120")[:lmo - 0.61ssw, :lmo - 0.6ssw] - ); - - marker(:de.bf :pax :right, ak[:elm] >> 0.5dt); - slabel(:right :pax, ak[:elm - 0.6ssw] >> 0.5dt >> 1.4ssw, - span(:bold, "Elmshorn") + # DE 1220 + track(:first :double:station :cat:ac15 :pax, + ak[:mef - 1sw, :mef + 1sw] ); } - with link = "point.de.Elmshorn-Nord" { - track(:first:station :double :cat:ac15 :pax, ak[:elm.u, :eln + 1ssw]); - marker(:de.bft :cat:ac15 :right, ak[:eln] >> 0.5dt); - with layer = -1 marker(:de.bft.casing :right, ak[:eln] >> 0.5dt); - } - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:eln + 1ssw, :hot - 1ssw]); - } - - with link = "point.de.Horst-in-Holstein" { - track(:first:station :double :cat:ac15 :pax, - ak[:hot - 1ssw, :hot + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :left, ak[:hot] << 0.5dt); - slabel(:left :cat:ac15 :pax, ak[:hot - 0.1ssw] << 0.5dt << 1.8ssw, - "Horst in Holstein" + track(:first :double:leftother:rightother :cat:ac15 :pax, + ak[:mef + 1sw, :kie - 0.5sw] ); } - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:hot + 1ssw, :hrt - 1ssw]); - } - - with link = "point.de.Horst-Holst" { - track(:first:station :double :cat:ac15 :pax, - ak[:hrt - 1ssw, :hrt + 1ssw] - ); - with layer = -1 marker(:de.bf :removed :left, ak[:hrt] << 0.5dt); - slabel(:left :removed, ak[:hrt - 0.4ssw] << 0.5dt << 1.6ssw, - hbox(:right:base, - span(:regular, "Horst "), - span(:light, "(Holst)") - ) - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:hrt + 1ssw, :dhf - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, ak[:dhf - 2.5km], "1220"); - } - - with link = "point.de.Dauenhof" { - track(:first:station :double :cat:ac15 :pax, - ak[:dhf - 1ssw, :dhf + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, ak[:dhf] << 0.5dt); - slabel(:left :cat:ac15 :pax, ak[:dhf - 0.9ssw] << 0.5dt << 1.6ssw, - "Dauenhof" - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:dhf + 1ssw, :wri - 1ssw]); - } - - with link = "point.de.Siebenecksknöll" { - with layer = -1 marker(:de.bk :removed :left, ak[:sie] << 0.5dt); - } - - with link = "point.de.Wrist" { - track(:first:station :double :cat:ac15 :pax, - ak[:wri - 1ssw, :wri + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, ak[:wri] << 0.5dt); - slabel(:right :cat:ac15 :pax, ak[:wri - 0.2ssw] >> 2.5dt, - span(:bold, "Wrist") - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:wri + 1ssw, :brs - 1ssw]); - } - - with link = "point.de.Quarnstedt" { - with layer = -1 marker(:de.bk :removed :left, ak[:qua] << 0.5dt); - } - - with link = "point.de.Brokstedt" { - track(:first:station :double :cat:ac15 :pax, - ak[:brs - 1ssw, :brs + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, ak[:brs] << 0.5dt); - slabel(:left :cat:ac15 :pax, ak[:brs - 0.5ssw] << 0.5dt << 1.5ssw, - "Brokstedt" - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:brs + 1ssw, :arp - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, ak[:brs + 2.5km], "1220"); - } - - with link = "point.de.Arpsdorf" { - track(:first:station :double :cat:ac15 :pax, - ak[:arp - 1ssw, :arp + 1ssw] - ); - with layer = -1 marker(:de.bk :removed :left, ak[:arp] << 0.5dt); - with layer = -2 marker(:de.bf :gone :left, ak[:arp] << 0.5dt); - slabel(:left :removed, ak[:arp - 0.6ssw] << 0.5dt << 1.4ssw, - "Arpsdorf" - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:arp + 1ssw, :neu - 1ssw]); - } - - with link = "point.de.Padenstedt" { - with layer = -1 marker(:de.bk :removed :left, ak[:pad] << 0.5dt); - } - - with link = "point.de.Neumüster" { - # Str. 1220 - track(:first:station :double :cat:ac15 :pax, - ak[:neu - 1ssw, :neu.yf + 1ssw] - ); - - # Str. 1040 - track(:first:station :double :cat:ac15 :pax, - path("d4.de.1040")[:neu.yf, :neu.yf + 1ssw] - ); - - # Str. 1040 (alt) - track(:first:station :double :removed, - ak[:neu + 1ssw, :neu + 1.1ssw] - .. path("d4.de.1040.neu")[:neu.h, :neu.h + 0.1dl] - ); - - # Str. 1041 - track(:first:station :removed, - ak[:neu + 0.9ssw, :neu + 1ssw] >> 0.5dt - .. path("d4.de.1041")[:neu.hh, :neu.hh + 0.1dl] - ); - - # Str. 1042 - track(:second:station :pax, - ak[:neu + 0.9ssw, :neu + 1ssw] << 0.5dt - .. path("d4.de.1042")[:neu.kk, :neu.kk + 0.1dl] - ); - - # Str. 1043 - track(:first:station :pax, ak[:neu - 1ssw, :neu - 0.5ssw] >> 1.5dt); - - marker(:de.bf :cat:ac15 :pax :right, ak[:neu] >> 0.5dt); - slabel(:right :cat:ac15 :pax, ak[:neu - 0.4ssw] >> 0.5dt >> 2.0ssw, - span(:medium :bold, "Neumünster") - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:neu.yf + 1ssw, :ein - 1ssw]); - } - - with link = "point.de.Einfeld" { - track(:first:station :double :cat:ac15 :pax, - ak[:ein - 1ssw, :ein + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :left, ak[:ein] << .5dt); - with layer = -1 marker(:de.bf :gone :left, ak[:ein] << .5dt); - slabel(:left :cat:ac15 :pax, ak[:ein - .5ssw] << .5dt << 1.6ssw, - "Einfeld" - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:ein + 1ssw, :bor - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, ak[:ein + 3.0km], "1220"); - } - - with link = "point.de.Bordesholm" { - track(:first:station :double :cat:ac15 :pax, - ak[:bor - 1ssw, :bor + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :left, ak[:bor] << .5dt); - slabel(:left :cat:ac15 :pax, ak[:bor - .5ssw] << .5dt << 1.4ssw, - "Bordesholm" - ); - } - - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:bor + 1ssw, :fli - 1ssw]); - } - - with link = "point.de.Techelsdorf" { - with layer = -1 marker(:de.bk :removed, ak[:tec] >> 0.5dt); - } - - with link = "point.de.Flintbek" { - track(:first:station :double :cat:ac15 :pax, - ak[:fli - 1ssw, :fli + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :left, ak[:fli] << 0.5dt); - with layer = -1 marker(:de.bf :gone :left, ak[:fli] << 0.5dt); - slabel(:left :cat:ac15 :pax, ak[:fli - .6ssw] << .5dt << 1.5ssw, - "Flintbek" - ); - } + with link = "point.de.Kiel-Hbf" { + # DE 1022 + track(:first :station :pax, ak[:kie - 0.5sw, :kie] << 1.5dt); - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, ak[:fli + 1ssw, :mei - 1ssw]); - } + # DE 1023 + track(:first :station :pax, ak[:kie - 0.5sw, :kie] >> 1.5dt); - with link = "point.de.Meimersdorf-Mf" { - track(:first:station :double :cat:ac15 :pax, - ak[:mei - 1ssw, :mei + 1ssw] - ); + # DE 1032 + with zoom = :high { + track(:first :station :cat:ac15, ak[:kie - 0.5sw, :kie] >> 2.5dt); + } - with layer = -2 track(:first:station :cat:ac15, - ak[:mei - 1ssw + 0.9dl, :mei - 1ssw + 1dl] << 0.5dt - -- ak[:mei - 1ssw + 2dl, :mei + 1ssw] << 1.5dt - ); - - with layer = -1 marker(:de.hp :closed, ak[:mei] >> 0.5dt); - } + # DE 1220 + track(:first :double:station :cat:ac15 :pax, ak[:kie - 0.5sw, :kie]); - with link = "line.de.1220" { - track(:first :double :cat:ac15 :pax, - ak[:mei + 1ssw, :kie.aa - 100m - 2ssw] - ); + marker(:top :de.bf :cat:ac15 :pax, ak[:kie]); } - with link = "point.de.Kiel-Hbf" { - track(:first:station :double :cat:ac15 :pax, - ak[:kie.aa - 200m - 2ssw, :kie] - ); - marker(:de.bf :cat:ac15 :pax :top, ak[:kie]); - label(:cat:ac15 :pax, ak[:kie] + (2.0dt, -1.2ssw), - hbox(:bottom:center, - vbox(:bottom:center, - span(:bold :medium, "Kiel"), - span(:bold :small, "Hbf") - ) - ) - ); + with link = "point.de.Kiel-Altonaer-Bf" { + track(:first :double:station :removed, ak[:kie + 1.2sh, :kia]); + marker(:top :de.bf :removed, ak[:kia]); } } diff --git a/rules/de/a/d3/12/1244.map b/rules/de/a/d3/12/1244.map index 6f18aa5f..272a2d84 100644 --- a/rules/de/a/d3/12/1244.map +++ b/rules/de/a/d3/12/1244.map @@ -1,105 +1,246 @@ # DE 1244. Hamburg Hbf - Aumühle # +let ba = path("d3.de.a.6100"); with detail = 3 { - let ba = path("d3.de.6100.hmb"); with link = "line.de.1244" { - with layer = 2 track(:first:double :rail:rc12 :pax, - ba[:ham.aa, :ber.f] << 2dt - .. path("d4.de.a.6100")[:ber + 1ssw, :ber + 0.9ssw] << 2dt + track(:first :double:station :rail:rc12 :pax, + ba[:anc + 0.5sw, :anc - 0.5sw] << 2dt ); - with layer = 1 casing(:first :double :rail:rc12, - ba[:ham.aa, :anc] << 2dt - ); - with layer = 1 casing(:first :double :rail:rc12, - ba[:ros, :tie] << 2dt + track(:first :double:rightother :rail:rc12 :pax, + ba[:anc - 0.5sw, :ros + 0.5sw] << 2dt ); } with link = "point.de.Hamburg-Rothenburgsort-S-Bahn" { - marker(:de.hp :rail:rc12 :pax :right, ba[:ros] >> 2.5dt); + track(:first :double:station :rail:rc12 :pax, + ba[:ros + 0.5sw, :ros - 0.5sw] << 2dt + ); + marker(:right :de.hp :rail:rc12 :pax, ba[:ros] >> 2.5dt); + with zoom = :high slabel(:right :rail:rc12 :pax, + ba[:ros - 0.5sw] >> 2.5dt >> 1.2sh, + "Rothenburgsort" + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:ros - 0.5sw, :rop + 0.5sw] << 2dt + ); + track(:first :double:station :rail:rc12 :pax, + ba[:rop + 0.5sw, :rop - 0.5sw] << 2dt + ); + track(:first :double:rightother :rail:rc12 :pax, + ba[:rop - 0.5sw, :tie + 0.5sw] << 2dt + ); } with link = "point.de.Hamburg-Tiefstack" { - marker(:de.hp :rail:rc12 :pax :right, ba[:tie] >> 2.5dt); - marker(:de.hp.casing :rail:rc12 :pax :right, ba[:tie] >> 2.5dt); + track(:first :double:station :rail:rc12 :pax, + ba[:tie + 0.5sw, :tie - 0.5sw] << 2dt + ); + marker(:right :de.hp :rail:rc12 :pax, ba[:tie] >> 2.5dt); + with zoom = :high slabel(:right :rail:rc12 :pax, + ba[:tie - 0.5sw] >> 2.5dt >> 1.2sh, + "Tiefstack" + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:tie - 0.5sw, :rtk + 0.5sw] << 2dt + ); + track(:first :double:station :rail:rc12 :pax, + ba[:rtk + 0.5sw, :rtk - 0.5sw] << 2dt + ); + track(:first :double:rightother :rail:rc12 :pax, + ba[:rtk - 0.5sw, :bil + 0.5sw] << 2dt + ); } with link = "point.de.Hamburg-Billwerder-Moorfleet" { - marker(:de.hp :rail:rc12 :pax :right, ba[:bim] >> 2.5dt); + track(:first :double:station :rail:rc12 :pax, + ba[:bil + 0.5sw, :bia - 0.5sw] << 2dt + ); + marker(:right :de.hp :rail:rc12 :pax, ba[:bia] >> 2.5dt); + with zoom = :high slabel(:right :rail:rc12 :pax, + ba[:bil - 1sw] >> 2.5dt >> 1.2sh, + "Billwerder-Moorfleet" + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:bia - 0.5sw, :biu + 0.5sw] << 2dt + ); + } + + with link = "point.de.Hamburg-Billwerder-Üst" { + track(:first :double:station :rail:rc12 :pax, + ba[:biu + 0.5sw, :biu - 0.5sw] << 2dt + ); + marker(:right :de.uest :rail:rc12, ba[:biu] >> 2.5dt); + with zoom = :high slabel(:right :rail:rc12 :light, + ba[:biu - 0.5sw] >> 2.5dt >> 1.2sh, + "Billwerder (Üst)" + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:biu - 0.5sw, :mit + 0.5sw] << 2dt + ); } with link = "point.de.Hamburg-Mittlerer-Landweg" { - marker(:de.hp :rail:rc12 :pax :right, ba[:mit] >> 2.5dt); + track(:first :double:station :rail:rc12 :pax, + ba[:mit + 0.5sw, :mit - 0.5sw] << 2dt + ); + marker(:right :de.hp :rail:rc12 :pax, ba[:mit] >> 2.5dt); + with zoom = :high slabel(:right :rail:rc12 :pax, + ba[:mit - 0.8sw] >> 2.5dt >> 1.0sh, + vbox(:left:bottom, "Mittlerer", "Landweg") + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:mit - 0.5sw, :all + 1sw] << 2dt + ); } with link = "point.de.Hamburg-Allermöhe-S-Bahn" { - marker(:de.hp :rail:rc12 :pax :right, ba[:als] >> 2.5dt); + track(:first :double:station :rail:rc12 :pax, + ba[:all + 1sw, :als - 0.5sw] << 2dt + ); + marker(:right :de.hp :rail:rc12 :pax, ba[:als] >> 2.5dt); + with zoom = :high slabel(:top :rail:rc12 :pax, + ba[:als] >> 2.5dt >> 1.2sh, + vbox(:center:bottom, " Aller-", "möhe") + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:als - 0.5sw, :net + 1sw] << 2dt + ); } with link = "point.de.Hamburg-Nettelnburg" { - marker(:de.hp :rail:rc12 :pax :right, ba[:net] >> 2.5dt); + track(:first :double:station :rail:rc12 :pax, + ba[:net + 1sw, :beg - 1sw] << 2dt + ); + marker(:right :de.hp :rail:rc12 :pax, ba[:net] >> 2.5dt); + with zoom = :high slabel(:top :rail:rc12 :pax, + ba[:net] >> 2.5dt >> 1.2sh, + vbox(:center:bottom, " Netteln-", "burg") + ); } -} -with detail = 3 { - let ba = path("d4.de.a.6100"); + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:beg - 1sw, :ber + 1sw] << 2dt + ); + } with link = "point.de.Hamburg-Bergedorf-S-Bahn" { - track(:first:station :double :rail:rc12 :pax, - ba[:ber + 1ssw, :ber - 1ssw] << 2dt + track(:first :double:station :rail:rc12 :pax, + ba[:ber + 1sw, :ber - 1sw] << 2dt ); - marker(:de.bf :rail:rc12 :pax :right, ba[:ber] >> 2.5dt); + marker(:right :de.bf :rail:rc12 :pax, ba[:ber] >> 2.5dt); } with link = "line.de.1244" { - track(:first :double :rail:rc12 :pax, - ba[:ber - 1ssw, :rei + 1ssw] << 2dt + track(:first :double:rightother :rail:rc12 :pax, + ba[:ber - 1sw, :mow + 0.5sw] << 2dt + ); + } + + with link = "point.de.Reinbek-LGr-S-Bahn" { + track(:first :double:station :rail:rc12 :pax, + ba[:mow + 0.5sw, :reg - 0.5sw] << 2dt + ); + marker(:right :de.lgr :rail:rc12, ba[:reg] >> 2.5dt); + slabel(:left :rail:rc12, ba[:reg] >> 2.5dt >> 1.4sh + (1.8sw, 0dt), + span(:italic, "HH/SH") + ); + } + + with link = "line.de.1244" { + track(:first :double:rightother :rail:rc12 :pax, + ba[:reg - 0.5sw, :rei + 0.5sw] << 2dt ); } with link = "point.de.Reinbek" { - track(:first:station :double :rail:rc12 :pax, - ba[:rei + 1ssw, :rei - 1ssw] << 2dt + track(:first :double:station :rail:rc12 :pax, + ba[:rei + 0.5sw, :rei - 0.5sw] << 2dt ); - marker(:de.hp :rail:rc12 :pax :right, ba[:rei] >> 2.5dt); - slabel(:left :rail:rc12 :pax, ba[:rei + 0.3ssw] >> 2.5dt >> 1.5ssw, + marker(:right :de.hp :rail:rc12 :pax, ba[:rei] >> 2.5dt); + marker(:right :de.exbf :rail:rc12 :pax, ba[:rei] >> 2.5dt); + slabel(:top :rail:rc12 :pax, ba[:rei] >> 2.5dt >> 1.7sh + (-1sw, 0dt), "Reinbek" ); } with link = "line.de.1244" { - track(:first :double :rail:rc12 :pax, - ba[:rei - 1ssw, :woh + 1ssw] << 2dt + track(:first :double:rightother :rail:rc12 :pax, + ba[:rei - 0.5sw, :woh + 1sw] << 2dt ); } with link = "point.de.Wohltorf" { - track(:first:station :rail:rc12 :pax, - ba[:woh + 1ssw, :woh - 1ssw] << 1.5dt + track(:first :station :rail:rc12 :pax, + ba[:woh + 1sw, :woh - 0.5sw] << 2.5dt + -- ba[:woh - 0.5sw - 1dl, :woh - 0.5sw - 1.1dl] << 1.5dt ); - track(:first:station :rail:rc12 :pax, - ba[:woh + 1ssw, :woh - 0.6ssw] << 2.5dt - -- ba[:woh - 0.6ssw - 1dl, :woh - 0.6ssw - 1.1dt] << 1.5dt + track(:first :station :rail:rc12 :pax, + ba[:woh + 1sw, :woh - 1sw] << 1.5dt ); - marker(:de.bf :rail:rc12 :pax :right, ba[:woh] >> 2.5dt); - slabel(:left :rail:rc12 :pax, ba[:woh + 0.5ssw] >> 2.5dt >> 1.5ssw, + marker(:right :de.bf :rail:rc12 :pax, ba[:woh] >> 2.5dt); + slabel(:left :rail:rc12 :pax, ba[:woh + 0.5sw] >> 2.5dt >> 1.2sh, "Wohltorf" ); } with link = "line.de.1244" { - track(:first :rail:rc12 :pax, ba[:woh - 1ssw, :aum + 1ssw] << 1.5dt); + track(:first :rightother :rail:rc12 :pax, + ba[:woh - 1sw, :sil + 0.5sw] << 1.5dt + ); + } + + with link = "point.de.Aumühle-Silk" { + track(:first :station :rail:rc12 :pax, + ba[:sil + 0.5sw, :sil - 0.5sw] << 1.5dt + ); + marker(:right :de.anst :removed, ba[:sil] >> 1.5dt); + slabel(:left :removed :light, ba[:sil + 0.4sw] >> 1.5dt >> 1.2sh, + "Silk" + ); + } + + with link = "line.de.1244" { + track(:first :rightother :rail:rc12 :pax, + ba[:sil - 0.5sw, :aum + 1sw] << 1.5dt + ); } with link = "point.de.Aumühle" { - track(:first:station :rail:rc12 :pax, - ba[:aum + 1ssw, :aum - 1ssw] << 1.5dt + # DE 1244 + track(:first :station :rail:rc12 :pax, + ba[:aum + 1sw, :aum + 0.1sw] << 1.5dt + ); + + # DE 1285 + track(:first :station :cat:ac15, + ba[:aum - 0.1sw, :aua + 0.5sw] << 1.5dt ); - marker(:de.bf :rail:rc12 :pax :right, ba[:aum] >> 1.5dt); - slabel(:left :rail:rc12 :pax, ba[:aum - 1ssw] >> 1.5dt >> 1.5ssw, - span(:bold, "Aumühle") + + marker(:right :de.bf :rail:rc12 :pax, ba[:aum] >> 1.5dt); + slabel(:top :rail:rc12 :pax :bold, + ba[:aum] >> 1.5dt >> 1.0sh + (-1sw, 0dt), + "Aumühle" ); } } diff --git a/rules/de/a/d3/17/1720.map b/rules/de/a/d3/17/1720.map index 06012bc7..caba85c9 100644 --- a/rules/de/a/d3/17/1720.map +++ b/rules/de/a/d3/17/1720.map @@ -1,596 +1,192 @@ # DE 1720. Lehrte - Cuxhaven # -let lc = path("d4.de.a.1720"); +let lc = path("d3.de.a.1720"); with detail = 3 { - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:emm + 1ssw, :bev - 1ssw]); - } - - with link = "point.de.Bad-Bevensen" { - track(:first:station :double :cat:ac15 :pax, - lc[:bev - 1ssw, :bev + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lc[:bev] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:bev - 0.6ssw] >> 0.5dt >> 1.6ssw, - "Bad Bevensen" - ); - } with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:bev + 1ssw, :bie - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, lc[:bev + 3.0km], "1720"); - } - - with link = "point.de.Bruchtorf" { - with layer = -1 marker(:de.bk :removed, lc[:bru] >> 0.5dt); - } - - with link = "point.de.Bienenbüttel" { - track(:first:station :double :cat:ac15 :pax, - lc[:bie - 1ssw, :bie + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lc[:bie] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:bie - 0.8ssw] >> 0.5dt >> 1.6ssw, - "Bienenbüttel" + track(:first :double :cat:ac15 :pax, + lc[:deu - 1sw, :lug - 1sw] ); } - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:bie + 1ssw, :deu - 1ssw]); - } - - with link = "point.de.Hohenbostel" { - with layer = -1 marker(:de.bk :removed :right, lc[:hbo] >> 0.5dt); - slabel(:right :removed, lc[:hbo - 0.8ssw] >> 0.5dt >> 1.4ssw, - "Hohenbostel" + with link = "point.de.Lüneburg-Gbf" { + track(:first :double:station :cat:ac15 :pax, + lc[:lug - 1sw, :lug + 1sw] ); - } - - with link = "point.de.Deutsch-Evern" { - track(:first:station :double :cat:ac15 :pax, - lc[:deu - 1ssw, :deu + 1ssw] + marker(:right :de.bft :cat:ac15, lc[:lug] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:lug - 0.5sw] >> 0.5dt >> 1.4sh, + span(:light, "L. Gbf") ); - marker(:de.bbf :cat:ac15 :left, lc[:deu] << 0.5dt); - with layer = -1 marker(:de.bf :removed :left, lc[:deu] << 0.5dt); - slabel(:right :cat:ac15, lc[:deu - 0.8ssw] >> 1.5dt, "Deutsch Evern"); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:deu + 1ssw, :lun.a]); - } - - with link = "point.de.Lüneburg-Gbf" { - track(:first:station :double :cat:ac15 :pax, lc[:lun.a, :lun.r]); - with layer = 2 marker(:de.bft :cat:ac15 :left, lc[:lug] << 0.5dt); } with link = "point.de.Lüneburg" { - # Str. 1720 - track(:first:station :double :cat:ac15 :pax, lc[:lun.r, :lun.xn]); - - # Str. 1151 - track(:second:station :pax, - lc[:fdan, :fdan + 100m] << 0.5dt << 1.25ssw - .. lc[:lun - 0.5ssw, :lun - 0.49ssw] << 0.5dt << 1ssw - ); - track(:second:station :cat:ac15 :pax, - lc[:lun - 0.5ssw, :lun + 0.5ssw] << 0.5dt << 1ssw - .. lc[:lkn - 0.51ssw, :lkn - 0.5ssw] << 1.5dt + # DE 1150 + track(:first :station :pax, + lc[:lun - 0.5sw - 2.1dl, :lun - 0.5sw - 2dl] >> 0.5dt + -- lc[:lun - 0.5sw - 1dl, :lun + 1sw] >> 1.5dt ); - # Str. 1150 - with layer = -1 track(:second:station :pax, - lc[:lun + 0.99ssw, :lun + 1ssw] >> 0.5dt - .. path("d4.de.1150")[:lun.kk - 0.1dl, :lun.kk] + # DE 1720 + track(:first :double:station :cat:ac15 :pax, + lc[:lug + 1sw, :lun + 1sw] ); - marker(:de.bf :cat:ac15 :pax :left, lc[:lun] << 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:lun - 0.6ssw] >> 1.5dt, + marker(:left :de.inbf :cat:ac15 :pax, lc[:lun] << 0.5dt); + slabel(:left :cat:ac15 :pax, lc[:lun - 0.5sw] << 1sh << 2dt, span(:bold, "Lüneburg") ); } - with link = "point.de.Lüneburg-Nordkopf" { - track(:first:station :double :cat:ac15 :pax, lc[:lun.xn, :lun.f]); - track(:first:station :cat:ac15 :pax, - lc[:lkn - 0.5ssw, :lun.f] << 1.5dt - ); - marker(:de.bft :cat:ac15 :right, lc[:lkn + 1dt] >> 0.5dt); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:lun.f, :bar - 1ssw]); - } - - with link = "point.de.Goseburg" { - with layer = -1 marker(:de.bk :removed :right, lc[:gos] >> 0.5dt); - } - - with link = "point.de.Bardowick" { - track(:first:station :double :cat:ac15 :pax, - lc[:bar - 1ssw, :bar + 1ssw]); - marker(:de.bf:cat:ac15 :pax :right, lc[:bar] >> 0.5dt); - slabel(:right:cat:ac15 :pax, lc[:bar - 0.5ssw] >> 0.5dt >> 1.2ssw, - "Bardowick" - ); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:bar + 1ssw, :rad - 1ssw]); - } - - with link = "point.de.Radbruch" { - track(:first:station :double :cat:ac15 :pax, - lc[:rad - 1ssw, :rad + 1ssw] - ); - track(:first:station :cat:ac15 :pax, - lc[:rad - 1ssw, :rad + 1ssw] << 1.5dt - ); - - marker(:de.hp :cat:ac15 :pax :left, lc[:rad] << 1.5dt); - with layer = -1 marker(:de.bf :removed :left, lc[:rad] << 1.5dt); - slabel(:left :cat:ac15 :pax, lc[:rad - 1.5ssw] << 1.5dt << 2.2ssw, - "Radbruch" - ); - } - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:rad + 1ssw, :win - 1ssw]); - } - - with link = "point.de.Borstel" { - with layer = -1 marker(:de.bk :removed :right, lc[:bor] >> 0.5dt); - } - - with link = "point.de.Winsen-Luhe" { - track(:first:station :double :cat:ac15 :pax, - lc[:win - 1ssw, :win + 1ssw] - ); - track(:first:station :cat:ac15 :pax, - lc[:win - 1ssw, :win + 1ssw] << 1.5dt + track(:first :double:rightother :cat:ac15 :pax, + lc[:lun + 1sw, :lkn - 0.5sw] ); - - marker(:de.bf :cat:ac15 :pax :right, lc[:win] >> 0.5dt); - slabel(:left :cat:ac15 :pax, lc[:win + 0.3ssw] << 1.5dt << 6pt, - hbox(:center:base, - span(:bold, "Winsen "), - span(:regular, "(Luhe)") - ) - ); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:win + 1ssw, :ash - 1ssw]); - } - - # point.de.Ashausen-Abzw de.1153 - # point.de.Ashausen de.1153 - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:ash + 1ssw, :ste - 1ssw]); } - with link = "point.de.Stelle" { - track(:first :station :cat:ac15, - lc[:ste - 1ssw, :ste + 1ssw] >> 1.5dt - ); - track(:first :station :cat:ac15 :pax, - lc[:ste - 1ssw, :ste + 1ssw] >> 0.5dt - ); - track(:first :station :cat:ac15 :pax, - lc[:ste - 1ssw, :ste + 1ssw] << 0.5dt - ); + with link = "point.de.Lüneburg-Nordkopf" { + # DE 1151 track(:first :station :cat:ac15 :pax, - lc[:ste - 1ssw, :ste + 1ssw] << 1.5dt - ); - marker(:de.bf :cat:ac15 :pax :left, lc[:ste] << 1.5dt); - slabel(:right :cat:ac15 :pax, lc[:ste] >> 2.5dt, - span(:bold, "Stelle") - ); - } -} - -with detail = 3 { - let lc = path("d3.de.1720.hmb"); - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:ste + 1ssw, :mas - 1ssw]); - } - - with link = "point.de.Maschen-Pbf" { - track(:first:station :double :cat:ac15 :pax, - lc[:mas - 1ssw, :mas + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lc[:mas] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:mas - 0.7ssw] >> 0.5dt >> 1.4ssw, - "Maschen Pbf" + lc[:lkn - 0.5sw, :lkn + 0.5sw] << 1.5dt ); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:mas + 1ssw, :meh - 2ssw]); - } - - with link = "point.de.Meckelfeld-Abzw" { - track(:first:station :double :cat:ac15 :pax, - lc[:meh - 2ssw, :meh - 1ssw] - ); - marker(:de.bft :cat:ac15 :right, lc[:meh - 1.5ssw] >> 0.5dt); - } - with link = "point.de.Meckelfeld-Hp" { - track(:first:station :double :cat:ac15 :pax, - lc[:meh - 1ssw, :meh + 1ssw] + # DE 1720 + track(:first :double:station :cat:ac15 :pax, + lc[:lkn - 0.5sw, :lkn + 0.5sw] ); - marker(:de.hp :cat:ac15 :pax :right, lc[:meh] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:meh - 0.7ssw] >> 0.5dt >> 1.4ssw, - "Meckelfeld" - ); - } - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, - lc[:meh + 1ssw, :har.a - 1200m] + marker(:left :de.bft :cat:ac15 :pax, lc[:lkn] << 1.5dt); + slabel(:left :cat:ac15 :pax, lc[:lkn - 0.5sw] << 1.5dt << 1.6sh, + span(:light, "L. Nordkopf") ); } - # point.de.Hamburg-Harburg: de.2200 - - with link = "point.de.Hamburg-Unterelbe" { - track(:first:station :double :cat:ac15 :pax, lc[:unt, :unt + 2ssw]); - marker(:de.bbf :cat:ac15 :right, lc[:unt + 1ssw] >> 0.5dt); - } - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:unt + 2ssw, :haa - 1ssw]); - } - - with link = "point.de.Hamburg-Hausbruch" { - track(:first:station :double :cat:ac15 :pax, - lc[:haa - 1ssw, :hbm + 1ssw] + track(:first :double:leftother :cat:ac15 :pax, + lc[:lkn + 0.5sw, :gos - 0.5sw] ); - marker(:de.bbf :cat:ac15 :pax :left, lc[:haa] << 0.5dt); - with layer = -1 marker(:de.bf.casing :left, lc[:haa] << 0.5dt); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:hbm + 1ssw, :ngr - 1ssw]); } - with link = "point.de.Hamburg-Neugraben" { - track(:first:station :double :cat:ac15 :pax, - lc[:ngr - 1ssw, :ngr + 4dl] - ); - marker(:de.bf :cat:ac15 :pax :right, lc[:ngr] >> 0.5dt); - } -} - -with detail = 3 { - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, - path("d3.de.1720.hmb")[:ngr + 4dl, :ngr + 5dl] - .. lc[:fis - 1.1ssw, :fis - 1ssw] - ); - } - - with link = "point.de.Fischbek" { - track(:first:station :double :cat:ac15 :pax, - lc[:fis - 1ssw, :fis + 1ssw] + with link = "point.de.Goseburg" { + track(:first :double:station :cat:ac15 :pax, + lc[:gos - 0.5sw, :gos + 0.5sw] ); - marker(:de.hp :cat:ac15 :pax :right, lc[:fis] >> 0.5dt); - slabel(:top :cat:ac15 :pax, lc[:fis] >> 0.5dt >> 1.2ssw, "Fischbek"); + marker(:right :de.bk :removed, lc[:gos] >> 0.5dt); } with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:fis + 1ssw, :nwu - 1ssw]); - } - - with link = "point.de.Neu-Wulmstorf" { - track(:first:station :double :cat:ac15 :pax, - lc[:nwu - 1ssw, :nwu + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :left, lc[:nwu] << 0.5dt); - with layer = -1 marker(:de.bf :removed :left, lc[:nwu] << 0.5dt); - slabel(:left :cat:ac15 :pax, lc[:nwu - 2ssw] << 0.5dt << 3.5ssw, - "Neu Wulmstorf" + track(:first :double:leftother :cat:ac15 :pax, + lc[:gos - 0.5sw, :bar - 1sw] ); } - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:nwu + 1ssw, :bux - 1ssw]); - } - - with link = "point.de.Buxtehude" { - track(:first:station :double :cat:ac15 :pax, - lc[:bux - 1ssw, :bux + 1ssw] + with link = "point.de.Bardowick" { + track(:first :double:station :cat:ac15 :pax, + lc[:bar - 1sw, :bar + 1sw] ); - marker(:de.bf :cat:ac15 :pax :right, lc[:bux] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:bux + 2ssw] >> 0.5dt >> 1.2ssw, - span(:bold, "Buxtehude") + marker(:right :de.bf :cat:ac15 :pax, lc[:bar] >> 0.5dt); + slabel(:right :cat:ac15 :pax, + lc[:bar] >> 0.5dt >> 1.6sh + (-1.5sw, 0dt), + "Bardowick" ); } with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:bux + 1ssw, :nkl - 1ssw]); - } - - with link = "point.de.Neukloster-Stade" { - track(:first:station :double :cat:ac15 :pax, - lc[:nkl - 1ssw, :nkl + 1ssw] + track(:first :double:leftother :cat:ac15 :pax, + lc[:bar + 1sw, :rad - 1sw] ); - marker(:de.hp :cat:ac15 :pax :right, lc[:nkl] >> 0.5dt); - with layer = -1 marker(:de.bf :gone :right, lc[:nkl] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:nkl - 0.5ssw] >> 0.5dt >> 1.4ssw, - hbox(:left:base, - "Neukloster ", span(:light, "(Kr Stade)") - ) - ); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:nkl + 1ssw, :hor - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, lc[:nkl + 2.5km], "1720"); + line_label(:right:sw :cat:ac15 :pax, lc[:bar + 3km], "1720"); } - with link = "point.de.Horneburg" { - track(:first:station :double :cat:ac15 :pax, - lc[:hor - 1ssw, :hor + 1ssw] - ); - marker(:de.bf :cat:ac15 :pax :right, lc[:hor] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:hor - 0.8ssw] >> 0.5dt >> 1.5ssw, - "Horneburg" + with link = "point.de.Radbruch" { + # DE 1720 + track(:first :double:station :cat:ac15 :pax, + lc[:rad - 1sw, :rad + 1sw] ); - } - - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:hor + 1ssw, :dol - 1ssw]); - } - with link = "point.de.Dollern" { - track(:first:station :double :cat:ac15 :pax, - lc[:dol - 1ssw, :dol + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :right, lc[:dol] >> 0.5dt); - with layer = -1 marker(:de.bf :removed :right, lc[:dol] >> 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:dol - 0.5ssw] >> 0.5dt >> 1.5ssw, - "Dollern" + # DE 1153 + track(:first :station :cat:ac15 :pax, + lc[:rad - 1sw, :rad + 1sw] << 1.5dt ); - } - with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:dol + 1ssw, :aga - 1ssw]); - } - - with link = "point.de.Agathenburg" { - track(:first:station :double :cat:ac15 :pax, - lc[:aga - 1ssw, :aga + 1ssw] - ); - marker(:de.hp :cat:ac15 :pax :left, lc[:aga] << 0.5dt); - slabel(:right :cat:ac15 :pax, lc[:aga - 0.4ssw] >> 1.5dt, - "Agathenburg" + marker(:right :de.bf :cat:ac15 :pax, lc[:rad] >> 0.5dt); + slabel(:right :cat:ac15 :pax, + lc[:rad] >> 0.5dt >> 1.6sh + (-1.5sw, 0dt), + "Radbruch" ); } with link = "line.de.1720" { - track(:first :double :cat:ac15 :pax, lc[:aga + 1ssw, :sta.a]); - } - - with link = "point.de.Stade" { - track(:first:station :double :cat:ac15 :pax, lc[:sta.a, :sta + 1ssw]); - marker(:de.bf :cat:ac15 :pax :right, lc[:sta] >> 0.5dt); - slabel(:left :cat:ac15 :pax, lc[:sta] >> 0.5dt >> 1.6ssw, - span(:bold, "Stade") + track(:first :double:leftother :cat:ac15 :pax, + lc[:rad + 1sw, :bor - 0.5sw] ); } - with link = "line.de.1720" { - track(:first :double :pax, lc[:sta + 1ssw, :ham - 1ssw]); - with layer = 1 line_badge(:pax, lc[:ham - 2.0km], "1720"); - } - - with link = "point.de.Hahle" { - with layer = -1 marker(:de.bk :removed :left, lc[:hah] << 0.5dt); - slabel(:bottom :removed, lc[:hah] << 0.5dt << 1.2ssw, "Hahle"); - } - - with link = "point.de.Hammah" { - track(:first:station :double :pax, lc[:ham - 1ssw, :ham + 1ssw]); - marker(:de.hp :pax :left, lc[:ham] << 0.5dt); - with layer = -1 marker(:de.bf :removed :left, lc[:ham] << 0.5dt); - slabel(:left :pax, lc[:ham - 2ssw] << 0.5dt << 2.4ssw, "Hammah"); - } - - with link = "line.de.1720" { - track(:first :double :pax, lc[:ham + 1ssw, :him - 1ssw]); - } - - with link = "point.de.Himmelpforten" { - track(:first:station :pax, - lc[:him - 1ssw, :him + 0.5ssw] >> 0.5dt - -- lc[:him + 0.5ssw + 1dl, :him + 0.5ssw + 1.1dl] << 0.5dt + with link = "point.de.Borstel" { + track(:first :double:station :cat:ac15 :pax, + lc[:bor - 0.5sw, :bor + 0.5sw] ); - with layer = -1 track(:first:station :removed, - lc[:him + 0.5ssw, :him + 1.5ssw] >> 0.5dt - ); - track(:first:station :pax, lc[:him - 1ssw, :him + 1.5ssw] << 0.5dt); - - marker(:de.hp :pax :left, lc[:him] << 0.5dt); - marker(:de.uest :pax :left, lc[:him] << 0.5dt); - with layer = -1 marker(:de.bf :gone :left, lc[:him] << 0.5dt); - slabel(:left :pax, lc[:him - 2ssw] << 0.5dt << 2.2ssw, - "Himmelpforten" + marker(:right :de.bk :removed, lc[:bor] >> 0.5dt); + slabel(:right :removed :light, + lc[:bor - 0.5sw] >> 0.5dt >> 1.2sh, + "Borstel" ); } with link = "line.de.1720" { - with layer = -1 track(:first :removed, - lc[:him.f, :ost - 250m] >> 0.5dt - ); - with layer = -1 track(:first:removed, - lc[:ost + 500m, :hec - 1ssw] >> 0.5dt - ); - track(:first :pax, - lc[:him.f, :ost - 250m - 1dl] << 0.5dt - -- lc[:ost - 250m, :ost + 500m] >> 0.5dt - -- lc[:ost + 500m + 1dl, :hec - 1ssw] << 0.5dt - ); - with layer = -1 track(:first:removed, - lc[:ost - 250m - 1dl, :ost + 500m + 1dl] << 0.5dt - ); - } - - with link = "point.de.Ostebrücke" { - with layer = -1 marker(:de.bk :removed :right, lc[:ost] >> 0.5dt); - slabel(:right:removed, lc[:ost + 1ssw] >> 0.5dt >> 1.2ssw, - "Ostebrücke" + track(:first :double:leftother :cat:ac15 :pax, + lc[:bor + 0.5sw, :win - 1sw] ); } - with link = "point.de.Hechthausen" { - with layer = -1 track(:first:station :removed, - lc[:hec - 1ssw, :hec + 0.5ssw + 1dl] >> 0.5dt - ); - track(:first:station :pax, - lc[:hec + 0.49ssw, :hec + 0.5ssw] << 0.5dt - -- lc[:hec + 0.5ssw + 1dl, :hec + 1.5ssw] >> 0.5dt - ); - track(:first:station :pax, - lc[:hec - 1ssw, :hec + 1.5ssw] << 0.5dt - ); - marker(:de.hp :pax :right, lc[:hec] >> 0.5dt); - marker(:de.uest :pax :right, lc[:hec] >> 0.5dt); - with layer = -1 marker(:de.bf :gone :right, lc[:hec] >> 0.5dt); - slabel(:left :pax, lc[:hec - 0.4ssw] << 0.5dt << 1.5ssw, - "Hechthausen" + with link = "point.de.Winsen-Luhe" { + # DE 1720 + track(:first :double:station :cat:ac15 :pax, + lc[:win - 1sw, :win + 1sw] ); - } - - with link = "line.de.1720" { - track(:first :double :pax, lc[:hec + 1.5ssw, :hem - 1ssw]); - with layer = 1 line_badge(:pax, lc[:hec + 4.0km], "1720"); - } - with link = "point.de.Hemmoor" { - track(:first:station :double :pax, lc[:hem - 1ssw, :hem + 1ssw]); - marker(:de.hp :pax :right, lc[:hem] >> 0.5dt); - with layer = -1 marker(:de.bf :removed :right, lc[:hem] >> 0.5dt); - slabel(:right :pax, lc[:hem - 1.0ssw] >> 0.5dt >> 1.2ssw, - vbox(:left:bottom, - span(:removed, "Basbeck-Osten"), - "Hemmoor" - ) + # DE 1153 + track(:first :station :cat:ac15 :pax, + lc[:win - 1sw, :win + 1sw] << 1.5dt ); - } - - with link = "line.de.1720" { - track(:first :double :pax, lc[:hem + 1ssw, :war - 1ssw]); - } - with link = "point.de.Warstade" { - track(:first:station :double :pax, lc[:war - 1ssw, :war + 1ssw]); - with layer = -1 marker(:de.bf :removed :left, lc[:war] << 0.5dt); - slabel(:left :pax :removed, lc[:war] << 0.5dt << 2.2ssw, - "Warstade-Hemmoor" + marker(:right :de.bf :cat:ac15 :pax, lc[:win] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lc[:win - 0.5sw] << 2.0dt, + hbox(:right:top, hbox(:right:base, + span(:bold, "Winsen "), "(Luhe)" + )) ); } with link = "line.de.1720" { - track(:first :double :pax, lc[:war + 1ssw, :wig - 1ssw]); - } - - with link = "point.de.Wingst" { - track(:first:station :double :pax, lc[:wig - 1ssw, :wig + 1ssw]); - marker(:de.hp :pax :right, lc[:wig] >> 0.5dt); - with layer = -1 marker(:de.bf :gone :right, lc[:wig] >> 0.5dt); - slabel(:right :pax, lc[:wig - 1.0ssw] >> 0.5dt >> 1.4ssw, - vbox(:left:bottom, - span(:removed, "Höftgrube"), - "Wingst" - ) + track(:first :double:leftother :cat:ac15 :pax, + lc[:win + 1sw, :asa - 1sw] ); + line_label(:right:sw :cat:ac15 :pax, lc[:win + 2.5km], "1720"); } - with link = "line.de.1720" { - track(:first :double :pax, lc[:wig + 1ssw, :cad - 1ssw]); - } - - with link = "point.de.Cadenberge" { - track(:first:station :double :pax, lc[:cad - 1ssw, :cad + 1ssw]); - marker(:de.bf :pax :right, lc[:cad] >> 0.5dt); - slabel(:right :pax, lc[:cad - 0.5ssw] >> 0.5dt >> 1.4ssw, - "Cadenberge" + with link = "point.de.Ashausen-Abzw" { + # DE 1720 + track(:first :double:station :cat:ac15 :pax, + lc[:asa - 1sw, :ash + 1sw] ); - } - with link = "line.de.1720" { - track(:first :double :pax, lc[:cad + 1ssw, :nha - 1ssw]); - } - - with link = "point.de.Neuhaus-Oste" { - track(:first:station :double :pax, lc[:nha - 1ssw, :nha + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, lc[:nha] >> 0.5dt); - slabel(:right :removed, lc[:nha - 0.5ssw] >> 0.5dt >> 1.4ssw, - hbox(:left:base, "Neuhaus ", span(:light, "(Oste)")) + # DE 1281 + track(:first :station :cat:ac15 :pax, + lc[:asa - 1.1dl, :asa - 1dl] >> 0.5dt + -- lc[:asa, :ash + 1sw] >> 1.5dt ); - } - with link = "line.de.1720" { - track(:first :double :pax, lc[:nha + 1ssw, :ott - 1ssw]); - } - - with link = "point.de.Otterndorf-Osterende" { - with layer = -1 marker(:de.bk :removed :right, lc[:ose] >> 0.5dt); - } - - with link = "point.de.Otterndorf" { - track(:first:station :double :pax, lc[:ott - 1ssw, :ott + 1ssw]); - marker(:de.hp :pax :right, lc[:ott] >> 0.5dt); - with layer = -1 marker(:de.bf :removed :right, lc[:ott] >> 0.5dt); - slabel(:top :pax, lc[:ott] >> 0.5dt >> 1.3ssw, - "Otterndorf" + marker(:right :de.abzw :cat:ac15 :pax, lc[:asa] >> 1.5dt); + slabel(:right :cat:ac15 :light, + lc[:asa - 0.5sw] >> 1.5dt >> 1.6sh + (-1.5sw, 0dt), + "Ashausen Abzw" ); } with link = "line.de.1720" { - track(:first :double :pax, lc[:ott + 1ssw, :abr - 1ssw]); - with layer = 1 line_badge(:pax, lc[:abr - 2.5km], "1720"); - } - - with link = "point.de.Otterndorf-Westerende" { - with layer = -1 marker(:de.bk :right :gone, lc[:wee] >> 0.5dt); - } - - with link = "point.de.Altenbruch" { - track(:first:station :double :pax, lc[:abr - 1ssw, :abr + 1ssw]); - with layer = -2 marker(:de.bf :removed :left, lc[:abr] << 0.5dt); - slabel(:left :removed, lc[:abr - 0.5ssw] << 0.5dt << 2.8ssw, - "Altenbruch" - ); - } - - with link = "line.de.1720" { - track(:first :double :pax, lc[:abr + 1ssw, :gro - 1ssw]); - } - - with link = "point.de.Cuxhaven-Groden" { - track(:first:station :double :pax, lc[:gro - 1ssw, :gro + 1ssw]); - } - - with link = "point.de.Cuxhaven-CF" { - track(:first:station :double :pax, lc[:gro + 1ssw, :cuf + 1ssw]); - track(:second:station :pax, - path("d4.de.a.1310")[:cux.b, :cux.b + 0.1dl] - .. lc[:cuf - 0.5ssw, :cuf - 0.49ssw] << 0.5dt - ); - with layer = -1 marker(:de.bft :left, lc[:cuf] << 0.5dt); - } - - with link = "point.de.Cuxhaven" { - track(:first:station :double :pax, lc[:cuf + 1ssw, :cux]); - marker(:de.bf :pax :top, lc[:cux]); - slabel(:left :pax, lc[:cux] - (1.8ssw, 0.2ssw), - span(:bold, "Cuxhaven") + track(:first :double:leftother:rightother :cat:ac15 :pax, + lc[:ash + 1sw, :ste - 1sw] ); } } diff --git a/rules/de/a/d3/61/6100.map b/rules/de/a/d3/61/6100.map index 5f25b74a..4dea8690 100644 --- a/rules/de/a/d3/61/6100.map +++ b/rules/de/a/d3/61/6100.map @@ -1,240 +1,387 @@ # DE 6100. Berlin-Spandau - Hamburg-Altona # -let ba = path("d4.de.a.6100"); +let ba = path("d3.de.a.6100"); with detail = 3 { + # DE-W + with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, - ba[:gsah + 0.5ssw, :buc - 1ssw] - ); + track(:first :double :cat:ac15 :pax, ba[:gsah + 0.5sw, :buc - 1sw]); } with link = "point.de.Büchen" { - with layer = 2 track(:first:station :double :cat:ac15 :pax, - ba[:buc - 1ssw, :buc.r] + # DE 1150 - DE 1121 + track(:first :station :pax, + ba[:buc, :buc + 0.5sw] << 1sh << 0.5dt + -- ba[:buc + 0.5sw + 2dl, :buc + 0.5sw + 2.1dl] >> 1.5dt ); - with layer = -1 track(:first:station :pax, - ba[:buc - 0.5ssw, :buc + 0.5ssw] << 0.5dt << 1ssw + + # DE 6100 + track(:first :double:station :cat:ac15 :pax, + ba[:buc - 1sw, :buc + 1.5sw] ); - marker(:de.bf :cat:ac15 :pax :left, ba[:buc] << 0.5dt); - slabel(:left :cat:ac15 :pax, ba[:buc - 0.3ssw] << 0.5dt << 2.2ssw, - span(:bold, "Büchen") + marker(:left :de.inbf :cat:ac15 :pax, ba[:buc - 0.1sw] << 0.5dt); + slabel(:right :cat:ac15 :pax :bold, ba[:buc - 0.5sw] >> 1.5dt, + "Büchen" ); } + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:buc + 1.5sw, :bcb - 1sw]); + } + with link = "point.de.Büchen-Bbf" { - track(:first:station :double :cat:ac15 :pax, ba[:buc.r, :bcb + 1ssw]); - with layer = -1 marker(:de.bft :cat:ac15 :left, ba[:bcb] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ba[:bcb - 1sw, :bcb + 1sw] + ); + marker(:left :de.bft :cat:ac15, ba[:bcb] << 0.5dt); + slabel(:left :cat:ac15 :light, ba[:bcb + 1sw] << 0.5dt << 1.2sh, + hbox(:right:top, "Büchen Bbf") + ); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, - ba[:bcb + 0.5ssw, :stt - 0.5ssw] - ); + track(:first :double :cat:ac15 :pax, ba[:bcb + 1sw, :stt - 0.5sw]); } with link = "point.de.Büchen-Steinautal" { - track(:first:station :double :cat:ac15 :pax, - ba[:stt - 0.5ssw, :stt + 0.5ssw] + track(:first :double:station :cat:ac15 :pax, + ba[:stt - 0.5sw, :stt + .5sw] + ); + marker(:right :de.uest :cat:ac15, ba[:stt] >> 0.5dt); + slabel(:left :cat:ac15 :light, ba[:stt - 0.5sw] << 1dt, + hbox(:right:top, "Steinautal") ); - with layer = -1 marker(:de.uest :cat:ac15 :right, ba[:stt] >> 0.5dt); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:stt + 0.5ssw, :mus - 1ssw]); + track(:first :double :cat:ac15 :pax, ba[:stt + 0.5sw, :mus - 1sw]); } with link = "point.de.Müssen" { - track(:first:station :double :cat:ac15 :pax, - ba[:mus - 1ssw, :mus + 1ssw] + track(:first :double:station :cat:ac15 :pax, + ba[:mus - 1sw, :mus + 1sw] ); - marker(:de.hp :cat:ac15 :pax :left, ba[:mus] << 0.5dt); - with layer = -1 marker(:de.bf :gone :left, ba[:mus] << 0.5dt); - slabel(:left :cat:ac15 :pax, ba[:mus - 1ssw] << 0.5dt << 2.4ssw, - "Müssen" + marker(:left :de.hp :cat:ac15 :pax, ba[:mus] << 0.5dt); + marker(:left :de.exbf :cat:ac15 :pax, ba[:mus] << 0.5dt); + slabel(:left :cat:ac15 :pax, ba[:mus] << 0.5dt << 1.6sh + (0.5sw, 0dt), + hbox(:right:top, "Müssen") ); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:mus + 1ssw, :swa - 1ssw]); + track(:first :double :cat:ac15 :pax, ba[:mus + 1sw, :swa - 1sw]); + line_label(:right:s :cat:ac15 :pax, ba[:mus + 1.6km] >> 0.5dt, "6100"); } with link = "point.de.Schwarzenbek" { - track(:first:station :double :cat:ac15 :pax, - ba[:swa - 1ssw, :swa + 1ssw] + # DE 1141 + track(:second :station :removed, + ba[:swa - 0.5sw - 1.1dl, :swa - 0.5sw - 1dl] >> 0.5dt + -- ba[:swa - 0.5sw, :swa + 1sw] >> 1.5dt ); - marker(:de.bf :cat:ac15 :pax :left, ba[:swa] << 0.5dt); - slabel(:left :cat:ac15 :pax, ba[:swa - 1ssw] << 0.5dt << 2.4ssw, - span(:bold, "Schwarzenbek") + + # DE 6100 + track(:first :double:station :cat:ac15 :pax, + ba[:swa - 1sw, :swa + 1sw] + ); + + marker(:left :de.bf :cat:ac15 :pax, ba[:swa] << 0.5dt); + slabel(:left :cat:ac15 :pax :bold, + ba[:swa] << 0.5dt << 1.2sh + (1.5sw, 0dt), + hbox(:right:top, "Schwarzenbek") ); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:swa + 1ssw, :frr - 1ssw]); + track(:first :double :cat:ac15 :pax, ba[:swa + 1sw, :rap - 0.5sw]); } with link = "point.de.Radekamp" { - with layer = -1 marker(:de.bk :removed :right, ba[:rap] >> 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ba[:rap - 0.5sw, :rap + 0.5sw] + ); + marker(:right :de.bk :removed, ba[:rap] >> 0.5dt); + slabel(:left :removed :light, ba[:rap + 0.2sw] << 0.5dt, + hbox(:right:top, "Radekamp") + ); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:rap + 0.5sw, :sad - 0.5sw]); } with link = "point.de.Sachsenwald" { - with layer = -1 marker(:de.bk :removed :right, ba[:sad] >> 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ba[:sad - 0.5sw, :sad + 0.5sw] + ); + marker(:right :de.bk :removed, ba[:sad] >> 0.5dt); + slabel(:top :removed :light, ba[:sad] >> 0.5dt >> 1.2sh, + "Sachsenwald" + ); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:sad + 0.5sw, :frr - 1sw]); } with link = "point.de.Friedrichsruh" { - track(:first:station :double :cat:ac15 :pax, - ba[:frr - 1ssw, :frr + 1ssw] + track(:first :double:station :cat:ac15 :pax, + ba[:frr - 1sw, :frr + 1sw] ); - marker(:de.hp :cat:ac15 :pax :right, ba[:frr] >> 0.5dt); - with layer = -1 marker(:de.bf :gone :right, ba[:frr] >> 0.5dt); - slabel(:right :cat:ac15 :pax, ba[:frr + 1ssw] >> 0.5dt >> 1.4ssw, + marker(:right :de.hp :cat:ac15 :pax, ba[:frr] >> 0.5dt); + marker(:right :de.exbf :cat:ac15 :pax, ba[:frr] >> 0.5dt); + slabel(:top :cat:ac15 :pax, ba[:frr] >> 0.5dt >> 1.6sh + (2sw, 0dt), "Friedrichsruh" ); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:frr + 1ssw, :aua - 1ssw]); + track(:first :double :cat:ac15 :pax, ba[:frr + 1sw, :aua - 1sw]); } with link = "point.de.Aumühle-Abzw" { - track(:first:station :double :cat:ac15 :pax, - ba[:aua - 1ssw, :aua + 1ssw] + # DE 1285 + track(:first :station :cat:ac15, + ba[:aua - 1.1dl, :aua - 1dl] >> 0.5dt + -- ba[:aua, :aua + 0.5sw] >> 1.5dt + ); + + # DE 6100 + track(:first :double:station :cat:ac15 :pax, + ba[:aua - 1sw, :aua + 0.5sw] + ); + + marker(:left :de.abzw :cat:ac15, ba[:aua] << 0.5dt); + slabel(:bottom :cat:ac15 :pax :light, ba[:aua] << 0.5dt << 1.2sh, + "A. Abzw" ); - marker(:de.bft.first :cat:ac15 :left, ba[:aua] << 0.5dt); - marker(:de.abzw.second :cat:ac15 :left, ba[:aua] << 0.5dt); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:ber.a, :aua + 1ssw]); + track(:first :double:rightother :cat:ac15 :pax, + ba[:aua + 0.5sw, :aum + 1sw] + ); + track(:first :double:rightother :cat:ac15 :pax, + ba[:aum + 1sw, :sil - 0.5sw] + ); + track(:first :double:station :cat:ac15 :pax, + ba[:sil - 0.5sw, :sil + 0.5sw] + ); + track(:first :double:rightother :cat:ac15 :pax, + ba[:sil + 0.5sw, :woh - 1sw] + ); + track(:first :double:station :cat:ac15 :pax, + ba[:woh - 1sw, :woh + 1sw] + ); + track(:first :double:rightother :cat:ac15 :pax, + ba[:woh + 1sw, :rei - 0.5sw] + ); + track(:first :double:station :cat:ac15 :pax, + ba[:rei - 0.5sw, :rei + 0.5sw] + ); + track(:first :double:rightother :cat:ac15 :pax, + ba[:rei + 0.5sw, :reg - 0.5sw] + ); } -} + with link = "point.de.Reinbek-LGr" { + track(:first :double:station :cat:ac15 :pax, + ba[:reg - 0.5sw, :reg + 0.5sw] + ); + marker(:left :de.lgr :cat:ac15, ba[:reg] << 0.5dt); + } -let ba = path("d3.de.6100.hmb"); + with link = "point.de.Hamburg-Mörkenweg" { + track(:first :double:station :cat:ac15 :pax, + ba[:reg - 0.5sw, :mow + 0.5sw] + ); + marker(:left :de.bk :removed, ba[:mow] << 0.5dt); + slabel(:right :removed :light, + ba[:reg] << 0.5dt << 0.5sh + (0.5sw, 0dt), + hbox(:left:top, "Mörkenweg") + ); + } -with detail = 3 { with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:ber.a, :ber - 1ssw]); + track(:first :double:rightother :cat:ac15 :pax, + ba[:mow + 0.5sw, :ber - 1sw] + ); } with link = "point.de.Hamburg-Bergedorf" { - track(:first:station :double :cat:ac15 :pax, - ba[:ber - 1ssw, :ber.f] + track(:first :double:station :cat:ac15 :pax, + ba[:ber - 1sw, :ber + 1sw] ); - marker(:de.bf :cat:ac15 :pax :left, ba[:ber] << 0.5dt); - slabel(:right :cat:ac15 :pax, - ba[:ber] << 0.5dt + (2ssw, 0.7ssw), - span(:bold, "H.-Bergedorf") + marker(:left :de.bf :cat:ac15 :pax, ba[:ber] << 0.5dt); + slabel(:right :cat:ac15 :pax :bold, ba[:ber - 0.7sw] << 0.5dt << 1.0sh, + hbox(:left:top, "H.-Bergedorf") ); } - with link = "point.de.Hamburg-Bergedorf-Gbf" { - track(:first:station :double :cat:ac15 :pax, ba[:ber.f, :net + 1ssw]); - with layer = -1 marker(:de.bft :cat:ac15 :left, ba[:net] << 0.5dt); - } - with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:net + 1ssw, :all - 1ssw]); + track(:first :double:rightother :cat:ac15 :pax, + ba[:ber + 1sw, :beg - 1sw] + ); } - with link = "point.de.Hamburg-Allermöhe" { - track(:first:station :double :cat:ac15 :pax, - ba[:all - 1ssw, :all + 1ssw] + with link = "point.de.Hamburg-Bergedorf-Gbf" { + track(:first :double:station :cat:ac15 :pax, + ba[:beg - 1sw, :net + 1sw] + ); + track(:second :station, + ba[:beg - 1sw, :beg + 0.5sw] << 1.5dt + -- ba[:beg + 0.5sw + 1dl, :beg + 0.5sw + 1.1dl] << 0.5dt ); - track(:first:station :cat:ac15 :pax, - ba[:all - 1.1dl, :all - 1dl] << 0.5dt - -- ba[:all, :all + 1ssw] << 1.5dt + marker(:left :de.bft :cat:ac15, ba[:beg] << 1.5dt); + slabel(:bottom :cat:ac15 :light, ba[:beg] << 1.5dt << 1.2sh, + "H.-B. Gbf" ); - with layer = -1 marker(:de.abzw :cat:ac15 :left, ba[:all] << 1.5dt); } with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:all + 1ssw, :rtk - 1ssw]); + track(:first :double:rightother :cat:ac15 :pax, + ba[:beg + 1sw, :als - 0.5sw] + ); } - # point.de.Hamburg-Rothenburgsort-Tk: de.1280 + with link = "point.de.Hamburg-Allermöhe" { + track(:first :double:station :cat:ac15 :pax, + ba[:als - 0.5sw, :all + 1sw] + ); + track(:first :station :cat:ac15, + ba[:all - 0.5sw - 1.1dl, :all - 0.5sw - 1dl] << 0.5dt + -- ba[:all - 0.5sw, :all + 0.5sw] << 1.5dt + ); + marker(:left :de.abzw :cat:ac15, ba[:all] << 1.5dt); + slabel(:left :cat:ac15 :light, ba[:all] << 1.5dt << 1.1sh + (1sw, 0dt), + hbox(:right:top, "H.-Allermöhe") + ); + } with link = "line.de.6100" { - with layer = 2 track(:first :double :cat:ac15 :pax, - ba[:rtk + 1ssw, :ahar - 1ssw] + track(:first :double:rightother :cat:ac15 :pax, + ba[:all + 1sw, :mit - 0.5sw] + ); + track(:first :double:station :cat:ac15 :pax, + ba[:mit - 0.5sw, :mit + 0.5sw] + ); + track(:first :double:rightother :cat:ac15 :pax, + ba[:mit + 0.5sw, :biu - 0.5sw] ); - with layer = 1 casing(:first :double :cat:ac15 :pax, - ba[:rtk + 1ssw, :ahar - 1ssw] + track(:first :double:station :cat:ac15 :pax, + ba[:biu - 0.5sw, :biu + 0.5sw] + ); + track(:first :double:rightother :cat:ac15 :pax, + ba[:biu + 0.5sw, :bia - 0.5sw] ); } - with link = "point.de.Hamburg-Rothenburgsort-Rop" { - track(:first:station :double :cat:ac15 :pax, ba[:ahar - 1ssw, :ahar]); + with link = "point.de.Hamburg-Billwerder-Moorfleet-Abzw" { + track(:first :double:station :cat:ac15 :pax, + ba[:bia - 0.5sw, :bil + 0.5sw] + ); + track(:first :station :cat:ac15, + ba[:bia - 0.5sw, :bil + 0.5sw] << 1.5dt + ); + marker(:left :de.abzw :cat:ac15, ba[:bia] << 1.5dt); + with zoom = :high slabel(:left :cat:ac15 :light, + ba[:bia + 0.7sw] << 1.5dt << 1.2sh, + hbox(:right:top, "B.-M. (Abzw)") + ); } with link = "line.de.6100" { - track(:first :cat:ac15 :pax, ba[:ahar, :anc - 1ssw] >> 0.5dt); + track(:first :double:rightother:leftother :cat:ac15 :pax, + ba[:bil + 0.5sw, :rtk - 0.5sw] + ); } - with link = "point.de.Hamburg-Anckelmannsplatz" { - track(:first:station :cat:ac15 :pax, - ba[:anc - 1ssw, :anc + 1ssw] >> 0.5dt + with link = "point.de.Hamburg-Rothenburgsort-Tk" { + track(:first :double:station :cat:ac15 :pax, + ba[:rtk - 0.5sw, :rtk + 0.5sw] ); - track(:first:station :cat:ac15 :pax, - ba[:anc - 1.1dl, :anc - 1dl] >> 0.5dt - -- ba[:anc, :anc + 1ssw] << 0.5dt + track(:first :station :cat:ac15, + ba[:rtk - 0.5sw, :rtk + 0.5sw] << 1.5dt + ); + marker(:left :de.bft :cat:ac15, ba[:rtk] << 1.5dt); + with zoom = :high slabel(:left :cat:ac15 :light, + ba[:rtk + 0.7sw] << 1.5dt << 1.2sh, + hbox(:right:top, "H.-R. Tk") ); } with link = "line.de.6100" { - track(:first:station :double :cat:ac15 :pax, - ba[:anc + 1ssw, :ham - 1ssw] + track(:first :double:rightother:leftother :cat:ac15 :pax, + ba[:rtk + 0.5sw, :tie - 0.5sw] + ); + track(:first :double:station :cat:ac15 :pax, + ba[:tie - 0.5sw, :tie + 0.5sw] + ); + track(:first :double:rightother:leftother :cat:ac15 :pax, + ba[:tie + 0.5sw, :rop - 0.5sw] ); } - with link = "point.de.Hamburg-Hbf" { - let wanham = path("d3.de.2200.hmb"); - - track(:first:station :double :cat:ac15 :pax, - ba[:ham - 1ssw, :ham + 0.5ssw + 3dl] + with link = "point.de.Hamburg-Rothenburgsort-Tk" { + track(:first :double:station :cat:ac15 :pax, + ba[:rop - 0.5sw, :rop + 0.5sw] ); - with layer = -1 casing(:first:station :double :cat:ac15 :pax, - ba[:ham, :ham + 0.5ssw + 3dl] + marker(:left :de.bft :cat:ac15, ba[:rop] << 0.5dt); + with zoom = :high slabel(:left :cat:ac15 :light, + ba[:rop - 0.5sw] << 0.5dt << 1.2sh, + hbox(:right:top, "H.-R. Rop") ); + } - track(:first:station :cat:ac15 :pax, - wanham[:ham - 1ssw, :ham + 0.5ssw + 1dl] << 1.5dt + with link = "line.de.6100" { + track(:first :rightother:leftsame :cat:ac15 :pax, + ba[:rop + 0.5sw, :ros - 0.5sw] >> 0.5dt ); - with layer = -1 casing(:first:station :cat:ac15 :pax, - ba[:ham, :ham + 0.5ssw + 1dl] << 1.5dt + track(:first :leftother:rightsame :removed, + ba[:rop + 0.5sw, :ros - 0.5sw] << 0.5dt ); - track(:first:station :cat:ac15 :pax, - wanham[:ham - 1ssw, :ham + 0.5ssw] << 2.5dt - -- ba[:ham + 0.5ssw + 2dl, :ham + 0.5ssw + 2.1dl] << 0.5dt + track(:first :station :cat:ac15 :pax, + ba[:ros - 0.5sw, :ros + 0.5sw] >> 0.5dt ); - with layer = -1 casing(:first:station :cat:ac15 :pax, - ba[:ham, :ham + 0.5ssw] << 2.5dt - -- ba[:ham + 0.5ssw + 2dl, :ham + 0.5ssw + 2.1dl] << 0.5dt + track(:first :station :removed, + ba[:ros - 0.5sw, :ros + 0.5sw] << 0.5dt ); - marker(:de.bf :cat:ac15 :pax :left, ba[:ham] << 2.5dt); - } - - with link = "line.de.6100" { - track(:first :double :cat:ac15 :pax, ba[:ham + 0.5ssw + 3dl, :rai]); + track(:first :rightother:leftsame :cat:ac15 :pax, + ba[:ros + 0.5sw, :anc - 0.5sw] >> 0.5dt + ); + track(:first :leftother:rightsame :removed, + ba[:ros + 0.5sw, :anc - 0.5sw] << 0.5dt + ); } - with link = "point.de.Hamburg-Dammtor" { - marker(:de.hp :cat:ac15 :pax :left, ba[:dam] << 0.5dt); + with link = "point.de.Hamburg-Anckelmannsplatz" { + track(:first :station :cat:ac15 :pax, + ba[:anc - 0.5sw, :anc + 0.5sw] >> 0.5dt + ); + track(:first :station :removed, + ba[:anc - 0.5sw, :anc] << 0.5dt + ); + track(:first :station :cat:ac15 :pax, + ba[:anc - 1.1dl, :anc - 1dl] >> 0.5dt + -- ba[:anc, :anc + 0.5sw] << 0.5dt + ); + marker(:left :de.uest :cat:ac15, ba[:anc] << 0.5dt); + with zoom = :high slabel(:right :cat:ac15 :light, + ba[:anc - 0.5sw] >> 3.5dt, + "Anckelmannsplatz" + ); } with link = "line.de.6100" { - let ak = path("d3.de.1220.hmb"); - - track(:first:station :double :cat:ac15 :pax, - ba[:rai - 0.1dl, :rai] - .. ak[:aham, :aham - 0.1dl] >> 1dt + track(:first :double:rightother :cat:ac15 :pax, + ba[:anc + 0.5sw, :ham.yo] ); - with layer = -1 casing(:first:station :double :cat:ac15 :pax, - ba[:rai - 0.1dl, :rai] - .. ak[:aham, :aham - 0.1dl] >> 1dt + track(:first :rightother :cat:ac15 :pax, + ba[:ham.yo, :ham - 1sw] << 0.5dt ); } } diff --git a/rules/de/a/d3/69/6928.map b/rules/de/a/d3/69/6928.map index 93e292bc..d4ea64cf 100644 --- a/rules/de/a/d3/69/6928.map +++ b/rules/de/a/d3/69/6928.map @@ -1,222 +1,223 @@ # DE 6928. Hagenow Land - Bad Oldesloe # -let ho = path("d4.de.a.6928"); +let ho = path("d3.de.a.6928"); with detail = 3 { + # DE-W + with link = "line.de.6928" { - track(:second :removed, ho[:gzar + 0.5ssw, :kze - 1ssw]); + track(:second :removed, ho[:gzar + 0.5sw, :kze - 1sw]); } with link = "point.de.Klein-Zecher" { - track(:second:station :removed, ho[:kze - 1ssw, :kze + 1ssw]); - marker(:de.hp :removed :right, ho[:kze]); - slabel(:left :removed, ho[:kze - 0.2ssw] << 2dt, - "Klein Zecher" - ); + track(:second :station :removed, ho[:kze - 1sw, :kze + 1sw]); + marker(:right :de.hp :removed, ho[:kze]); + slabel(:right :removed, ho[:kze - 0.5sw] >> 1.4sh, "Klein Zecher"); } with link = "line.de.6928" { - track(:second :removed, ho[:kze + 1ssw, :hak - 1ssw]); + track(:second :removed, ho[:kze + 1sw, :hak - 1sw]); } with link = "point.de.Hakendorf" { - track(:second:station :removed, ho[:hak - 1ssw, :hak + 1ssw]); - marker(:de.hp :removed :left, ho[:hak]); - slabel(:right :removed, ho[:hak - 0.4ssw] >> 0.5dt, - "Hakendorf" - ); + track(:second :station :removed, ho[:hak - 1sw, :hak + 1sw]); + marker(:left :de.hp :removed, ho[:hak]); + slabel(:right :removed, ho[:hak - 0.6sw] >> 1dt, "Hakendorf"); } with link = "line.de.6928" { - track(:second :removed, ho[:hak + 1ssw, :hol - 1ssw]); + track(:second :removed, ho[:hak + 1sw, :hol - 1sw]); } - with link = "point.de.Hollenbek" { - track(:second:station :closed, ho[:hol - 1ssw, :hol + 1ssw]); - marker(:de.bf :removed :left, ho[:hol]); - slabel(:right :removed, ho[:hol - 0.4sw] >> 1.0dt, - span(:bold, "Hollenbek") + # DE A50 + track(:second :station :removed, + ho[:hol - 0.5sw - 2.1dl, :hol - 0.5sw - 2dl] + -- ho[:hol - 0.5sw - 1dl, :hol + 1sw] << 1dt ); + + # DE 6928 + track(:second :station :removed, ho[:hol - 1sw, :hol + 1sw]); + + marker(:left :de.bf :removed, ho[:hol] << 1dt); + slabel(:right :removed :bold, ho[:hol - 0.6sw] >> 1dt, "Hollenbek"); } with link = "line.de.6928" { - track(:second :closed, ho[:hol + 1ssw, :ste - 1ssw]); + track(:second :removed, ho[:hol + 1sw, :ste - 1sw]); } with link = "point.de.Sterley" { - track(:second:station :closed, ho[:ste - 1ssw, :ste + 1ssw]); - with layer = -1 marker(:de.hp :removed :right, ho[:ste]); - slabel(:right :removed, ho[:ste - 0.5ssw] >> 1.4ssw, - "Sterley" + track(:second :station :removed, ho[:ste - 1sw, :ste + 1sw]); + marker(:right :de.hp :removed, ho[:ste]); + slabel(:right :removed, ho[:ste - 0.6sw] >> 1.2sh, "Sterley"); + } + + with link = "point.de.Ratzeburg-Kogel" { + track(:second :station :removed, ho[:ste - 1sw, :kog + 0.7sw]); + marker(:right :de.anst :removed, ho[:kog + 0.2sw]); + slabel(:left :removed :light, ho[:kog + 1.2sw] << 0.5dt, + hbox(:right:top, "Ratzeburg Kogel") ); } with link = "line.de.6928" { - track(:second :closed, ho[:ste + 1ssw, :aho - 1ssw]); + track(:second :removed, ho[:kog + 0.7sw, :aho - 1sw]); } with link = "point.de.Alt-Horst" { - track(:second:station :closed, ho[:aho - 1ssw, :aho + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, ho[:aho]); - slabel(:right :removed, ho[:aho - 0.4ssw] >> 1.0dt, - "Alt Horst" - ); + track(:second :station :removed, ho[:aho - 1sw, :aho + 1sw]); + marker(:left :de.hp :removed, ho[:aho]); + slabel(:right :removed, ho[:aho - 0.6sw] >> 1dt, "Alt Horst"); } with link = "line.de.6928" { - track(:second :closed, ho[:aho + 1ssw, :smi - 1ssw]); + track(:second :removed, ho[:aho + 1sw, :smi - 1sw]); + line_label(:right:w :removed, ho[:aho + 1.5km], "6928"); } with link = "point.de.Schmilau" { - track(:second:station :closed, ho[:smi - 1ssw, :smi + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, ho[:smi]); - slabel(:right :removed, ho[:smi - 1.0ssw] >> 1.0ssw, "Schmilau"); + track(:second :station :removed, ho[:smi - 1sw, :smi + 1sw]); + marker(:right :de.bf :removed, ho[:smi]); + slabel(:right :removed, ho[:smi - 0.6sw] >> 1.2sh, "Schmilau"); } with link = "line.de.6928" { - with layer = -1 track(:second :closed, ho[:smi + 1ssw, :rat.yh]); + track(:second :removed, + ho[:smi + 1sw, :rat.yyh] + .. ho[:rat.yh, :rat.yh + 500m] >> 1dt + .. ho[:rat - 1.1sw, :rat - 1sw] >> 0.5sh + ); } - - # point.de.Ratzeburg de.1121 + + # point.de.Ratzeburg de.1121 with link = "line.de.6928" { - with layer = -1 track(:second :removed, - path("d4.de.1121")[:rat - 1ssw, :rat - 1.1ssw] - .. ho[:rat.x + 300m, :kul - 1ssw] + track(:second :removed, + path("d3.de.1121")[:rat - 1sw, :rat - 1.1sw] >> 0.5sh + .. ho[:rat.x, :kul - 1sw] ); + line_label(:left:ne :removed, ho[:kul - 1km], "6928"); } with link = "point.de.Kulpin" { - track(:second:station :removed, ho[:kul - 1ssw, :kul + 1ssw]); - marker(:de.hp :removed :right, ho[:kul]); - slabel(:left :removed, ho[:kul - 0.4ssw] << 5pt, "Kulpin"); + track(:second :station :removed, ho[:kul - 1sw, :kul + 1sw]); + marker(:right :de.hp :removed, ho[:kul]); + slabel(:top :removed, ho[:kul] >> 1.4sh + (0.5sw, 0dt), "Kulpin"); } with link = "line.de.6928" { - track(:second :removed, ho[:kul + 1ssw, :ber - 1ssw]); - with layer = 1 line_badge(:closed, ho[:kul + 2.5km], "6928"); + track(:second :removed, ho[:kul + 1sw, :ber - 1sw]); } with link = "point.de.Berkenthin" { - track(:second:station :removed, ho[:ber - 1ssw, :ber + 1ssw]); - marker(:de.hst :removed :left, ho[:ber]); - with layer = -1 marker(:de.bf :gone :left, ho[:ber]); - slabel(:bottom :removed, ho[:ber] << 1.2ssw, "Berkenthin"); + track(:second :station :removed, ho[:ber - 1sw, :ber + 1sw]); + marker(:left :de.bf :removed, ho[:ber]); + slabel(:bottom :removed, ho[:ber] << 1.1sh + (1sw, 0dt), "Berkenthin*"); } with link = "line.de.6928" { - track(:second :removed, ho[:ber + 1ssw, :sie - 1ssw]); + track(:second :removed, ho[:ber + 1sw, :sie - 1sw]); } with link = "point.de.Sierksrade" { - track(:second:station :removed, ho[:sie - 1ssw, :sie + 1ssw]); - marker(:de.bf :removed :left, ho[:sie]); - slabel(:left :removed, ho[:sie - 0.5ssw] << 2.4ssw, + track(:second :station :removed, ho[:sie - 1sw, :sie + 1sw]); + marker(:left :de.bf :removed, ho[:sie]); + slabel(:bottom :removed, ho[:sie] << 1.1sh + (-2.5sw, 0dt), "Sierksrade" ); } with link = "line.de.6928" { - track(:second :removed, ho[:sie + 1ssw, :kao - 1ssw]); + track(:second :removed, ho[:sie + 1sw, :kao - 1sw]); } with link = "point.de.Kastorf-Ost" { - track(:second:station :removed, ho[:kao - 1ssw, :kao + 1ssw]); - marker(:de.hp :removed :right, ho[:kao]); - slabel(:right :removed, ho[:kao + 1ssw] >> 1.4ssw, - "Kastorf Ost" - ); + track(:second :station :removed, ho[:kao - 1sw, :kao + 1sw]); + marker(:right :de.hp :removed, ho[:kao]); + slabel(:right :removed, ho[:kao + 1sw] >> 1.2sh, "Kastorf Ost"); } with link = "line.de.6928" { - track(:second :removed, ho[:kao + 1ssw, :kas - 1ssw]); + track(:second :removed, ho[:kao + 1sw, :kas - 1sw]); } with link = "point.de.Kastorf" { - track(:second:station :removed, ho[:kas - 1ssw, :kas + 1ssw]); - marker(:de.bf :removed :right, ho[:kas]); - slabel(:left :removed, ho[:kas] << 6pt, "Kastorf"); + track(:second :station :removed, ho[:kas - 1sw, :kas + 1sw]); + marker(:right :de.bf :removed, ho[:kas]); + slabel(:left :removed, ho[:kas - 0.5sw] << 0.5dt, + hbox(:right:top, "Kastorf") + ); } with link = "line.de.6928" { - track(:second :removed, ho[:kas + 1ssw, :sib - 1ssw]); + track(:second :removed, ho[:kas + 1sw, :sib - 1sw]); } with link = "point.de.Siebenbäumen" { - track(:second:station :removed, ho[:sib - 1ssw, :sib + 1ssw]); - marker(:de.hp :removed :right, ho[:sib]); - slabel(:right :removed, ho[:sib + 1ssw] >> 1.4ssw, - "Siebenbäumen" - ); + track(:second :station :removed, ho[:sib - 1sw, :sib + 1sw]); + marker(:right :de.hp :removed, ho[:sib]); + slabel(:right :removed, ho[:sib + 1sw] >> 1.1sh, "Siebenbäumen"); } with link = "line.de.6928" { - track(:second :removed, ho[:sib + 1ssw, :ahr - 1ssw]); + track(:second :removed, ho[:sib + 1sw, :ahr - 1sw]); } with link = "point.de.Ahrensfelde-Stormarn" { - track(:second:station :removed, ho[:ahr - 1ssw, :ahr + 1ssw]); - marker(:de.hp :removed :right, ho[:ahr]); - slabel(:left :removed, ho[:ahr - 2ssw] << 6pt, - "Ahrensfelde" - ); + track(:second :station :removed, ho[:ahr - 1sw, :ahr + 1sw]); + marker(:right :de.hp :removed, ho[:ahr]); + slabel(:bottom :removed, ho[:ahr] << 1.0dt, "Ahrensfelde"); } with link = "line.de.6928" { - track(:second :removed, ho[:ahr + 1ssw, :sur - 1ssw]); + track(:second :removed, ho[:ahr + 1sw, :sur - 1sw]); } - with link = "point.de.Schürensölen" { - track(:second:station :removed, ho[:sur - 1ssw, :sur + 1ssw]); - marker(:de.hp :removed :right, ho[:sur]); - slabel(:right :removed, ho[:sur + 1ssw] >> 1.4ssw, - "Schürensölen" - ); + track(:second :station :removed, ho[:sur - 1sw, :sur + 1sw]); + marker(:right :de.hp :removed, ho[:sur]); + slabel(:right :removed, ho[:sur + 1sw] >> 1.1sh, "Schürensölen"); } with link = "line.de.6928" { - track(:second :removed, ho[:sur + 1ssw, :kbo - 1ssw]); + track(:second :removed, ho[:sur + 1sw, :kbo - 1sw]); } with link = "point.de.Klein-Boden" { - track(:second:station :removed, ho[:kbo - 1ssw, :kbo + 1ssw]); - marker(:de.hp :removed :right, ho[:kbo]); - slabel(:left :removed, ho[:kbo - 1ssw] << 6pt, - "Klein Boden" + track(:second :station :removed, ho[:kbo - 1sw, :kbo + 1sw]); + marker(:right :de.hp :removed, ho[:kbo]); + slabel(:left :removed, ho[:kbo - 0.2sw], + hbox(:right:top, "Klein Boden") ); } with link = "line.de.6928" { - track(:second :removed, ho[:kbo + 1ssw, :tre - 1ssw]); + track(:second :removed, ho[:kbo + 1sw, :tre - 1sw]); } with link = "point.de.Treuholz" { - track(:second:station :removed, ho[:tre - 1ssw, :tre + 1ssw]); - marker(:de.bf :removed :right, ho[:tre]); - slabel(:right :removed, ho[:tre + 1ssw] >> 1.4ssw, - "Treuholz" - ); + track(:second :station :removed, ho[:tre - 1sw, :tre + 1sw]); + marker(:right :de.bf :removed, ho[:tre]); + slabel(:right :removed, ho[:tre + 1sw] >> 1.1sh, "Treuholz"); } with link = "line.de.6928" { - track(:second :removed, ho[:tre + 1ssw, :ret - 1ssw]); + track(:second :removed, ho[:tre + 1sw, :ret - 1sw]); + line_label(:right:sw :removed, ho[:tre + 1.8km], "6928"); } with link = "point.de.Retwisch" { - track(:second:station :removed, ho[:ret - 1ssw, :ret + 1ssw]); - marker(:de.hp :removed :right, ho[:ret]); - slabel(:right :removed, ho[:ret + 1ssw] >> 1.4ssw, - "Retwisch" - ); + track(:second :station :removed, ho[:ret - 1sw, :ret + 1sw]); + marker(:right :de.hp :removed, ho[:ret]); + slabel(:right :removed, ho[:ret + 1sw] >> 1.1sh, "Retwisch"); } with link = "line.de.6928" { - track(:second :removed, ho[:ret + 1ssw, :old.gg]); - with layer = -6 track(:second:station :removed, - ho[:old.gg, :old.gg + 0.1dl] - .. path("d4.de.1120")[:old.yr + 500m, :old.yr + 499m] << 1.5dt + with layer = -1 track(:second :removed, + ho[:ret + 1sw, :old.yyh] + .. ho[:old.yh, :old.yh + 100m] << 1sh << 2dt + .. ho[:old - 1.1sw, :old - 1sw] << 1sh << 1.5dt ); } } diff --git a/rules/de/a/d3/a/af1.map b/rules/de/a/d3/a/af1.map deleted file mode 100644 index 30b5e5ad..00000000 --- a/rules/de/a/d3/a/af1.map +++ /dev/null @@ -1,20 +0,0 @@ -# DE AF1. Flensburg Kreisb - Kappeln (Schlei) -# -let fk = path("d4.de.af1"); - -with detail = 3 { - with link = "point.de.Flensburg-Kreisb" { - track(:third:station :narrow:g1000 :removed, - fk[:fkr - 0.5sw, :fkr.f] >> 1dt - ); - marker(:right :de.bf :removed, fk[:fkr + 0.2sw] >> 0.8dt); - } - - with link = "line.de.AF1" { - track(:third :narrow:g1000 :removed, - fk[:fkr.f, :xgl - 1dt] >> 1dt - .. fk[:eng - 1.1sw, :eng - 1sw] - ); - } -} - diff --git a/rules/de/a/d4/10/1000.map b/rules/de/a/d4/10/1000.map index e37359b7..b1c79ad1 100644 --- a/rules/de/a/d4/10/1000.map +++ b/rules/de/a/d4/10/1000.map @@ -1,42 +1,42 @@ # DE 1000. Flensburg Weiche - Harrislee Grenze # -let flwhag = path("d4.de.1000"); +let fp = path("d4.de.1000"); with detail = 4 { # point.de.Flensburg-Weiche de.1040 with link = "line.de.1000" { - with layer = 1 track(:first :double :cat:ac15, flwhag[:ffle, :fri.a]); + with layer = 1 track(:first :double :cat:ac15, fp[:ffle, :fri.a]); } with link = "point.de.Flensburg-Friedensweg" { # Gl. 94 with layer = -1 track(:first:station :cat:ac15, - flwhag[:fri.a, :fri] << 0.5dt + fp[:fri.a, :fri] << 0.5dt ); track(:first:station :cat:ac15 :pax, - flwhag[:fri - 171m, :fri - 170m] >> 1.5dt - -- flwhag[:fri - 30m, :fri + 100m] << 0.5dt + fp[:fri - 171m, :fri - 170m] >> 1.5dt + -- fp[:fri - 30m, :fri + 100m] << 0.5dt ); # Gl. 97 - 93 track(:first:station :cat:ac15 :pax, - flwhag[:fri.a, :fri - 70m] >> 1.5dt - -- flwhag[:fri, :fri + 100m] >> 0.5dt + fp[:fri.a, :fri - 70m] >> 1.5dt + -- fp[:fri, :fri + 100m] >> 0.5dt ); # Gl. 95 with layer = -1 track(:first:station :cat:ac15, - flwhag[:fri.a, :fri - 260m] >> 0.5dt - -- flwhag[:fri - 180m, :fri - 179m] >> 1.5dt + fp[:fri.a, :fri - 260m] >> 0.5dt + -- fp[:fri - 180m, :fri - 179m] >> 1.5dt ); - marker(:statdt :cat:ac15 :right, flwhag[:fri] >> 0.5dt); - marker(:de.abzw :cat:ac15 :right, flwhag[:fri] >> 1.0dt); + marker(:statdt :cat:ac15 :right, fp[:fri] >> 0.5dt); + marker(:de.abzw :cat:ac15 :right, fp[:fri] >> 1.0dt); station( - :left :cat:ac15, flwhag[:fri - .4sw] << .5dt << 6bp, + :left :cat:ac15, fp[:fri - .4sw] << .5dt << 6bp, hbox(:center :base, span(:medium, "F. "), span(:medium :bold, "Friedensweg") @@ -59,79 +59,93 @@ with detail = 4 { with link = "line.de.1000" { - track(:first :double :cat:ac15 :pax, - flwhag[:har - 1.5km, :fri + 100m] + track(:first :double :cat:ac15 :pax :flip, + fp[:har - 1.2km, :fri + 100m] ); - with layer = 1 line_badge(:pax :cat:ac15, flwhag[:har - 1.5km], "1000"); - track(:first :double :cat:ac15 :pax, - flwhag[:har - 1.5km, :har - 1sw] + track(:first :double :cat:ac15 :pax, fp[:har - 1.2km, :har - 1sw]); + + line_box(:left:e :double :cat:ac15 :pax, fp[:har - 1.2km], (0dt, 3dt), + vbox(:center:bottom, + span(:bold, "1000"), + hrule(), + span(:xsmall, " Fl.W.\u{202f}–\u{202f}Gr. (–\u{202f}Rødekro) "), + " ∗ 1864 N.sl E ", + " ‖ c1910", + hrule(), + span(:xsmall, " Fl.W.\u{202f}–\u{202f}Gr. (-\u{202f}Padborg) "), + " ≲ 1996 " + ) ); } with link = "point.de.Harrislee" { track(:first:station :double :cat:ac15 :pax, - flwhag[:har - 1sw, :har.f] + fp[:har - 1sw, :har.f] ); with layer = -4 track(:station :removed, - flwhag[:har - 0.51sw, :har - 0.5sw] << 0.5dt - -- flwhag[:har - 0.5sw + 1dl, :har.x - 1dl] << 1.5dt - -- flwhag[:har.x + 4dl, :har.f] >> 3.5dt + fp[:har - 0.51sw, :har - 0.5sw] << 0.5dt + -- fp[:har - 0.5sw + 1dl, :har.x - 1dl] << 1.5dt + -- fp[:har.x + 4dl, :har.f] >> 3.5dt ); with layer = -4 track(:station :removed, - flwhag[:har.x + 3dl, :har.f] >> 2.5dt + fp[:har.x + 3dl, :har.f] >> 2.5dt ); platform(:removed, - flwhag[:har - 40m, :har + 40m] >> 0.5dt - -- flwhag[:har + 40m, :har - 40m] << 1.2dt + fp[:har - 40m, :har + 40m] >> 0.5dt + -- fp[:har + 40m, :har - 40m] << 1.2dt ); platform(:removed, - flwhag[:har - 30m, :har + 50m] << 0.5dt - -- flwhag[:har + 50m, :har - 30m] << 0.1dt + fp[:har - 30m, :har + 50m] << 0.5dt + -- fp[:har + 50m, :har - 30m] << 0.1dt ); - marker(:de.bf :removed, flwhag[:har] >> 1.0dt); - station(:right :left_align :removed, flwhag[:har - .4sw] >> 1.6sw, + marker(:de.bf :removed, fp[:har] >> 1.0dt); + station(:right :left_align :removed, fp[:har - .4sw] >> 1.6sw, "Harrislee", " 177,44 (171,87)" ); } with link = "line.de.1000" { - track(:first :double :cat:ac15 :pax, flwhag[:har.f, :hag - 0.5sw]); + track(:first :double :cat:ac15 :pax, fp[:har.f, :hag - 0.5sw]); } with link = "point.int.Harrislee-Padborg" { track(:first:station :double :cat:ac15 :pax, - flwhag[:hag - 0.5sw, :hag + 0.5sw] + fp[:hag - 0.5sw, :hag + 0.5sw] ); - marker(:de.dirgr :cat:ac15, flwhag[:hag] >> 0.5dt); - marker(:statdt :cat:ac15, flwhag[:hag] << 0.5dt); - marker(:de.dirgr :cat:ac15 :left, flwhag[:hag] << 0.5dt); - label(:cat:ac15, - flwhag[:hag] << 5dt, + marker(:de.dirgr :cat:ac15, fp[:hag] >> 0.5dt); + marker(:statdt :cat:ac15, fp[:hag] << 0.5dt); + marker(:de.dirgr :cat:ac15 :left, fp[:hag] << 0.5dt); + label(:cat:ac15 :badgesize, + fp[:hag] << 5dt, hbox(:right :middle, vbox(:right :middle, - span(:xsmall, "DK 26: "), + span(:bold, "DK "), hbar(0.3), - span(:xsmall, "DE 1000: ") + span(:bold, "DE ") ), vbox(:right :middle, - span(:xsmall, "110,"), + span(:xsmall, "FP: "), hbar(0.3), - span(:xsmall, "179,") + span(:xsmall, "1000: ") ), - vbox(:left :middle, - span(:xsmall, "6"), + vbox(:right :middle, + span(:xsmall, ""), + span(:xsmall, "110,"), hbar(0.3), - span(:xsmall, "784") + span(:xsmall, "179,"), + span(:xsmall :removed, "(174") ), vbox(:left :middle, span(:xsmall, ""), + span(:xsmall, "638"), hbar(0.3), - span(:xsmall :removed, " (174,21)") + span(:xsmall, "784"), + span(:xsmall :removed, ",21)") ) ) ); diff --git a/rules/de/a/d4/10/1001.map b/rules/de/a/d4/10/1001.map index d83f8bde..4132e030 100644 --- a/rules/de/a/d4/10/1001.map +++ b/rules/de/a/d4/10/1001.map @@ -1,6 +1,16 @@ # DE 1001. Flensburg Weiche - Lindholm # -let flwlin = path("d4.de.1001"); +let fl = path("d4.de.1001"); + +let flwlin = vbox(:center:top, + span(:bold, "1001"), + hrule(), + hbox(:center:top, + vbox(:center:top, " ∗ ", " ‡ "), + vbox(:left:top, "1889 Pre ", "1981 † 1999 ") + ) +); + with detail = [4, 5] { # point.de.Flensburg-Weiche de.1000 @@ -8,115 +18,116 @@ with detail = [4, 5] { with link = "line.de.1001" { with layer = -4 track(:second :removed :flip, - flwlin[:flw.c + 2km, :flw.c + 6dt] + fl[:flw.c + 2km, :flw.c + 6dt] ); - line_badge(:removed, flwlin[:flw.c + 2km], "1001"); track(:second :removed, - flwlin[:flw.c + 2km, :han - 400m] + fl[:flw.c + 2km, :han - 400m] ); + + line_box(:left:ne :removed, fl[:flw.c + 2km], (3dt, 0dt), flwlin); } with link = "point.de.Handewitt" { # Gl. 1 track(:second:station :removed, - flwlin[:han - 400m, :han + 300m] + fl[:han - 400m, :han + 300m] ); # Gl. 2 track(:station :removed, - flwlin[:han - 300m, :han - 140m] << 1dt - -- flwlin[:han - 100m, :han - 99m] + fl[:han - 300m, :han - 140m] << 1dt + -- fl[:han - 100m, :han - 99m] ); # Bst Ri Flensburg platform(:removed, - flwlin[:han - 50m, :han + 60m] - -- flwlin[:han + 60m, :han - 50m] >> 0.7dt + fl[:han - 50m, :han + 60m] + -- fl[:han + 60m, :han - 50m] >> 0.7dt ); # Bst Ri Lindholm platform(:removed, - flwlin[:han + 160m, :han + 260m] - -- flwlin[:han + 260m, :han + 160m] >> 0.7dt + fl[:han + 160m, :han + 260m] + -- fl[:han + 260m, :han + 160m] >> 0.7dt ); - marker(:de.hst :removed :left, flwlin[:han] << 0.5dt); - station(:bottom :removed, flwlin[:han] << 0.5dt << 1.2sh, + marker(:de.hst :removed :left, fl[:han] << 0.5dt); + station(:bottom :removed, fl[:han] << 0.5dt << 1.2sh, "Handewitt", "5,74 (172,74)" ); } with link = "line.de.1001" { - track(:second :removed, flwlin[:han + 300m, :una - 1sw]); + track(:second :removed, fl[:han + 300m, :una - 1sw]); } with link = "point.de.Unaften" { track(:second:station :removed, - flwlin[:una - 1sw, :una + 1sw] + fl[:una - 1sw, :una + 1sw] ); platform(:removed, - flwlin[:una - 50m, :una + 50m] - -- flwlin[:una + 50m, :una - 50m] << 0.7dt + fl[:una - 50m, :una + 50m] + -- fl[:una + 50m, :una - 50m] << 0.7dt ); - with layer = -4 marker(:de.hp :removed :right, flwlin[:una] >> 0.5dt); - station(:top :removed, flwlin[:una] >> 0.5dt >> 1.3sh, + with layer = -4 marker(:de.hp :removed :right, fl[:una] >> 0.5dt); + station(:top :removed, fl[:una] >> 0.5dt >> 1.3sh, "Unaften", "7,74 (174,74)" ); } with link = "line.de.1001" { - track(:second :removed, flwlin[:una + 1sw, :wal - 480m]); + track(:second :removed, fl[:una + 1sw, :wal - 480m]); } with link = "point.de.Wallsbüll" { # Gl. 1 track(:second:station :removed, - flwlin[:wal - 480m, :wal + 280m] + fl[:wal - 480m, :wal + 280m] ); # Gl. 2 track(:station :removed, - flwlin[:wal - 361m, :wal - 360m] - -- flwlin[:wal - 310m, :wal + 190m] >> 1dt - -- flwlin[:wal + 240m, :wal + 241m] + fl[:wal - 361m, :wal - 360m] + -- fl[:wal - 310m, :wal + 190m] >> 1dt + -- fl[:wal + 240m, :wal + 241m] ); # Gl. 3 track(:station :removed, - flwlin[:wal - 321m, :wal - 320m] - -- flwlin[:wal - 270m, :wal - 110m] << 1dt - -- flwlin[:wal - 60m, :wal - 59m] + fl[:wal - 321m, :wal - 320m] + -- fl[:wal - 270m, :wal - 110m] << 1dt + -- fl[:wal - 60m, :wal - 59m] ); # Anschl. Bw track(:station :removed, - flwlin[:wal - 420m] >> 10dt - -- flwlin[:wal - 320m] >> 5dt - .. flwlin[:wal - 160m, :wal] >> 2dt - -- flwlin[:wal + 50m, :wal + 51m] >> 1dt + fl[:wal - 420m] >> 10dt + -- fl[:wal - 320m] >> 5dt + .. fl[:wal - 160m, :wal] >> 2dt + -- fl[:wal + 50m, :wal + 51m] >> 1dt ); # Bahnsteig 1 platform(:removed, - flwlin[:wal - 40m, :wal + 70m] - -- flwlin[:wal + 70m, :wal - 40m] >> 0.7dt + fl[:wal - 40m, :wal + 70m] + -- fl[:wal + 70m, :wal - 40m] >> 0.7dt ); # Bahnsteig 2 platform(:removed, - flwlin[:wal - 70m, :wal + 70m] >> 1.0dt - -- flwlin[:wal + 70m, :wal - 70m] << 0.4dt + fl[:wal - 70m, :wal + 70m] >> 1.0dt + -- fl[:wal + 70m, :wal - 70m] << 0.4dt ); - marker(:de.bf :removed :left, flwlin[:wal] << 0.7dt); - station(:bottom :removed, flwlin[:wal] << 0.7dt << 1.2sh + (8bp, 0bp), + marker(:de.bf :removed :left, fl[:wal] << 0.7dt); + station(:bottom :removed, fl[:wal] << 0.7dt << 1.2sh + (8bp, 0bp), vbox(:center:top, span(:gone, "Meyn-Wallsbüll"), "Wallsbüll"), "11,43 (178,44)" ); @@ -124,72 +135,74 @@ with detail = [4, 5] { with link = "line.de.1001" { - track(:second :removed, flwlin[:wal + 280m, :saf - 1sw]); + track(:second :removed, fl[:wal + 280m, :saf - 1sw]); } with link = "point.de.Schafflund" { track(:second:station :removed, - flwlin[:saf - 1sw, :saf + 1sw] + fl[:saf - 1sw, :saf + 1sw] ); - marker(:de.hst :removed :left, flwlin[:saf]); - marker(:de.exbf :removed :left, flwlin[:saf]); - station(:bottom :removed, flwlin[:saf] << 0.5dt << 1.2sh, + marker(:de.hst :removed :left, fl[:saf]); + marker(:de.exbf :removed :left, fl[:saf]); + station(:bottom :removed, fl[:saf] << 0.5dt << 1.2sh, "Schafflund", "15,56 (182,57)" ); } with link = "line.de.1001" { - track(:second :removed :flip, flwlin[:saf + 3km, :saf + 1sw]); - line_badge(:removed, flwlin[:saf + 3km], "1001"); - track(:second :removed, flwlin[:saf + 3km, :spr - 1sw]); + track(:second :removed :flip, fl[:saf + 3km, :saf + 1sw]); + track(:second :removed, fl[:saf + 3km, :spr - 1sw]); + + line_box(:left:n :removed, fl[:saf + 3km], flwlin); } with link = "point.de.Sprakebüll" { - track(:second:station :removed, flwlin[:spr - 1sw, :spr + 1sw]); - marker(:de.hst :removed :right, flwlin[:spr]); - marker(:de.exbf :removed :right, flwlin[:spr]); - station(:top :removed, flwlin[:spr] >> 0.5dt >> 1.2sh, + track(:second:station :removed, fl[:spr - 1sw, :spr + 1sw]); + marker(:de.hst :removed :right, fl[:spr]); + marker(:de.exbf :removed :right, fl[:spr]); + station(:top :removed, fl[:spr] >> 0.5dt >> 1.2sh, "Sprakebüll", "21,89 (188,90)" ); } with link = "line.de.1001" { - with layer = -4 track(:second :removed, flwlin[:spr + 1sw, :ach - 1sw]); + with layer = -4 track(:second :removed, fl[:spr + 1sw, :ach - 1sw]); } with link = "point.de.Achtrup" { - track(:second:station :removed, flwlin[:ach - 1sw, :ach + 1sw]); - marker(:de.hst :removed :left, flwlin[:ach]); - marker(:de.exbf :removed :left, flwlin[:ach]); - station(:bottom :removed, flwlin[:ach] << 0.5dt << 1.2sh, + track(:second:station :removed, fl[:ach - 1sw, :ach + 1sw]); + marker(:de.hst :removed :left, fl[:ach]); + marker(:de.exbf :removed :left, fl[:ach]); + station(:bottom :removed, fl[:ach] << 0.5dt << 1.2sh, "Achtrup", "25,44 (192,44)" ); } with link = "lne.de.1001" { - with layer = -4 track(:second :removed, flwlin[:ach + 1sw, :lec - 1sw]); + with layer = -4 track(:second :removed, fl[:ach + 1sw, :lec - 1sw]); } with link = "point.de.Leck" { - track(:second:station :removed, flwlin[:lec - 1sw, :lec + 1sw]); - marker(:de.bf :removed :left, flwlin[:lec]); - station(:bottom :removed, flwlin[:lec] << 1.2sh, + track(:second:station :removed, fl[:lec - 1sw, :lec + 1sw]); + marker(:de.bf :removed :left, fl[:lec]); + station(:bottom :removed, fl[:lec] << 1.2sh, "Leck", "28,79 (195,79)" ); } with link = "line.de.1001" { - track(:second :removed :flip, flwlin[:lin.aa - 3km, :lec + 1sw]); - line_badge(:removed, flwlin[:lin.aa - 3km], "1001"); - track(:second :removed, flwlin[:lin.aa - 3km, :lin.aa]); + track(:second :removed :flip, fl[:lin.aa - 3km, :lec + 1sw]); + track(:second :removed, fl[:lin.aa - 3km, :lin.aa]); + + line_box(:right:s :removed, fl[:lin.aa - 3km], (-2dt, 0dt), flwlin); } diff --git a/rules/de/a/d4/10/1005.map b/rules/de/a/d4/10/1005.map index bc688a22..def71889 100644 --- a/rules/de/a/d4/10/1005.map +++ b/rules/de/a/d4/10/1005.map @@ -5,11 +5,21 @@ let ff = path("d4.de.1005"); with detail = 4 { # point.de.Flensburg de.1040 - with link = "line.de.1005" { track(:first :cat:ac15 :pax :flip, ff[:fle.f, :fls.a - 0.3sw]); - } + line_box(:left:nw :cat:ac15 :pax, ff[:fls.a - 0.1km], (0dt, -1.5dt), + vbox(:center:bottom, + span(:bold, "1005"), + hrule(), + hbox(:center:top, + vbox(:right:top, " ∗ ", " ≲ "), + vbox(:left:top, "1927 DRG ", "1996 ") + ) + ) + ); + + } with link = "point.de.Flensburg-Süd" { track(:first:station :cat:ac15 :pax, ff[:fls.a - 0.3sw, :fls.f]); @@ -19,12 +29,14 @@ with detail = 4 { -- ff[:fls + 2dl, :fls + 2.1dl] >> 1dt ); marker(:de.awanst :cat:ac15, ff[:fls] >> 1dt); - station(:right :cat:ac15, ff[:fls] << 1sw, - "F. Süd", "1,69" + label(:medium :cat:ac15, ff[:fls] + (0.2sw, -1.5sw), + hbox(:right:base, + span(:xsmall, "1,69 · "), + "F. Süd" + ) ); } - with link = "line.de.1005" { with layer = 2 track(:first :cat:ac15 :pax, ff[:fls + 1.2km, :fls.f] @@ -36,9 +48,6 @@ with detail = 4 { with layer = 1 casing(:first :cat:ac15 :pax :flip, ff[:fls + 2km, :fls + 3km] ); - with layer = 3 line_badge(:pax :cat:ac15, - ff[:fls + 1.2km] >> 0.2dt, "1005" - ); } diff --git a/rules/de/a/d4/10/1010.map b/rules/de/a/d4/10/1010.map index 9c02b126..521ed278 100644 --- a/rules/de/a/d4/10/1010.map +++ b/rules/de/a/d4/10/1010.map @@ -1,87 +1,85 @@ # DE 1010. Schleswig - Schleswig Altstadt # -let slesla = path("d4.de.1010"); +let sl = path("d4.de.1010"); with detail = [4, 5] { # point.de.Schleswig de.1040 - with link = "line.de.1010" { - track(:second :removed, slesla[:a, :got - 1sw]); - with layer = 1 line_badge(:removed, slesla[:a + .47km], "1010"); - } - + track(:second :removed, sl[:a, :sla.a]); - with link = "point.de.Gottorf" { - track(:second :station :removed, slesla[:got - 1sw, :got + 1sw]); - marker(:de.zst :right :removed, slesla[:got]); - label(slesla[:got] >> 1.3sh + (.5sw, 0sh), - hbox(:center :top, span(:medium :removed, "Gottorf")) + guide(:linenum :removed, + sl[:sla.a - 400m] >> 0.8dt + -- sl[:sla.a - 400m] >> 3.0dt + ); + label(:linenum :removed, sl[:sla.a - 400m] >> 3.0dt, + hbox(:center:top, "1010") ); } - - with link = "line.de.1010" { - track(:second :removed, slesla[:got + 1sw, :sla.a]); + with link = "point.de.Gottorf" { + track(:second :station :gone, sl[:got - 1sw, :got + 1sw]); + marker(:de.zst :right :gone, sl[:got]); + label(sl[:got] >> 1.2sh + (.5sw, 0sh), + hbox(:center :top, span(:medium :gone, "Gottorf")) + ); } - with link = "point.de.Schleihalle" { - marker(:de.zst :left :removed, slesla[:slh]); - label(slesla[:slh - .6sw] << 1sh - (1dt, 0dt), - hbox(:right :base, span(:medium :removed, "Schleihalle")) + marker(:de.zst :left :gone, sl[:slh]); + label(sl[:slh - .6sw] << 1sh - (1dt, -0.5dt), + hbox(:right :base, span(:medium :gone, "Schleihalle")) ); } - - with link = "line.de.1010" { - track(:second :removed, slesla[:slh + 1sw, :dom - 1sw]); - } - - with link = "point.de.Domziegelhof" { - marker(:de.zst :left :removed, slesla[:dom]); - label(slesla[:dom - 0.8sw] << 0.8sh, - hbox(:right :bottom, span(:medium :removed, "Domziegelhof")) + marker(:de.zst :left :gone, sl[:dom]); + label(sl[:dom - 0.8sw] << 0.8sh, + hbox(:right :bottom, span(:medium :gone, "Domziegelhof")) ); } - - with link = "line.de.1010" { - track(:second :removed, slesla[:dom + 1sw, :sla.a]); - } - - with link = "point.de.Schleswig-Altstadt" { # Gl. 1 track(:station :removed, - slesla[:sla.a + 99m, :sla.a + 100m] - -- slesla[:sla.a + 100m + 1dl, :sla - .6sw] << 1dt + sl[:sla.a + 99m, :sla.a + 100m] + -- sl[:sla.a + 100m + 1dl, :sla - .6sw] << 1dt ); # Gl. 2 track(:second:station :removed, - slesla[:sla.a, :sla.f] + sl[:sla.a, :sla.f] ); # Gl. 3 track(:station :removed, - slesla[:sla.a + 100m + 3.6dl, :sla.a + 100m + 3.7dl] - .. slesla[:sla.a + 100m + 4.7dl, :sla.f] >> 1dt + sl[:sla.a + 100m + 3.6dl, :sla.a + 100m + 3.7dl] + .. sl[:sla.a + 100m + 4.7dl, :sla.f] >> 1dt ); # Gl. 5 track(:station :removed, - slesla[:sla.a + 100m + 1.9dl, :sla.a + 100m + 2dl] - .. slesla[:sla.a + 100m + 4dl, :sla.f] >> 2dt + sl[:sla.a + 100m + 1.9dl, :sla.a + 100m + 2dl] + .. sl[:sla.a + 100m + 4dl, :sla.f] >> 2dt ); - marker(:de.bf :removed :left, slesla[:sla]); + marker(:de.bf :removed :left, sl[:sla]); station(:top :right_align :removed, - slesla[:sla] << 1.3sh + (.2sw, 0sw), + sl[:sla] << 1.3sh + (.2sw, 0sw), span(:medium :bold :removed, "Schleswig Altstadt"), "1010: 136,02" ); } + + with link = "line.de.1010" { + label(:small :removed, sl[:got] + (-0.7km, -0.9km), + hbox(:right:bottom :frame, vbox(:center:top, + span(:bold, "1010"), + hrule(), + " ∗ 1880 AKE ", + " ‡ 1950 † 1992 " + )) + ); + } } diff --git a/rules/de/a/d4/10/1011.map b/rules/de/a/d4/10/1011.map index 2ce4a183..c74dbc30 100644 --- a/rules/de/a/d4/10/1011.map +++ b/rules/de/a/d4/10/1011.map @@ -2,14 +2,26 @@ # let jubhus = path("d4.de.1011"); +let jub_sog = vbox(:center:top, + span(:bold, "1011"), + hrule(), + span(:xsmall, " Jübek – Sollbrück G. "), + " ∗ 1869 AKE " +); +let sog_hus = vbox(:center:top, + span(:bold, "1011"), + hrule(), + span(:xsmall, " Sollbrück G. – Husum "), + " ∗ 1854 S.sl E " +); + with detail = [4, 5] { # point.de.Jübek de.1040 with link = "line.de.1011" { - track(:second :pax :flip, jubhus[:sol - 2km, :jub.g]); - with layer = 1 line_badge(:pax, jubhus[:sol - 2km], "1011"); - track(:second :pax, jubhus[:sol - 2km, :sol.a]); + track(:second :pax, jubhus[:jub.g, :sol.a]); + line_box(:right:s :pax, jubhus[:jub.g + 1.8km], (-0.5sw, 0dt), jub_sog); } @@ -26,16 +38,27 @@ with detail = [4, 5] { marker(:de.awanst :removed :right, jubhus[:sol]); marker(:de.exbf :removed :right, jubhus[:sol]); - station(:top :closed, jubhus[:sol] >> 1.6sh, + station(:right :closed, jubhus[:sol + 0.5sw] << 1.2sw, "Sollbrück", "5,03" ); } - with link = "line.de.1011" { - track(:second :pax, jubhus[:sol + 1sw, :ahr - 1sw]); + track(:second :pax, jubhus[:sol + 1sw, :sog.ye]); } + with link = "point.de.Sollbrück-Gabelung" { + marker(:right :ref :gone, jubhus[:sog.ye]); + marker(:left :ref :gone, jubhus[:sog.ye]); + slabel(:left :medium:italic :gone, jubhus[:sog.ye] >> 2dt, + "„Sollbrück Gabelung“" + ); + } + + with link = "line.de.1011" { + track(:second :pax, jubhus[:sog.ye, :ahr - 1sw]); + line_box(:left:nw :pax, jubhus[:sol + 2.5km], (-1sw, 0dt), sog_hus); + } with link = "point.de.Ahrenviöl" { track(:second :station :pax, jubhus[:ahr - 1sw, :ahr + 1sw]); @@ -53,9 +76,7 @@ with detail = [4, 5] { with link = "line.de.1011" { - track(:second :pax :flip, jubhus[:ahr + 2.5km, :ahr + 1sw]); - line_badge(:pax, jubhus[:ahr + 2.5km], "1011"); - track(:second :pax, jubhus[:ahr + 2.5km, :ohr.a]); + track(:second :pax, jubhus[:ahr + 1sw, :ohr.a]); } } @@ -151,9 +172,8 @@ with detail = [4, 5] { with link = "line.de.1011" { - track(:second :pax :flip, jubhus[:wes + 1.6km, :wes + 1sw]); - line_badge(:pax, jubhus[:wes + 1.6km] >> .4pt, "1011"); - track(:second :pax, jubhus[:wes + 1.6km, :swe - 1sw]); + track(:second :pax, jubhus[:wes + 1sw, :swe - 1sw]); + line_box(:left:nw :pax, jubhus[:wes + 2.0km], (-2sw, 0dt), sog_hus); } @@ -167,9 +187,7 @@ with detail = [4, 5] { with link = "line.de.1011" { - track(:second :pax :flip, jubhus[:ros - 1.0km, :swe + 1sw]); - line_badge(:pax, jubhus[:ros - 1.0km], "1011"); - track(:second :pax, jubhus[:ros - 1.0km, :ros - 1sw]); + track(:second :pax, jubhus[:swe + 1sw, :ros - 1sw]); } @@ -185,7 +203,7 @@ with detail = [4, 5] { with link = "line.de.1011" { track(:second :pax, jubhus[:ros + 1sw, :hus.aa] - .. jubhus[:hus.a - 1m, :hus.a] >> 2.5dt + .. jubhus[:hus.a - 1dt, :hus.a] >> 2.5dt ); } diff --git a/rules/de/a/d4/10/1012.map b/rules/de/a/d4/10/1012.map index 45556d30..30518c02 100644 --- a/rules/de/a/d4/10/1012.map +++ b/rules/de/a/d4/10/1012.map @@ -1,181 +1,273 @@ # DE 1012. Büdelsdorf - Husum # -let budhus = path("d4.de.1012"); +let bh = path("d4.de.1012"); + +let bud_gen = vbox(:center:bottom, + span(:bold, "1012"), + hrule(), + span(:xsmall, " Büdelsdorf – Husum "), + hbox(:center:top, + vbox(:center:top, " ∗ ", " ‡ "), + vbox(:left:top, "1910 Pre ", "1974 ") + ), + hrule(), + span(:xsmall, " Büdelsdorf – Gew.N. "), + "AKN" +); +let foc_hoh = vbox(:center:bottom, + span(:bold, "1012"), + hrule(), + span(:xsmall, " Büdelsdorf – Husum "), + hbox(:center:top, + vbox(:center:top, " ∗ ", " ‡ "), + vbox(:left:top, "1910 Pre ", "1974 ") + ), + hrule(), + span(:xsmall, " Fockbek – Hohn "), + " † 1988 " +); +let hoh_erf = vbox(:center:bottom, + span(:bold, "1012"), + hrule(), + span(:xsmall, " Büdelsdorf – Husum "), + hbox(:center:top, + vbox(:center:top, " ∗ ", " ‡ "), + vbox(:left:top, "1910 Pre ", "1974 ") + ), + hrule(), + span(:xsmall, " Hohn – Erfde "), + " † 1974 " +); +let erf_swa = vbox(:center:bottom, + span(:bold, "1012"), + hrule(), + span(:xsmall, " Büdelsdorf – Husum "), + hbox(:center:top, + vbox(:center:top, " ∗ ", " ‡ "), + vbox(:left:top, "1910 Pre ", "1974 ") + ), + hrule(), + span(:xsmall, " Erfde – Schwabstedt "), + " † 1988 " +); +let swa_hus = vbox(:center:bottom, + span(:bold, "1012"), + hrule(), + span(:xsmall, " Büdelsdorf – Husum "), + hbox(:center:top, + vbox(:center:top, " ∗ ", " ‡ "), + vbox(:left:top, "1910 Pre ", "1974 ") + ), + hrule(), + span(:xsmall, " Schwabstedt – Husum "), + " † 1989 " +); with detail = [4, 5] { + let nf = path("d4.de.1040"); + # point.de.Büdelsdorf de.1040 + with link = "point.de.Rendsburg-Gr" { + track(:station, + nf[:bud + 300m - 0.5sw, :bud + 300m + 0.2sw] << 1.5dt + ); + marker(:left :de.dirgr, nf[:bud + 300m] << 1.5dt); + guide(:open, + nf[:bud + 300m] >> 1.0dt + -- nf[:bud + 300m] >> 3.0dt + ); + slabel(:right, nf[:bud + 300m] >> 3.0dt, + hbox(:left:middle, + vbox(:center:middle, + " AKN ", + hbar(0.3), + "DB" + ), + span(:xsmall, " 1012: ??") + ) + ); + } + + with link = "line.de.1012" { + track(:station, + nf[:bud + 300m + 0.19sw, :bud + 300m + 0.2sw] << 1.5dt + .. bh[:bud.gg, :gen - 250m] + ); + line_box(:right:se, bh[:bud.gg + 300m], (1sw, 0dt), bud_gen); + } +} + + +with detail = [4, 5] { with link = "point.de.Rendsburg-Gewerbegebiet-Nord" { - let budhus.gen = path("d4.de.1012.gen"); + let bh.gen = path("d4.de.1012.gen"); with layer = -2 track(:station, - path("d4.de.1040")[:bud + 1sw, :bud + 1.01sw] << 1.5dt - .. budhus[:bud.gg, :gen] + bh[:gen - 250m, :gen] ); with layer = -4 track(:second:station :removed, - budhus[:gen, :gen + 0.5sw] + bh[:gen, :gen + 0.5sw] ); with layer = -2 track(:station, - budhus[:gen, :gen - .1dl] - .. budhus.gen[:a, :f] + bh[:gen, :gen - .1dl] + .. bh.gen[:a, :f] ); with layer = -2 track(:station, - budhus.gen[:x, :x + .1dl] - .. budhus.gen[:aa, :ff] + bh.gen[:x, :x + .1dl] + .. bh.gen[:aa, :ff] ); - marker(:de.anst :right, budhus[:gen]); - with layer = -1 station(:left, budhus[:gen] >> 1.4sw , + marker(:de.anst :right, bh[:gen]); + with layer = -1 station(:left, bh[:gen] >> 1.4sw , "R. Gewerbegebiet Nord", "3,07" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:gen + 0.5sw, :foc - 1sw]); + track(:second :removed, bh[:gen + 0.5sw, :foc - 1sw]); } with link = "point.de.Fockbek" { - track(:second:station :removed, budhus[:foc - 1sw, :foc + 1sw]); - marker(:de.anst :removed :left, budhus[:foc]); - marker(:de.exbf :removed :left, budhus[:foc]); - station(:bottom :removed, budhus[:foc] << 1.3sh, + track(:second:station :removed, bh[:foc - 1sw, :foc + 1sw]); + marker(:de.anst :removed :left, bh[:foc]); + marker(:de.exbf :removed :left, bh[:foc]); + station(:bottom :removed, bh[:foc] << 1.3sh, "Fockbek", "4,26" ); } with link = "line.de.1012" { - track(:second :removed :flip, budhus[:foc + 1.8km, :foc + 1sw]); - line_badge(:removed, budhus[:foc + 1.8km], "1012"); - track(:second :removed, budhus[:foc + 1.8km, :gar - 1sw]); + track(:second :removed, bh[:foc + 1sw, :gar - 1sw]); } with link = "point.de.Garlbek" { - track(:second :station :removed, budhus[:gar - 1sw, :gar + 1sw]); - marker(:de.hp :removed :right, budhus[:gar]); - station(:top :removed, budhus[:gar] >> 1.2sw, + track(:second :station :removed, bh[:gar - 1sw, :gar + 1sw]); + marker(:de.hp :removed :right, bh[:gar]); + station(:top :removed, bh[:gar] >> 1.2sw, "Garlbek", "7,38" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:gar + 1sw, :hoh - 1sw]); + track(:second :removed, bh[:gar + 1sw, :hoh - 1sw]); + line_box(:right:s :removed, bh[:hoh - 1km], (-3sw, 0dt), foc_hoh); } with link = "point.de.Hohn" { - track(:second:station :removed, budhus[:hoh - 1sw, :hoh + 1sw]); - marker(:de.bf :removed :left, budhus[:hoh]); - station(:bottom :removed, budhus[:hoh] << 1.2sw, + track(:second:station :removed, bh[:hoh - 1sw, :hoh + 1sw]); + marker(:de.bf :removed :left, bh[:hoh]); + station(:bottom :removed, bh[:hoh] << 1.2sw, "Hohn", "10,75" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:hoh + 1sw, :chr - 1sw]); + track(:second :removed, bh[:hoh + 1sw, :chr - 1sw]); } with link = "point.de.Christiansholm" { - track(:second:station :removed, budhus[:chr - 1sw, :chr + 1sw]); - marker(:de.bf :removed :left, budhus[:chr]); - station(:bottom :removed, budhus[:chr] << 1.2sw, + track(:second:station :removed, bh[:chr - 1sw, :chr + 1sw]); + marker(:de.bf :removed :left, bh[:chr]); + station(:bottom :removed, bh[:chr] << 1.2sw, "Christiansholm", "17,42" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:chr + 1sw, :erf - 1sw]); + track(:second :removed, bh[:chr + 1sw, :erf - 1sw]); + line_box(:right:s :removed, bh[:chr + 2.0km], (-3sw, 0dt), hoh_erf); } with link = "point.de.Erfde" { - track(:second:station :removed, budhus[:erf - 1sw, :erf + 1sw]); - marker(:de.bf :removed :left, budhus[:erf]); - station(:bottom :removed, budhus[:erf] << 1.2sw, + track(:second:station :removed, bh[:erf - 1sw, :erf + 1sw]); + marker(:de.bf :removed :left, bh[:erf]); + station(:bottom :removed, bh[:erf] << 1.2sw, "Erfde", "23,02" ); } with link = "line.de.1012" { - track(:second :removed :flip, budhus[:erf + 3.0km, :erf + 1sw]); - line_badge(:removed, budhus[:erf + 3.0km], "1012"); - track(:second :removed, budhus[:erf + 3.0km, :nor - 1sw]); + track(:second :removed, bh[:erf + 1sw, :nor - 1sw]); } with link = "point.de.Norderstapel" { - track(:second :station :removed, budhus[:nor - 1sw, :nor + 1.5sw]); + track(:second :station :removed, bh[:nor - 1sw, :nor + 1.5sw]); track(:station :removed, - budhus[:nor, :nor + 1sw] >> 1dt - -- budhus[:nor + 1sw + 1dl, :nor + 1sw + 1.1dl] + bh[:nor, :nor + 1sw] >> 1dt + -- bh[:nor + 1sw + 1dl, :nor + 1sw + 1.1dl] ); - marker(:de.anst :removed :right, budhus[:nor + 0.5sw] >> 1dt); - marker(:de.exbf :removed :right, budhus[:nor + 0.5sw] >> 1dt); - station(:left :removed, budhus[:nor + 1.5sw] << 2dt, - span(:bold, "Norderstapel"), "31,04" + marker(:de.anst :removed :right, bh[:nor + 0.5sw] >> 1dt); + marker(:de.exbf :removed :right, bh[:nor + 0.5sw] >> 1dt); + station(:left :removed, bh[:nor + 1.5sw] << 2dt, + span(:bold, "Norderstapel"), "1012: 31,04 · AX1: ??" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:nor + 1.5sw, :swa - 1sw]); + track(:second :removed, bh[:nor + 1.5sw, :swa - 1sw]); + line_box(:right:sw :removed, bh[:nor + 2.5km], (0dt, 1sw), erf_swa); } with link = "point.de.Schwabstedt" { - track(:second:station :removed, budhus[:swa - 1sw, :swa + 1sw]); - marker(:de.anst :removed :left, budhus[:swa]); - marker(:de.exbf :removed :left, budhus[:swa]); - station(:left :removed, budhus[:swa] << 2.0sh, + track(:second:station :removed, bh[:swa - 1sw, :swa + 1sw]); + marker(:de.anst :removed :left, bh[:swa]); + marker(:de.exbf :removed :left, bh[:swa]); + station(:left :removed, bh[:swa] << 2.3sh, "Schwabstedt", "36,44" ); } with link = "line.de.1012" { - track(:second :removed :flip, budhus[:ran - 2.4km, :swa + 1sw]); - line_badge(:removed, budhus[:ran - 2.4km], "1012"); - track(:second :removed, budhus[:ran - 2.4km, :ran - 1sw]); + track(:second :removed, bh[:swa + 1sw, :ran - 1sw]); + line_box(:right:sw :removed, bh[:ran - 2.5km], (0dt, 1sw), swa_hus); } with link = "point.de.Rantrum" { - track(:second:station :removed, budhus[:ran - 1sw, :ran + 1sw]); - marker(:de.anst :removed :left, budhus[:ran]); - marker(:de.exbf :removed :left, budhus[:ran]); - station(:left :removed, budhus[:ran - .3sw] << 2.0sh, + track(:second:station :removed, bh[:ran - 1sw, :ran + 1sw]); + marker(:de.bf :removed :left, bh[:ran]); + station(:left :removed, bh[:ran - .3sw] << 1.8sh, "Rantrum", "42,29" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:ran + 1sw, :mil - 1sw]); + track(:second :removed, bh[:ran + 1sw, :mil - 1sw]); + line_label(:left:n :removed, bh[:mil - 1.0km], "1012 "); } with link = "point.de.Mildstedt" { - track(:second:station :removed, budhus[:mil - 1sw, :mil + 1sw]); - marker(:de.hst :removed :left, budhus[:mil]); - marker(:de.exbf :removed :left, budhus[:mil]); - station(:left :removed, budhus[:mil + .4sw] << 1.4sh, + track(:second:station :removed, bh[:mil - 1sw, :mil + 1sw]); + marker(:de.anst :removed :left, bh[:mil]); + marker(:de.exbf :removed :left, bh[:mil]); + station(:left :removed, bh[:mil + .4sw] << 1.4sh, hbox(:left:top, "Mildstedt"), "45,96" ); } with link = "line.de.1012" { - track(:second :removed, budhus[:mil + 1sw, :hus.b]); + track(:second :removed, bh[:mil + 1sw, :hus.b]); } diff --git a/rules/de/a/d4/10/1020.map b/rules/de/a/d4/10/1020.map index b55f01ac..e27d5bee 100644 --- a/rules/de/a/d4/10/1020.map +++ b/rules/de/a/d4/10/1020.map @@ -26,7 +26,7 @@ with detail = 4 { marker(:de.hp :pax :left, hasfle[:kro]); marker(:de.exbf :pax :left, hasfle[:kro]); - station(:left :pax, hasfle[:kro - 0.4sw] << 1.9sh, + station(:left :pax, hasfle[:kro - 0.3sw] << 1.9sh, "Kronshagen", "5,60" ); } @@ -41,11 +41,11 @@ with detail = 4 { # Gl. 1 track(:station :pax, hasfle[:suc.a + 0.9dl, :suc.a + 1dl] - -- hasfle[:suc.a + 2.0dl, :awik - 2.0dl] << 1dt - -- hasfle[:awik - 1.0dl, :awik - 0.9dl] + -- hasfle[:suc.a + 2.0dl, :suc.yw - 2.0dl] << 1dt + -- hasfle[:suc.yw - 1.0dl, :suc.yw - 0.9dl] ); # Gl. 2 - track(:second:station :pax, hasfle[:suc.a, :awik]); + track(:second:station :pax, hasfle[:suc.a, :suc.yw]); platform(:pax, hasfle[:suc - 140m, :suc + 15m] << 1dt @@ -53,7 +53,8 @@ with detail = 4 { ); marker(:de.bf:pax :left, hasfle[:suc] << 1dt); - station(:left :pax :right_align, hasfle[:suc - .4sw] << 1dt << 1.3sh, + station(:left :pax :right_align, + hasfle[:suc - .4sw] << 1dt << 1.3sh + (0dt, -4dt), span(:medium :bold, "Suchsdorf"), hbox(:center :base, span(:regular, "1020: "), @@ -61,11 +62,29 @@ with detail = 4 { span(:regular, "7,75 ") ) ); + + # Anschl. Vossloh + let suc = path("d4.de.1020.suc"); + + track(:station, + suc[:a, :f] + .. hasfle[:suc - 120m, :suc - 119m] << 1dt + ); + track(:station, + suc[:a, :r - 1dl] >> 1dt + ); + track(:station, + suc[:a, :r - 2dl] >> 2dt + -- suc[:r - 0.1dl, :r] + ); + slabel(:left :italic, suc[:r] >> 1dt, + hbox(:right:top, "Vossloh") + ); } with link = "line.de.1020" { - track(:second :pax, hasfle[:awik, :lev - 1sw]); + track(:second :pax, hasfle[:suc.yw, :lev - 1sw]); } @@ -85,29 +104,29 @@ with detail = 4 { with link = "point.de.Neuwittenbek" { # Gl. 1 - with layer = -2 track(:station, - hasfle[:nwi - .5sw - 2.1dl, :nwi - .5sw - 2dl] - -- hasfle[:nwi - .5sw - 1dl, :nwi.f - 2dl] << 1dt - -- hasfle[:nwi.f - 1dl, :nwi.f - 0.9dl] + track(:station, + hasfle[:nwi - 161m, :nwi - 160m] + -- hasfle[:nwi - 80m, :nwi + 250m] << 1dt + -- hasfle[:nwi + 340m, :nwi + 341m] ); - # Gl. 2 + # Gl. 2 (Str. 1020) track(:second :station :pax, hasfle[:nwi.a, :nwi.f]); - # Gl. 3 - with layer = -2 track(:station, - hasfle[:nwi.a + 1dl, :nwi.a + 2dl] >> 1dt + # Gl. 3 (Str. 9104) + track(:station, + hasfle[:nwi - 210m, :nwi - 140m] >> 1dt ); - with layer = -2 track(:second :station, - hasfle[:nwi.a + 0.9dl, :nwi.a + 1dl] - -- hasfle[:nwi.a + 2dl, :nwi.f] >> 1dt + track(:second :station, + hasfle[:nwi - 211m, :nwi - 210m] + -- hasfle[:nwi - 140m, :nwi.f] >> 1dt ); # Gl. 4 with layer = -2 track(:station, - hasfle[:nwi - 2.1dl, :nwi - 2dl] >> 1dt - -- hasfle[:nwi - 1dl, :nwi.f - 4dl] >> 2dt - -- hasfle[:nwi.f - 3dl, :nwi.f - 2.9dl] >> 1dt + hasfle[:nwi - 81m, :nwi - 80m] >> 1dt + -- hasfle[:nwi - 10m, :nwi + 200m] >> 2dt + -- hasfle[:nwi + 250m, :nwi + 251m] >> 1dt ); marker(:de.bbf :left, hasfle[:nwi] << 1dt); @@ -128,18 +147,6 @@ with detail = 4 { ); } - with link = "point.de.Neuwittenbek-Gr" { - marker(:de.dirgr :right, hasfle[:nwi.f] >> 1dt); - marker(:statdt :right, hasfle[:nwi.f] >> 0.5dt); - slabel(:right, hasfle[:nwi.f - 2dt] >> 4dt, - vbox(:center:bottom, - span(:regular, "SHK"), - hbar(0.3), - span(:regular, "DB") - ) - ); - } - with link = "line.de.1020" { track(:second :pax :flip, hasfle[:nwi + 2.8km, :nwi.f]); @@ -175,8 +182,8 @@ with detail = 4 { with link = "point.de.Neudorf" { track(:second:station :pax, hasfle[:ndo - 1sw, :ndo + 1sw]); - with layer = -1 marker(:de.ldst :gone :left, hasfle[:ndo]); - station(:left :gone, hasfle[:ndo - 0.2sw] << 2.0sh, + with layer = -1 marker(:de.ldst :removed :left, hasfle[:ndo]); + station(:left :removed, hasfle[:ndo - 0.2sw] << 2.0sh, "Neudorf", "22,80" ); } @@ -212,25 +219,25 @@ with detail = 4 { # Gl. 2 track(:station :pax, - hasfle[:ecs - .5sw - 0.9dl, :ecs - .5sw - 1dl] - -- hasfle[:ecs - .5sw, :ecs.f - 2dl] << 1dt - -- hasfle[:ecs.f - 1dl, :ecs.f - 0.9dl] + hasfle[:ecs - 161m, :ecs - 160m] + -- hasfle[:ecs - 110m, :ecs + 510m] << 1dt + -- hasfle[:ecs + 560m, :ecs + 561m] ); # Gl. 3 track(:station :pax, - hasfle[:ecs.a + .9dl, :ecs.a + 1dl] - -- hasfle[:ecs.a + 3dl, :ecs - .5sw + 2dl] << 2dt + hasfle[:ecs - 261m, :ecs - 260m] + -- hasfle[:ecs - 160m, :ecs - 50m] << 2dt ); - with layer = -4 track(:station :removed, - hasfle[:ecs - .5sw + 2dl, :ecs.en + .5sw] << 2dt + track(:station :removed, + hasfle[:ecs - 50m, :ecs.en + .5sw] << 2dt -- hasfle[:ecs.en + .5sw + 1dl, :ecs.en + .5sw + 1.1dl] << 1dt ); # Gl. 4 with layer = -1 track(:station :removed, - hasfle[:ecs.a + 3.9dl, :ecs.a + 4dl] << 2dt - -- hasfle[:ecs.a + 5dl, :ecs.en - .5sw - 1dl] << 3dt + hasfle[:ecs - 211m, :ecs - 210m] << 1dt + -- hasfle[:ecs - 160m, :ecs.en - .5sw - 1dl] << 3dt -- hasfle[:ecs.en - .5sw, :ecs.en - .5sw + .1dl] << 2dt ); @@ -251,16 +258,24 @@ with detail = 4 { .. hasfle[:ecs.en + 0.5sw - 1dl, :ecs + 1sw] << 3dt ); + # Bahnsteig 1 platform(:pax, hasfle[:ecs, :ecs + 160m] -- hasfle[:ecs + 160m, :ecs] << 0.7dt ); + # Bahnsteig 2 platform(:pax, hasfle[:ecs, :ecs + 160m] << 1.0dt -- hasfle[:ecs + 160m, :ecs] >> 1.5dt ); + # Bahnsteig 3 + platform(:pax, + hasfle[:ecs - 160m, :ecs - 50m] << 2.0dt + -- hasfle[:ecs - 50m, :ecs - 160m] >> 1.5dt + ); + marker(:de.bf:pax :right, hasfle[:ecs] >> 0.5dt); station(:pax :right, hasfle[:ecs - 0.5sw] >> 1.5sh, span(:medium :bold, "Eckernförde"), @@ -451,12 +466,16 @@ with detail = 4 { -- hasfle[:moh.f - 1dl, :moh.f - 0.9dl] ); marker(:de.bf :removed, hasfle[:moh] >> 1dt); - station(:right :closed, hasfle[:moh - .4sw] >> 1dt >> 1.4sh, - hbox(:left :base, - "Mohrkirch", - span(:gone, "osterholz") - ), - "57,08" + label(:removed, hasfle[:moh] >> 1dt >> 1.6sh, + hbox(:left:middle, + vbox(:left :bottom, + span(:medium:gone, "Mohrkirchosterholz"), + vbox(:center:bottom, + span(:medium, "Mohrkirch"), + span(:xsmall, "57,08") + ) + ) + ) ); } @@ -567,7 +586,7 @@ with detail = 4 { span(:medium :removed, "Maasbüll "), span(:medium :light :removed, "(Angeln)") ), - "74,21" + "74,21 ← 74,08" ); } diff --git a/rules/de/a/d4/10/1040.map b/rules/de/a/d4/10/1040.map index 88076c73..60107686 100644 --- a/rules/de/a/d4/10/1040.map +++ b/rules/de/a/d4/10/1040.map @@ -14,7 +14,7 @@ with detail = [4, 5] { ); with layer = -4 track(:first :double :removed, - path("d4.de.1040.neu")[:neu.h + 2dl, :xneu] + path("d4.de.1040.neu")[:neu.yh, :xneu] ); with layer = 1 line_badge(:pax :cat:ac15, nf[:xneu + 0.7km], "1040"); @@ -55,9 +55,19 @@ with detail = [4, 5] { nf[:nor + 190m] >> 0.5dt -- nf[:nor + 260m] << 0.5dt ); - marker(:de.bf :cat:ac15 :pax :right, nf[:nor] >> 0.5dt); + + platform(:cat:ac15 :pax, + nf[:nor - 190m, :nor + 40m] >> 0.5dt + -- nf[:nor + 40m, :nor - 190m] << 1.2dt + ); + platform(:cat:ac15 :pax, + nf[:nor + 165m, :nor + 370m] << 0.5dt + -- nf[:nor + 370m, :nor + 165m] >> 1.2dt + ); + + marker(:de.bf :cat:ac15 :pax :right, nf[:nor] >> 1.0dt); station(:right :cat:ac15 :pax :left_align, - nf[:nor - 0.4sw] >> 0.5dt >> 1.4sh, + nf[:nor - 0.4sw] >> 1.0dt >> 1.4sh, "Nortorf", hbox(:left :base, span(:xsmall, " 88,87 "), @@ -76,17 +86,17 @@ with detail = [4, 5] { track(:first:station :double :cat:ac15 :pax, nf[:bok - 1sw, :bok + 1sw] ); - with layer = -1 marker(:de.hp :removed:left, nf[:bok] << 0.5dt); - with layer = -2 marker(:de.bf :gone :left, nf[:bok] << 0.5dt); + marker(:de.hp :removed:left, nf[:bok] << 0.5dt); + marker(:de.exbf :removed :left, nf[:bok] << 0.5dt); station(:left :right_align :removed, - nf[:bok - 0.4sw] << 0.5dt << 1.8sh, + nf[:bok - 0.35sw] << 1.0dt << 1.8sh, "Bokel", "95,13 (94,37)" ); } with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:bok - 1sw, :bos - 1sw]); + track(:first :double :cat:ac15 :pax, nf[:bok + 1sw, :bos - 1sw]); } @@ -94,7 +104,7 @@ with detail = [4, 5] { track(:first:station :double :cat:ac15 :pax, nf[:bos - 1sw, :bos + 100m] ); - with layer = -4 marker(:de.bk :left :removed, nf[:bos] << 0.5dt); + marker(:de.bk :left :removed, nf[:bos] << 0.5dt); station(:left :removed, nf[:bos - 0.2sw] << 0.5dt << 1.6sw, "Bokelholm Süd", "??" ); @@ -124,8 +134,9 @@ with detail = [4, 5] { with link = "line.de.1040" { - track(:first :double :cat:ac15 :pax, nf[:bon + 1sw, :oro.a]); - with layer = 1 line_badge(:pax :cat:ac15, nf[:oro - 3.0km], "1040"); + track(:first :double :cat:ac15 :pax :flip, nf[:oro - 3km, :bon + 1sw]); + line_badge(:pax :cat:ac15, nf[:oro - 3.0km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:oro - 3km, :oro.a]); } @@ -150,8 +161,8 @@ with detail = [4, 5] { ); marker(:de.bbf :cat:ac15 :right, nf[:oro] >> 0.5dt); - with layer = -4 marker(:de.bf :right :removed, nf[:oro] >> 0.5dt); - station(:left :cat:ac15, nf[:oro - 1.0sw] << 0.5dt << 1.0sh, + marker(:de.exbf :cat:ac15 :right, nf[:oro] >> 0.5dt); + station(:left :cat:ac15, nf[:oro - 1.0sw] << 0.5dt << 0.8sh, span(:medium :bold, "Osterrönfeld"), vbox(:center :top, "1022: 30,96", @@ -349,40 +360,22 @@ with detail = [4, 5] { # Strecke 1012. track(:station, - nf[:bud + .499sw, :bud + .5sw] << 0.5dt - -- nf[:bud + .5sw + 1dl, :bud + 1sw] << 1.5dt + nf[:bud - 0.1dl, :bud] << 0.5dt + -- nf[:bud + 50m, :bud + 300m - 0.5sw] << 1.5dt ); - with layer = -1 marker(:de.bf :removed :left, nf[:bud] << 0.5dt); - with detail = 5 { - station(:left :closed, nf[:bud - .2sw] << 0.5dt << 1.8sh, - "Büdelsdorf", - hbox(:center :top :closed, - vbox(:right :top, - span(:xsmall, "1012: "), span(:xsmall, "1040: ") - ), - vbox(:right :top, - span(:xsmall, "0,"), span(:xsmall, "115,") - ), - vbox(:left :top, - span(:xsmall, "42"), span(:xsmall, "35") - ) - ) - ); - } - with detail = 4 { - station(:left :right_align :removed, - nf[:bud - .2sw] << 0.5dt << 1.8sh, - "Büdelsdorf", - hbox(:center:top :removed :xsmall, - vbox(:right:top, "1012: ", "1040: "), - vbox(:right:top, "0,", "115,"), - vbox(:left:top, "42 ←", "35 ←"), - vbox(:right:top, " 0,", " 115,", "(109,"), - vbox(:left:top, "34", "27", "70)") - ) - ); - } + with layer = -1 marker(:de.bf :removed :left, nf[:bud] << 1.5dt); + station(:left :right_align :removed, + nf[:bud - .2sw] << 1.5dt << 1.8sh, + "Büdelsdorf", + hbox(:center:top :removed :xsmall, + vbox(:right:top, "1012: ", "1040: "), + vbox(:right:top, "0,", "115,"), + vbox(:left:top, "42 ←", "35 ←"), + vbox(:right:top, " 0,", " 115,", "(109,"), + vbox(:left:top, "34", "27", "70)") + ) + ); } @@ -845,7 +838,7 @@ with detail = [4, 5] { marker(:de.bft :cat:ac15 :right, nf[:fws] >> 0.5dt); station(:right :cat:ac15, nf[:fws + 0.3sw] >> 1.6sw, - "F. Süd", "??" + "F.W. Süd", "??" ); } diff --git a/rules/de/a/d4/11/1113.map b/rules/de/a/d4/11/1113.map index b236f651..9279923f 100644 --- a/rules/de/a/d4/11/1113.map +++ b/rules/de/a/d4/11/1113.map @@ -13,9 +13,9 @@ with detail = [4, 5] { wt[:wab - 1sw, :wab + 1sw] ); - with layer = 1.5 marker(:de.bbf :closed :left, wt[:wab] << 0.5dt); - with layer = 1.4 marker(:de.bf :gone :left, wt[:wab] << 0.5dt); - with layer = 1.3 marker(:de.bf.casing :left, wt[:wab] << 0.5dt); + with layer = 5 marker(:de.bbf :closed :left, wt[:wab] << 0.5dt); + with layer = 4 marker(:de.bf :gone :left, wt[:wab] << 0.5dt); + with layer = 3 marker(:de.bf.casing :left, wt[:wab] << 0.5dt); with detail = 4 { station(:left :closed, path("d4.de.1100")[:swr.sf - 120m] << 1.5dt, diff --git a/rules/de/a/d4/12/1200.map b/rules/de/a/d4/12/1200.map index 3261b09a..24aaa63c 100644 --- a/rules/de/a/d4/12/1200.map +++ b/rules/de/a/d4/12/1200.map @@ -218,7 +218,7 @@ with detail = [4, 5] { # Gleis 36 - 126 - 106 - 7 track(:station, nw[:wes.a, :wes] >> 1dt); - with layer = -0.5 casing(:station, nw[:wes.a, :wes.a + 1sw] >> 1dt); + with layer = -1 casing(:station, nw[:wes.a, :wes.a + 1sw] >> 1dt); # Gleis 47 track(:station, diff --git a/rules/de/a/d4/12/1251.map b/rules/de/a/d4/12/1251.map index f9cbcbb0..4a47d419 100644 --- a/rules/de/a/d4/12/1251.map +++ b/rules/de/a/d4/12/1251.map @@ -33,7 +33,7 @@ with detail = [4, 5] { "1251: 4,20" ); slabel(:left :removed, wf[:f - 1sw] >> 1.5dt, - span(:italic, "Airbus Operations") + span(:roman :italic, "Airbus Operations") ); } } diff --git a/rules/de/a/d4/12/1270.map b/rules/de/a/d4/12/1270.map index 03c05e11..0ab4921f 100644 --- a/rules/de/a/d4/12/1270.map +++ b/rules/de/a/d4/12/1270.map @@ -51,11 +51,11 @@ with detail = 4 { track(:first:station :double :rail:rc12 :pax :tunnel, hd[:lan.xa - 100m, :lan + 1sw] ); - track(:station :rail:rc12, + track(:station :rail:rc12 :tunnel, hd[:lan.xa] << 0.5dt -- hd[:lan.xa + 1dl] >> 0.5dt ); - track(:station :rail:rc12, + track(:station :rail:rc12 :tunnel, hd[:lan.xa + 2dl] >> 0.5dt -- hd[:lan.xa + 3dl] << 0.5dt ); diff --git a/rules/de/a/d4/61/6100.map b/rules/de/a/d4/61/6100.map index 5ffbc012..7a2ba6ec 100644 --- a/rules/de/a/d4/61/6100.map +++ b/rules/de/a/d4/61/6100.map @@ -625,7 +625,7 @@ with detail = 4 { .. ba[:ham.x, :ham.f - 180m] >> 0.5dt -- ba[:ham.f - 180m + 1dl, :ham.f - 180m + 1.1dl] << 0.5dt ); - with layer = -1.5 casing(:first:station :cat:ac15 :pax, + with layer = -1 casing(:first:station :cat:ac15 :pax, ba[:ham.s, :ham.f - 180m] >> 0.5dt -- ba[:ham.f - 180m + 1dl, :ham.f - 180m + 1.1dl] << 0.5dt ); @@ -686,7 +686,7 @@ with detail = 4 { -- ba[:ham.s + 5dl, :ham.f - 100m] << 0.5dt -- ba[:ham.f - 100m + 1dl, :ham.f] >> 0.5dt ); - with layer = -1.5 casing(:first:station :cat:ac15 :pax, + with layer = -1 casing(:first:station :cat:ac15 :pax, ba[:ham.s + 5dl, :ham.f - 100m] << 0.5dt -- ba[:ham.f - 100m + 1dl, :ham.f] >> 0.5dt ); @@ -701,7 +701,7 @@ with detail = 4 { -- ba[:ham.s + 6dl, :ham.f - 100m + 0.7dl] << 1.5dt -- ba[:ham.f - 100m + 1.7dl, :ham.f] << 0.5dt ); - with layer = -1.5 casing(:first:station :cat:ac15 :pax, + with layer = -1 casing(:first:station :cat:ac15 :pax, ba[:ham.s + 6dl, :ham.f - 100m + 0.7dl] << 1.5dt -- ba[:ham.f - 100m + 1.7dl, :ham.f] << 0.5dt ); @@ -719,7 +719,7 @@ with detail = 4 { with layer = -1 track(:station :cat:ac15, ba[:ham.f - 180m, :ham.f - 100m - 0.5dl] >> 0.5dt ); - with layer = -1.5 casing(:station :cat:ac15, + with layer = -1 casing(:station :cat:ac15, ba[:ham.f - 180m, :ham.f - 100m - 0.5dl] >> 0.5dt ); diff --git a/rules/de/a/d4/91/9103.map b/rules/de/a/d4/91/9103.map new file mode 100644 index 00000000..290b6b69 --- /dev/null +++ b/rules/de/a/d4/91/9103.map @@ -0,0 +1,32 @@ +# DE 9103. Schleswig-Friedrichsberg Kreisb - Friedrichstadt Kreisbf +# +let sf = path("d4.de.9103"); + +with detail = [4, 5] { + + + with link = "line.de.9103" { + track(:third :removed, sf[:noh + 1sw, :nor - 1sw]); + } + + + with link = "point.de.Norderstapel-Kreisb" { + track(:third:station :removed, sf[:nor - 1sw, :nor.yn + 0.5sw]); + track(:station :removed, + sf[:nor - 0.51sw, :nor - 0.5sw] + -- sf[:nor - 0.5sw + 1dl, :nor.yn] >> 1dt + ); + + marker(:left :de.bf :removed, sf[:nor]); + station(:right :removed, sf[:nor - 0.8sw] << 1.6sh, + span(:bold, "Norderstapel Kreisb"), + "9103: ?? · AX1: ??" + ); + } + + + with link = "line.de.9103" { + track(:third :removed, sf[:nor.yn + 0.5sw, :sud - 1sw]); + } +} + diff --git a/rules/de/a/d4/91/9104.map b/rules/de/a/d4/91/9104.map new file mode 100644 index 00000000..78dfae5b --- /dev/null +++ b/rules/de/a/d4/91/9104.map @@ -0,0 +1,33 @@ +# DE 9104. Neuwittenbek - Kiel-Schusterkrug +# +let ns = path("d4.de.9104"); + +with detail = [4, 5] { + # point.de.Neuwittenbek: de.1020 + + + with link = "point.de.Neuwittenbek-Gr" { + marker(:de.dirgr :right, ns[:nwi.f] >> 1dt); + marker(:statdt :right, ns[:nwi.f] >> 0.5dt); + slabel(:right, ns[:nwi.f - 0.5dt] >> 5dt, + hbox(:left:middle, + vbox(:center:bottom, + span(:regular, " SHK "), + hbar(0.3), + span(:regular, "DB") + ) + ) + ); + } + + + with link = "line.de.9104" { + track(:second, + ns[:nwi.f, :nwi.ys] >> 1dt + .. ns[:nwi.yys, :rat - 1sw] + ); + line_badge(:open, ns[:nwi.yys + 0.7km], "9104"); + } +} + + diff --git a/rules/de/a/d4/91/9105.map b/rules/de/a/d4/91/9105.map index e1407c5e..c24d3295 100644 --- a/rules/de/a/d4/91/9105.map +++ b/rules/de/a/d4/91/9105.map @@ -1,3 +1,6 @@ +# DE 9105. Suchsdorf - Kiel-Scheerhafen +# +let sw = path("d4.de.9105"); with detail = 4 { with link = "point.de.Suchsdorf-NE" { @@ -6,7 +9,7 @@ with detail = 4 { # Gl. 3 with layer = -2 track(:third :station, hasfle[:suc.a + 1.9dl, :suc.a + 2dl] - -- hasfle[:suc.a + 3dl, :awik] >> 1dt + -- hasfle[:suc.a + 3dl, :suc.yw] >> 1dt ); # Gl. 4 @@ -19,8 +22,17 @@ with detail = 4 { marker(:de.bft :open :right, hasfle[:suc - 2dl - 0.3sw] >> 2dt); station(:right :open, hasfle[:suc - 2dl - 0.6sw] >> 2dt >> 1.4sh, span(:bold, "Suchsdorf NE"), - "9105: ??" + "9105: 0,0" ); }; + + + with link = "line.de.9105" { + track(:third, + sw[:suc.yw - 0.1dl, :suc.yw] >> 1dt + .. sw[:suc.yw + 500m, :wik.xa] + ); + line_badge(:open, sw[:suc.yw + 1.35km], "9105"); + } } diff --git a/rules/de/a/d4/a/a05.map b/rules/de/a/d4/a/a05.map new file mode 100644 index 00000000..edb952f2 --- /dev/null +++ b/rules/de/a/d4/a/a05.map @@ -0,0 +1,183 @@ +# DE A05. Husum - Flensburg Weiche +# +let hf = path("d4.de.a05"); + +let hus_wan = vbox(:center:top, + span(:bold, "A05"), + hrule(), + span(:xsmall, " Husum – Fl.W. "), + " ∗ 1926 DR ", + hrule(), + span(:xsmall, " Husum – Wanderup "), + " † 1959 " +); + +let wan_fle = vbox(:center:top, + span(:bold, "A05"), + hrule(), + span(:xsmall, " Husum – Fl.W. "), + " ∗ 1926 DR ", + " ‡ 1959 ", + hrule(), + span(:xsmall, " Wanderup – Fl.W. "), + " † 1970 " +); + +with detail = [4, 5] { + # point.de.Husum de.1210 + + with link = "line.de.A05" { + track(:second :removed, + hf[:hus.a, :hus.a + 1dt] << 3.5dt + .. hf[:hus.aa, :hus.yf] << 1dt + .. hf[:hus.yyf, :swe - 1sw] + ); + line_label(:left:e :removed, hf[:swe - 1.2km], "A05"); + } + + with link = "point.de.Schwesing-Nord" { + track(:second:station :removed, hf[:swe - 1sw, :swe + 1sw]); + marker(:right :de.hp :removed, hf[:swe]); + station(:right :removed, hf[:swe - 0.3sw] >> 1.7sh, + "Schwesing Nord", "5,37" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:swe + 1sw, :imm - 1sw]); + } + + with link = "point.de.Immenstedt-Schlesw" { + track(:second:station :removed, hf[:imm - 1sw, :imm + 1sw]); + marker(:right :de.hst :removed, hf[:imm]); + marker(:right :de.exbf :removed, hf[:imm]); + station(:right :removed, hf[:imm - 0.3sw] >> 1.9sh, + hbox(:left:base, "Immenstedt ", span(:light, "(Schlesw)")), + "10,06" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:imm + 1sw, :vio - 1sw]); + line_box(:left:se :removed, hf[:imm + 1.8km], (0dt, 1sw), hus_wan); + } + + with link = "point.de.Viöl" { + track(:second:station :removed, hf[:vio - 1sw, :vio + 1sw]); + marker(:right :de.hst :removed, hf[:vio]); + marker(:right :de.exbf :removed, hf[:vio]); + station(:right :removed, hf[:vio - 0.3sw] >> 1.9sh, + "Viöl", "13,84" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:vio + 1sw, :has - 1sw]); + } + + with link = "point.de.Haselund" { + track(:second:station :removed, hf[:has - 1sw, :has + 1sw]); + marker(:right :de.hst :removed, hf[:has]); + marker(:right :de.exbf :removed, hf[:has]); + station(:right :removed, hf[:has - 0.3sw] >> 1.7sh, + "Haselund", "16,71" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:has + 1sw, :low.a]); + } + + with link = "point.de.Löwenstedt" { + track(:second:station :removed, hf[:low.a, :low.yb]); + track(:second:station :removed, + hf[:low - 201m, :low - 200m] + .. hf[:low - 130m, :low.yb] << 1dt + ); + marker(:left :de.hst :removed, hf[:low] << 1dt); + marker(:left :de.exbf :removed, hf[:low] << 1dt); + station(:left :removed, hf[:low - 0.1sw] << 2.3sw, + span(:bold, "Löwenstedt"), + hbox(:center:top, + vbox(:right:top, "A06: ", "A05: "), + vbox(:right:top, "13,", "19,"), + vbox(:left:top, "90", "93") + ) + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:low.yb, :jol - 1sw]); + } + + with link = "point.de.Joldelund" { + track(:second:station :removed, hf[:jol - 1sw, :jol + 1sw]); + marker(:left :de.hst :removed, hf[:jol]); + marker(:left :de.exbf :removed, hf[:jol]); + station(:left :removed, hf[:jol - 0.4sw] << 1.7sh, + "Joldelund", "24,79" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:jol + 1sw, :sil - 1sw]); + line_box(:right:nw :removed, hf[:sil - 0.8km], (-1.0sw, 0dt), hus_wan); + } + + with link = "point.de.Sillerup" { + track(:second:station :removed, hf[:sil - 1sw, :sil + 1sw]); + marker(:left :de.hst :removed, hf[:sil]); + marker(:left :de.exbf :removed, hf[:sil]); + station(:top :removed, hf[:sil] << 1.6sh, + "Sillerup", "28,97" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:sil + 1sw, :gwi - 1sw]); + } + + with link = "point.de.Großenwiehe" { + track(:second:station :removed, hf[:gwi - 1sw, :gwi + 1sw]); + marker(:left :de.hp :removed, hf[:gwi]); + marker(:left :de.exbf :removed, hf[:gwi]); + station(:top :removed, hf[:gwi] << 1.5sh, + "Großenwiehe", "31,75" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:gwi + 1sw, :wan - 1sw]); + } + + with link = "point.de.Wanderup" { + track(:second:station :removed, hf[:wan - 1sw, :wan + 1sw]); + marker(:right :de.hst :removed, hf[:wan]); + marker(:right :de.exbf :removed, hf[:wan]); + station(:right :removed, hf[:wan - 0.1sw] >> 2.3sh, + "Wanderup", "37,03" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:wan + 1sw, :hau - 1sw]); + } + + with link = "point.de.Haurup" { + track(:second:station :removed, hf[:hau - 1sw, :hau + 1sw]); + marker(:right :de.hp :removed, hf[:hau]); + marker(:right :de.exbf :removed, hf[:hau]); + station(:left :removed, hf[:hau - 0.4sw] << 1.5dt, + "Haurup", "40,17" + ); + } + + with link = "line.de.A05" { + with layer = -4 track(:second :removed, + hf[:hau + 1sw, :flw.aal] + .. path("d4.de.1040")[:fws + 10dl, :flw.wr2 - 7dl] << 12dt + ); + line_box(:left:se :removed, hf[:hau + 1.3km], (0dt, 1sw), wan_fle); + } +} + diff --git a/rules/de/a/d4/a/a06.map b/rules/de/a/d4/a/a06.map new file mode 100644 index 00000000..d4b86a6f --- /dev/null +++ b/rules/de/a/d4/a/a06.map @@ -0,0 +1,68 @@ +# DE A06. Bredstedt - Löwenstedt +# +let bl = path("d4.de.a06"); + +let bre_low = vbox(:center:top, + span(:bold, "A06"), + hrule(), + hbox(:center:top, + vbox(:center:top, " ∗ ", " † "), + vbox(:left:top, "1928 DR ", "1942 ") + ) +); + +with detail = [4, 5] { + # point.de.Bredstedt de.1210 + + with link = "line.de.A06" { + track(:second :removed, + bl[:bre.yl - 0.1dl, :bre.yl] << 1.5dt + .. bl[:bre.bb + 2dt, :dre - 1sw] + ); + } + + with link = "point.de.Drelsdorf" { + track(:second:station :removed, bl[:dre - 1sw, :dre + 1sw]); + marker(:right :de.hst :removed, bl[:dre]); + marker(:right :de.exbf :removed, bl[:dre]); + station(:bottom :removed, bl[:dre] >> 1.5sh, + "Drelsdorf", "4,81" + ); + } + + with link = "line.de.A06" { + track(:second :removed, bl[:dre + 1sw, :kol - 1sw]); + line_box(:left:s :removed, bl[:dre + 2.2km], (-1sw, 0dt), bre_low); + } + + with link = "point.de.Kolkerheide" { + track(:second:station :removed, bl[:kol - 1sw, :kol + 1sw]); + marker(:right :de.hp :removed, bl[:kol]); + marker(:right :de.exbf :removed, bl[:kol]); + station(:bottom :removed, bl[:kol] >> 1.5sh, + "Kolkerheide", "8,82" + ); + } + + with link = "line.de.A06" { + track(:second :removed, bl[:kol + 1sw, :kod - 1sw]); + } + + with link = "point.de.Kolkerheide" { + track(:second:station :removed, bl[:kod - 1sw, :kod + 1sw]); + marker(:left :de.hp :removed, bl[:kod]); + station(:top :removed, bl[:kod] << 1.2sh, + "Kolkerheide Dorf", "c10,7" + ); + } + + with link = "line.de.A06" { + track(:second :removed, + bl[:kod + 1sw, :low.yyb - 2dt] + .. bl[:low.yb, :low.yb + 0.1dl] >> 1dt + ); + } + + # point.de.Löwenstedt de.A05 +} + diff --git a/rules/de/a/d4/a/a12.map b/rules/de/a/d4/a/a12.map new file mode 100644 index 00000000..4fd314e4 --- /dev/null +++ b/rules/de/a/d4/a/a12.map @@ -0,0 +1,35 @@ +# DE A12. Eggebek Gabelung - Sollbrück Gabelung +# +let as = path("d4.de.a12"); + +with detail = [4, 5] { + with link = "line.de.A12" { + track(:first :gone, + as[:egg.yo - 0.1dl, :egg.yo] >> 0.5dt + .. as[:egg.yyo + 2dt, :sol - 1sw] + ); + + line_box(:right:se :gone, as[:egg.yyo + 4km], (0dt, 2dt), + vbox(:center:top, + span(:bold, "A12"), + hrule(), + span(:xsmall, " (Flensburg – Husum) "), + " ∗ 1854 S.sl E ", + " † 1869 " + ) + ); + } + + with link = "point.de.Sollerup" { + track(:first:station :gone, as[:sol - 1sw, :sol + 1sw]); + marker(:left :de.bf :gone, as[:sol]); + station(:left :gone, as[:sol + 0.5sw] >> 1.5dt, + "Sollerup", "??" + ); + } + + with link = "line.de.A12" { + track(:first :gone, as[:sol + 1sw, :sog.ye]); + } +} + diff --git a/rules/de/a/d4/a/af1.map b/rules/de/a/d4/a/af1.map index 6b297731..21c51fd9 100644 --- a/rules/de/a/d4/a/af1.map +++ b/rules/de/a/d4/a/af1.map @@ -2,7 +2,35 @@ # let fk = path("d4.de.af1"); -with detail = 4 { +let fleglu = vbox(:center:top, + span(:bold, "AF1"), + hrule(), + span(:xsmall, " Flensburg – Glücksburg "), + " ∗ 1885 Fl.Kb. ", + hrule(), + span(:xsmall, " Flensburg – Streichmühle "), + " † 1953 " +); +let glustr = vbox(:center:top, + span(:bold, "AF1"), + hrule(), + span(:xsmall, " Glücksburg – Kappeln "), + " ∗ 1886 Fl.Kb. ", + hrule(), + span(:xsmall, " Flensburg – Streichmühle "), + " † 1953 " +); +let strkap = vbox(:center:top, + span(:bold, "AF1"), + hrule(), + span(:xsmall, " Glücksburg – Kappeln "), + " ∗ 1886 Fl.Kb. ", + hrule(), + span(:xsmall, " Streichmühle – Kappeln "), + " † 1952 " +); + +with detail = [4, 5] { with link = "point.de.Flensburg-Kreisb" { track(:third:station :narrow:g1000 :removed, fk[:fkr - 0.5sw, :fkr.f] >> 1dt @@ -24,7 +52,6 @@ with detail = 4 { ); } - with link = "line.de.AF1" { track(:third :narrow:g1000 :removed, fk[:fkr.f, :fkr.f + 50m] >> 1dt @@ -33,7 +60,6 @@ with detail = 4 { ); } - with link = "point.de.Engelsby" { track(:third:station :narrow:g1000 :removed, fk[:eng - 1sw, :eng + 1sw] @@ -48,5 +74,324 @@ with detail = 4 { ) ); } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:eng + 1sw, :kau - 1sw]); + } + + with link = "point.de.Kauslund" { + track(:third:station :narrow:g1000 :removed, + fk[:kau - 1sw, :kau + 1sw] + ); + marker(:right :de.zst :removed, fk[:kau]); + station(:bottom :removed, fk[:kau] >> 1.2sh, + "Kauslund", "3,7" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:kau + 1sw, :wee - 1sw]); + } + + with link = "point.de.Wees" { + track(:third:station :narrow:g1000 :removed, + fk[:wee - 1sw, :wee + 1sw] + ); + marker(:right :de.bf :removed, fk[:wee]); + station(:right :removed, fk[:wee] + (0.4sw, 2.0sh), + "Wees", "4,8" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed :flip, + fk[:wee + 1.3km, :wee + 1sw] + ); + line_box(:left:e :removed, fk[:wee + 1.3km], fleglu); + track(:third :narrow:g1000 :removed, fk[:wee + 1.3km, :rot - 1sw]); + } + + with link = "point.de.Rothenhaus" { + track(:third:station :narrow:g1000 :removed, + fk[:rot - 1sw, :rot + 1sw] + ); + marker(:right :de.bf :removed, fk[:rot]); + station(:right :removed, fk[:rot] + (1.2sw, 1.1sh), + "Rothenhaus", "7,3" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:rot + 1sw, :glu - 1sw]); + } + + with link = "point.de.Glücksburg" { + track(:third:station :narrow:g1000 :removed, + fk[:glu - 1sw, :glu + 1sw] + ); + marker(:right :de.bf :removed, fk[:glu]); + station(:right :removed, fk[:glu] + (0.5sw, 0sw), + hbox(:left:base, "Glücksburg", span(:light, " (Kr Flensburg)")), + "9,9" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:glu + 1sw, :rud - 1sw]); + } + + with link = "point.de.Rüde" { + track(:third:station :narrow:g1000 :removed, + fk[:rud - 1sw, :rud + 1sw] + ); + marker(:left :de.zst :removed, fk[:rud]); + station(:top :removed, fk[:rud + 0.05sw] << 1.3sw, + "Rüde", "12,1" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:rud + 1sw, :rin - 1sw]); + } + + with link = "point.de.Ringsberg" { + track(:third:station :narrow:g1000 :removed, + fk[:rin - 1sw, :rin + 1sw] + ); + marker(:left :de.bf :removed, fk[:rin]); + station(:top :removed, fk[:rin] << 1.3sw, + " Ringsberg", "14,4" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed :flip, fk[:rin + 1km, :rin + 1sw]); + line_box(:right:ne :removed, fk[:rin + 1.0km], (1.0sw, 0sw), glustr); + track(:third :narrow:g1000 :removed, fk[:rin + 1km, :lan - 1sw]); + } + + with link = "point.de.Langballig" { + track(:third:station :narrow:g1000 :removed, + fk[:lan - 1sw, :lan + 1sw] + ); + marker(:left :de.bf :removed, fk[:lan]); + station(:top :removed, fk[:lan] << 1.1sw, + "Langballig", "17,3" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:lan + 1sw, :str - 1sw]); + } + + with link = "point.de.Streichmühle" { + track(:third:station :narrow:g1000 :removed, + fk[:str - 1sw, :str + 1sw] + ); + marker(:left :de.bf :removed, fk[:str]); + station(:top :removed, fk[:str] << 1.1sw, + " Streichmühle", "19,7" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:str + 1sw, :dol - 1sw]); + } + + with link = "point.de.Dollerup" { + track(:third:station :narrow:g1000 :removed, + fk[:dol - 1sw, :dol + 1sw] + ); + marker(:left :de.bf :removed, fk[:dol]); + station(:left :removed, fk[:dol] + (-0.4sw, 0.4sw), + "Dollerup", "21,2" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:dol + 1sw, :nub - 1sw]); + } + + with link = "point.de.Nübelfeld" { + track(:third:station :narrow:g1000 :removed, + fk[:nub - 1sw, :nub + 1sw] + ); + marker(:right :de.bf :removed, fk[:nub]); + station(:bottom :removed, fk[:nub] >> 1.3sh, + "Nübelfeld", "24,4" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed :flip, fk[:nub + 1km, :nub + 1sw]); + line_box(:left:sw :removed, fk[:nub + 1.0km], (-2sw, 0dt), strkap); + track(:third :narrow:g1000 :removed, fk[:nub + 1km, :stk - 1sw]); + } + + with link = "point.de.Steinbergkirche" { + track(:third:station :narrow:g1000 :removed, + fk[:stk - 1sw, :stk + 1sw] + ); + marker(:right :de.bf :removed, fk[:stk]); + station(:bottom :removed, fk[:stk] >> 1.3sh, + "Steinbergkirche", "27,3" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:stk + 1sw, :ste - 1sw]); + } + + with link = "point.de.Steinberg-Flensburg" { + track(:third:station :narrow:g1000 :removed, + fk[:ste - 1sw, :ste + 1sw] + ); + marker(:left :de.bf :removed, fk[:ste]); + station(:top :removed, fk[:ste] << 1.3sh, + hbox(:center:base, "Steinberg", span(:light, " (Kr Flensburg)")), + "28,9" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:ste + 1sw, :nie - 1sw]); + } + + with link = "point.de.Niesgrau" { + track(:third:station :narrow:g1000 :removed, + fk[:nie - 1sw, :nie + 1sw] + ); + marker(:left :de.bf :removed, fk[:nie]); + station(:top :removed, fk[:nie] << 1.2sh, + "Niesgrau", "31,5" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:nie + 1sw, :sta - 1sw]); + } + + with link = "point.de.Stausmark" { + track(:third:station :narrow:g1000 :removed, + fk[:sta - 1sw, :sta + 1sw] + ); + marker(:left :de.bf :removed, fk[:sta]); + station(:right :removed, fk[:sta + 0.4sw] << 1.25sh, + "Stausmark", "32,3" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:sta + 1sw, :run.ys]); + line_label(:right:e :removed, fk[:sta + 0.7km], "AF1"); + } + + with link = "point.de.Rundhof" { + track(:third:station :narrow:g1000 :removed, + fk[:run.ys, :run + 1sw] + ); + marker(:right :de.bf :removed, fk[:run]); + station(:right :removed, fk[:run] + (-0.3sw, 2.1sw), + span(:bold, "Rundhof"), + hbox(:center:top, + vbox(:right:top, "AF1: ", "AF2: "), + vbox(:right:top, "34,", "49,"), + vbox(:left:top, "2", "5") + ) + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:run + 1sw, :leh - 1sw]); + line_label(:right:w :removed, fk[:run + 1.3km], "AF1"); + } + + with link = "point.de.Lehbek" { + track(:third:station :narrow:g1000 :removed, + fk[:leh - 1sw, :leh + 1sw] + ); + marker(:right :de.bf :removed, fk[:leh]); + station(:bottom :removed, fk[:leh] >> 1.4sh + (0.5sw, 0sw), + "Lehbek", "36,9" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:leh + 1sw, :gel - 1sw]); + } + + with link = "point.de.Gelting" { + track(:third:station :narrow:g1000 :removed, + fk[:gel - 1sw, :gel + 1sw] + ); + marker(:left :de.bf :removed, fk[:gel]); + station(:top :removed, fk[:gel] << 1.2sh, + "Gelting", "38,3" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:gel + 1sw, :stp - 1sw]); + } + + with link = "point.de.Stenderup" { + track(:third:station :narrow:g1000 :removed, + fk[:stp - 1sw, :stp + 1sw] + ); + marker(:right :de.bf :removed, fk[:stp]); + station(:right :removed, fk[:stp + 0.4sw] << 0.4sh, + "Stenderup", "41,4" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:stp + 1sw, :swa - 1sw]); + line_label(:left:w :removed, fk[:stp + 1.0km], "AF1"); + } + + with link = "point.de.Schwackendorf" { + track(:third:station :narrow:g1000 :removed, + fk[:swa - 1sw, :swa + 1sw] + ); + marker(:left :de.bf :removed, fk[:swa]); + station(:right :removed, fk[:swa + 0.4sw] << 1.3sh, + "Schwackendorf", "43,2" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed :flip, fk[:swa + 1km, :swa + 1sw]); + line_box(:right:e :removed, fk[:swa + 1.0km], (0dt, 1.5sw), strkap); + track(:third :narrow:g1000 :removed, fk[:swa + 1km, :rab - 1sw]); + } + + with link = "point.de.Rabel" { + track(:third:station :narrow:g1000 :removed, + fk[:rab - 1sw, :rab + 1sw] + ); + marker(:left :de.bf :removed, fk[:rab]); + station(:right :removed, fk[:rab + 0.55sw] << 1.3sh, + "Rabel", "45,9" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:rab + 1sw, :gri - 1sw]); + } + + with link = "point.de.Grimsnis" { + track(:third:station :narrow:g1000 :removed, + fk[:gri - 1sw, :gri + 1sw] + ); + marker(:right :de.hp :removed, fk[:gri]); + station(:left :removed, fk[:gri + 0.4sw] >> 1.4sh, + "Grimsnis", "47,6" + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:gri + 1sw, :kap.a]); + line_label(:right:ne :removed, fk[:gri + 0.6km], "AF1"); + } } diff --git a/rules/de/a/d4/a/af2.map b/rules/de/a/d4/a/af2.map index 9b82d449..48d35ece 100644 --- a/rules/de/a/d4/a/af2.map +++ b/rules/de/a/d4/a/af2.map @@ -5,29 +5,56 @@ let fr = path("d4.de.af2"); with detail = 4 { # point.de.Flensburg-Kreisb: de.AF1 - with link = "line.de.AF2" { track(:third :narrow:g1000 :removed, fr[:fkr.f, :fkr.f + 50m] >> 2dt - .. fr[:xkr, :asat] >> 1dt - .. fr[:aa + 1sw, :gta - 1sw] + .. fr[:xkr, :fru - 1sw] >> 1dt ); } - with link = "point.de.Fruerlund" { + track(:third:station :narrow:g1000 :removed, + fr[:fru - 1sw, :fru + 1sw] >> 1dt + ); marker(:right :de.zst :removed, fr[:fru] >> 1dt); station(:right :removed, fr[:fru + 0.7sw] << 1dt, "Fruerlund", "1,5" ); } + with link = "line.de.AF2" { + track(:third :narrow:g1000 :removed, + fr[:fru + 1sw, :asat] >> 1dt + .. fr[:gta - 1.1sw, :gta - 1sw] + ); + } with link = "point.de.Groß-Tarup" { track(:third:station :narrow:g1000 :removed, fr[:gta - 1sw, :gta + 1sw] ); marker(:right :de.zst :removed, fr[:gta]); + station(:right :removed, fr[:gta] + (0.25km, 0.3km), + "Groß Tarup", "3,0" + ); + } + + with link = "line.de.AF2" { + track(:third :narrow:g1000 :removed, fr[:gta + 1sw, :tas - 1sw]); + } + + with link = "point.de.Tastrup" { + track(:third:station :narrow:g1000 :removed, + fr[:tas - 1sw, :tas + 1sw] + ); + marker(:right :de.zst :removed, fr[:tas]); + station(:right :removed, fr[:tas] << 1.5dt, + "Tastrup", "4,9" + ); + } + + with link = "line.de.AF2" { + track(:third :narrow:g1000 :removed, fr[:tas + 1sw, :hur - 1sw]); } } diff --git a/rules/de/a/d4/a/ax1.map b/rules/de/a/d4/a/ax1.map new file mode 100644 index 00000000..e249e9b4 --- /dev/null +++ b/rules/de/a/d4/a/ax1.map @@ -0,0 +1,14 @@ +# DE AX1. Norderstapel Kreisb - Norderstapel +# +let bh = path("d4.de.1012"); +let sf = path("d4.de.9103"); + +with detail = [4, 5] { + with link = "line.de.AX1" { + track(:station :removed, + sf[:nor.yn - 0.1dl, :nor.yn] >> 1dt + .. bh[:nor, :nor + 0.1dl] >> 1dt + ); + } +} + diff --git a/rules/de/a/d4/as/a05.map b/rules/de/a/d4/as/a05.map deleted file mode 100644 index 8780c059..00000000 --- a/rules/de/a/d4/as/a05.map +++ /dev/null @@ -1,18 +0,0 @@ -# DE A05. Husum - Flensburg Weiche -# -let hf = path("d4.de.a05"); - -with detail = [4, 5] { - # ... - - with link = "line.de.A05" { - with layer = -4 track(:second :removed, - hf[:hau - 1sw, :ff] - .. path("d4.de.1040")[:fws + 10dl, :flw.wr2 - 7dl] << 12dt - ); - } - - - # ... -} - diff --git a/rules/de/a/d5/10/1020.map b/rules/de/a/d5/10/1020.map index 20a28f8e..67c75213 100644 --- a/rules/de/a/d5/10/1020.map +++ b/rules/de/a/d5/10/1020.map @@ -39,7 +39,7 @@ with detail = 5 { .. hasfle[:suc + 180m, :suc + 181m] ); # Gl. 2 - track(:second :station :pax, hasfle[:suc.a, :awik]); + track(:second :station :pax, hasfle[:suc.a, :suc.yw]); marker(:de.bf :left, hasfle[:suc] << 1dt); station(:left :right_align, hasfle[:suc - .4sw] << 1dt << 1.3sh, @@ -56,7 +56,7 @@ with detail = 5 { # Gl. 3 with layer = -2 track(:third :station, hasfle[:suc.a + 59m, :suc.a + 60m] - .. hasfle[:suc.a + 100m, :awik] >> 1dt + .. hasfle[:suc.a + 100m, :suc.yw] >> 1dt ); # Gl. 4 @@ -75,7 +75,7 @@ with detail = 5 { with link = "line.de.1020" { - track(:second :pax, hasfle[:awik, :lev - 1sw]); + track(:second :pax, hasfle[:suc.yw, :lev - 1sw]); } diff --git a/rules/de/w/d2/11.map b/rules/de/w/d2/11.map index 3b59d49b..453420fb 100644 --- a/rules/de/w/d2/11.map +++ b/rules/de/w/d2/11.map @@ -100,14 +100,18 @@ with detail = 2 { let wb = path("d2.de.w.1151"); with link = "line.de.1151" { - with layer = -4 track(:first :removed, wb[:wit.f, :dog]); - - with layer = 1 line_badge(:removed, wb[:dom - 15.0km], "1151"); + track(:first :removed, wb[:wit.f, :dom.a]); + line_label(:right:sw :removed, wb[:dom - 15.0km], "1151"); } with link = "point.de.Dömitz" { - with layer = 1 marker(:statdot :removed, wb[:dom]); + track(:first :station :removed, wb[:dom.a, :dom]); + statdot(:removed, wb[:dom]); slabel(:left :removed, wb[:dom] + (0.8dt, -1.6dt), "Dömitz"); } + + with link = "line.de.1151" { + track(:first :removed, wb[:dom, :dog]); + } } diff --git a/rules/de/w/d3/11/1122.map b/rules/de/w/d3/11/1122.map index 75a7be60..c4c91f0b 100644 --- a/rules/de/w/d3/11/1122.map +++ b/rules/de/w/d3/11/1122.map @@ -1,44 +1,34 @@ # DE 1122. Lübeck Hbf - Strasburg (Meckl) # -let ls = path("d4.de.w.1122"); +let ls = path("d3.de.w.1122"); with detail = 3 { - with link = "point.de.Herrnburg-LGr" { - track(:first:station :pax, ls[:heg - 0.5ssw, :heg + 0.5ssw] >> 0.5dt); - track(:first:station :removed, - ls[:heg - 0.5ssw, :heg + 0.5ssw] << 0.5dt - ); - with layer = -4 marker(:de.dirgr :removed :right, ls[:heg] << 0.5dt); - with layer = -4 marker(:de.dirgr :removed :left, ls[:heg] >> 0.5dt); - } + # DE-A with link = "line.de.1122" { - track(:first :pax, ls[:heg + 0.5ssw, :her - 1ssw] >> 0.5dt); - track(:first :removed, ls[:heg + 0.5ssw, :her - 1ssw] << 0.5dt); + track(:first :pax, ls[:heg + 0.5sw, :her - 1sw] >> 0.5dt); + track(:first :removed, ls[:heg + 0.5sw, :her - 1sw] << 0.5dt); } with link = "point.de.Herrnburg" { - track(:first:station :pax, ls[:her - 1ssw, :her + 1ssw] >> 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:her - 1ssw, :her + 1ssw] << 0.5dt - ); + track(:first:station :pax, ls[:her - 1sw, :her + 1sw] >> 0.5dt); + track(:first:station :removed, ls[:her - 1sw, :her + 1sw] << 0.5dt); marker(:de.bf :pax :right, ls[:her] >> 0.5dt); - slabel(:bottom :pax, ls[:her] >> 0.5dt >> 1.4ssw, "Herrnburg"); + slabel(:bottom :pax, ls[:her] >> 0.5dt >> 1.3sh, "Herrnburg"); } with link = "line.de.1122" { - track(:first :pax, ls[:her + 1ssw, :lud - 1ssw] >> 0.5dt); - track(:first :removed, ls[:her + 1ssw, :lud - 1ssw] << 0.5dt); + track(:first :pax, ls[:her + 1sw, :lud - 1sw] >> 0.5dt); + track(:first :removed, ls[:her + 1sw, :lud - 1sw] << 0.5dt); + line_label(:left:s :pax, ls[:her + 2km] << 0.5dt, "1122"); } with link = "point.de.Lüdersdorf-Meckl" { - track(:first:station :pax, ls[:lud - 1ssw, :lud + 1ssw] >> 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:lud - 1ssw, :lud + 1ssw] << 0.5dt - ); + track(:first:station :pax, ls[:lud - 1sw, :lud + 1sw] >> 0.5dt); + track(:first:station :removed, ls[:lud - 1sw, :lud + 1sw] << 0.5dt); marker(:de.hp :pax :right, ls[:lud] >> 0.5dt); - with layer = -4 marker(:de.bf :removed :right, ls[:lud] >> 0.5dt); - slabel(:bottom :pax, ls[:lud] >> 0.5dt >> 1.2ssw, + marker(:de.exbf :pax :right, ls[:lud] >> 0.5dt); + slabel(:bottom :pax, ls[:lud] >> 0.5dt >> 1.7sh, vbox(:center:top, span(:regular, "Lüdersdorf"), span(:light, "(Meckl)") @@ -47,9 +37,9 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :pax, ls[:lud + 1ssw, :son - 1ssw] >> 0.5dt); - track(:first :removed, ls[:lud + 1ssw, :son - 1ssw] << 0.5dt); - with layer = 1 line_badge(:pax, ls[:lud + 5.0km], "1122"); + track(:first :pax, ls[:lud + 1sw, :son - 1sw] >> 0.5dt); + track(:first :removed, ls[:lud + 1sw, :son - 1sw] << 0.5dt); + line_label(:right:n :pax, ls[:son - 3km] >> 0.5dt, " 1122"); } with link = "point.de.Schönberg-Meckl" { @@ -68,38 +58,34 @@ with detail = 3 { with link = "line.de.1122" { track(:first :pax, - ls[:snn + 1ssw, :men.xaa] >> 0.5dt - -- ls[:men.xaa + 1dl, :men - 1ssw] << 0.5dt + ls[:snn + 1sw, :men.xaa] >> 0.5dt + -- ls[:men.xaa + 1dl, :men - 1sw] << 0.5dt ); with layer = -4 track(:first :removed, - ls[:snn + 1ssw, :men.xaa + 1dl] << 0.5dt + ls[:snn + 1sw, :men.xaa + 1dl] << 0.5dt ); with layer = -4 track(:first :removed, - ls[:men.xaa, :men - 1ssw] >> 0.5dt + ls[:men.xaa, :men - 1sw] >> 0.5dt ); } with link = "point.de.Menzendorf" { - track(:first:station :pax, ls[:men - 1ssw, :mnn + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:men - 1ssw, :mnn + 1ssw] >> 0.5dt - ); - with layer = -5 marker(:de.bbf :right, ls[:men] >> 0.5dt); - slabel(:bottom, ls[:men] >> 0.5dt >> 1.2ssw, "Menzendorf"); + track(:first:station :pax, ls[:men - 1sw, :mnn + 1sw] << 0.5dt); + track(:first:station :removed, ls[:men - 1sw, :mnn + 1sw] >> 0.5dt); + marker(:de.bbf :right, ls[:men] >> 0.5dt); + slabel(:bottom, ls[:men] >> 0.5dt >> 1.2sh, "Menzendorf"); } with link = "line.de.1122" { - track(:first :pax, ls[:men + 1ssw, :gri - 1ssw] << 0.5dt); - track(:first :removed, ls[:men + 1ssw, :gri - 1ssw] >> 0.5dt); + track(:first :pax, ls[:men + 1sw, :gri - 1sw] << 0.5dt); + track(:first :removed, ls[:men + 1sw, :gri - 1sw] >> 0.5dt); } with link = "point.de.Grieben-Meckl" { - track(:first:station :pax, ls[:gri - 1ssw, :gri + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:gri - 1ssw, :gri + 1ssw] >> 0.5dt - ); + track(:first:station :pax, ls[:gri - 1sw, :gri + 1sw] << 0.5dt); + track(:first:station :removed, ls[:gri - 1sw, :gri + 1sw] >> 0.5dt); marker(:de.bf :pax :left, ls[:gri] << 0.5dt); - slabel(:top :pax, ls[:gri] << 0.5dt << 1.4ssw, + slabel(:top :pax, ls[:gri] << 0.5dt << 1.2sh, vbox(:center:bottom, span(:regular, "Grieben"), span(:light, "(Meckl)") @@ -108,121 +94,184 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :pax, ls[:gri + 1ssw, :bor - 1ssw] << 0.5dt); - track(:first :removed, ls[:gri + 1ssw, :bor - 1ssw] >> 0.5dt); + track(:first :pax, ls[:gri + 1sw, :bor - 1sw] << 0.5dt); + track(:first :removed, ls[:gri + 1sw, :bor - 1sw] >> 0.5dt); } with link = "point.de.Börzow" { - track(:first:station :pax, ls[:bor - 1ssw, :bor + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:bor - 1ssw, :bor + 1ssw] >> 0.5dt - ); - with layer = -4 marker(:de.bf :removed :left, ls[:bor] << 0.5dt); - slabel(:bottom :removed, ls[:bor] >> 1.5dt, "Börzow"); + track(:first:station :pax, ls[:bor - 1sw, :bor + 1sw] << 0.5dt); + track(:first:station :removed, ls[:bor - 1sw, :bor + 1sw] >> 0.5dt); + marker(:de.bf :removed :left, ls[:bor] << 0.5dt); + slabel(:top :removed, ls[:bor] << 0.5dt << 1.2sh, "Börzow"); } with link = "line.de.1122" { - track(:first :pax, ls[:bor + 1ssw, :gre - 1ssw] << 0.5dt); - track(:first :removed, ls[:bor + 1ssw, :gre - 1ssw] >> 0.5dt); + track(:first :pax, ls[:bor + 1sw, :gre - 1sw] << 0.5dt); + track(:first :removed, ls[:bor + 1sw, :gre - 1sw] >> 0.5dt); + line_label(:right:n :pax, ls[:bor + 2km] >> 0.5dt, "1122"); } with link = "point.de.Grevesmühlen" { - track(:first:station :pax, ls[:gre - 1ssw, :gre + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:gre - 1ssw, :gre + 1ssw] >> 0.5dt + # DE 1122 + track(:first:station :pax, ls[:gre - 1sw, :gre + 1sw] << 0.5dt); + track(:first:station :removed, ls[:gre - 1sw, :gre + 1sw] >> 0.5dt); + + # DE 6931 + track(:second :station :removed, + ls[:gre - 1sw, :gre - 0.5sw - 1dl] << 1.5dt + -- ls[:gre - 0.5sw, :gre - 0.49sw] << 0.5dt ); + marker(:de.bf :pax :left, ls[:gre] << 0.5dt); - slabel(:right :pax, ls[:gre - 1.5ssw] << 0.5dt << 1.6ssw, + slabel(:right :pax, ls[:gre - 1.5sw] << 0.5dt << 1.4sh, span(:bold, "Grevesmühlen") ); } with link = "line.de.1122" { - track(:first :pax, ls[:gre + 1ssw, :plu - 1ssw] << 0.5dt); - track(:first :removed, ls[:gre + 1ssw, :plu - 1ssw] >> 0.5dt); + track(:first :pax, ls[:gre + 1sw, :plu - 1sw] << 0.5dt); + track(:first :removed, ls[:gre + 1sw, :plu - 1sw] >> 0.5dt); } with link = "point.de.Plüschow" { - track(:first:station :pax, ls[:plu - 1ssw, :pln + 1ssw] << 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:plu - 1ssw, :pln + 1ssw] >> 0.5dt - ); - with layer = -4 marker(:de.bf :removed :right, ls[:plu] >> 0.5dt); + track(:first:station :pax, ls[:plu - 1sw, :pln + 1sw] << 0.5dt); + track(:first:station :removed, ls[:plu - 1sw, :pln + 1sw] >> 0.5dt); + marker(:de.bf :removed :right, ls[:plu] >> 0.5dt); marker(:de.hp :pax :left, ls[:pln] << 0.5dt); - slabel(:top :pax, ls[:pln] << 0.5dt << 1.2ssw + (1ssw, 0ssw), + slabel(:top :pax, ls[:pln] << 0.5dt << 1.1sh + (1sw, 0sw), "Plüschow" ); } with link = "line.de.1122" { track(:first :pax, - ls[:pln + 1ssw, :pln + 1.1ssw] << 0.5dt - -- ls[:pln + 1ssw + 1dl, :bob - 1ssw] >> 0.5dt + ls[:pln + 1sw, :pln + 1.1sw] << 0.5dt + -- ls[:pln + 1sw + 1dl, :bob - 1sw] >> 0.5dt ); with layer = -4 track(:first :removed, - ls[:pln + 1ssw, :pln + 1ssw + 1dl] >> 0.5dt + ls[:pln + 1sw, :pln + 1sw + 1dl] >> 0.5dt ); with layer = -4 track(:first :removed, - ls[:pln + 1ssw, :bob - 1ssw] << 0.5dt + ls[:pln + 1sw, :bob - 1sw] << 0.5dt ); - with layer = 1 line_badge(:pax, ls[:bob - 2.4km], "1122"); + line_label(:right:ne :pax, ls[:bob - 2.4km] >> 0.5dt, "1122"); } with link = "point.de.Bobitz" { - track(:first:station :pax, ls[:bob - 1ssw, :bob + 1ssw] >> 0.5dt); - with layer = -4 track(:first:station :removed, - ls[:bob - 1ssw, :bob + 1ssw] << 0.5dt - ); + track(:first:station :pax, ls[:bob - 1sw, :bob + 1sw] >> 0.5dt); + track(:first:station :removed, ls[:bob - 1sw, :bob + 1sw] << 0.5dt); marker(:de.bf :pax :right, ls[:bob] >> 0.5dt); - slabel(:bottom :pax, ls[:bob - 0.3ssw] >> 0.5dt >> 1.8ssw, "Bobitz"); + slabel(:bottom :pax, ls[:bob - 0.3sw] >> 0.5dt >> 1.8sh, "Bobitz"); } with link = "line.de.1122" { - track(:first :pax, ls[:bob + 1ssw, :kle.a] >> 0.5dt); - track(:first :removed, ls[:bob + 1ssw, :kle.a] << 0.5dt); + track(:first :pax, ls[:bob + 1sw, :ram - 0.5sw] >> 0.5dt); + track(:first :removed, ls[:bob + 1ssw, :ram - 0.5sw] << 0.5dt); } with link = "point.de.Rambow" { - with layer = -4 marker(:de.bk :removed :left, ls[:ram] << 0.5dt); + track(:first:station :pax, ls[:ram - 0.5sw, :ram + 0.5sw] >> 0.5dt); + track(:first:station :removed, ls[:ram - 0.5sw, :ram + 0.5sw] << 0.5dt); + marker(:de.bk :removed :left, ls[:ram] << 0.5dt); + slabel(:right :removed :light, ls[:ram + 0.7sw] << 0.5dt << 1.2sh, + "Rambow*" + ); } - # point.de.Bad-Kleinen de.6441 + with link = "line.de.1122" { + track(:first :removed, ls[:ram + 0.5sw, :kle.yl] << 0.5dt); + track(:first :pax, ls[:ram + 0.5sw, :kle.yl] >> 0.5dt); + } + + with link = "point.de.Bad-Kleinen" { + track(:first :station :cat:ac15 :pax, + ls[:kle.yl, :kle - 0.5sw - 2dl] << 0.5dt + -- ls[:kle - 0.5sw, :kle + 1sw] << 0.5sh << 1dt + ); + track(:first :station :cat:ac15 :pax, + ls[:kle - 0.5sw - 1dl, :kle + 1sw] << 0.5sh + ); + track(:first :station :cat:ac15 :pax, + ls[:kle.yl, :kle - 0.5sw - 2dl] >> 0.5dt + -- ls[:kle - 0.5sw - 1dl, :kle + 1sw] >> 0.5sh + ); + + marker(:left :de.inbf :cat:ac15 :pax, ls[:kle] >> 0.5sh); + slabel(:right :cat:ac15 :pax, ls[:kle - 0.5sw] >> 0.5sh >> 0.5dt, + hbox(:left:top :bold, "Bad Kleinen") + ); + } with link = "line.de.1122" { - track(:first :double :cat:ac15 :pax, ls[:kle.f, :ven - 1ssw]); + track(:first :leftother:rightsame :cat:ac15 :pax, + ls[:kle + 1sw, :kle + 1.1sw] << 0.5sh + .. ls[:kle.yb - 0.1dl, :kle.yb] << 0.5dt + ); + track(:first :leftsame :cat:ac15 :pax, + ls[:kle + 1sw, :kle + 1.1sw] >> 0.5sh + .. ls[:kle.yb - 0.1dl, :kle.yb] >> 0.5dt + ); + track(:first :double :cat:ac15 :pax, ls[:kle.yb, :hvi - 0.5sw]); } with link = "point.de.Hohen-Viechteln" { - with layer = -4 marker(:de.bk :removed :left, ls[:hvi] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ls[:hvi - 0.5sw, :hvi + 0.5sw] + ); + marker(:de.bk :removed :left, ls[:hvi] << 0.5dt); + slabel(:right :removed :light, ls[:hvi - 0.3sw] >> 1dt, + vbox(:left:top, "Hohen", " Viechteln") + ); + } + + with link = "line.de.1122" { + track(:first :double :cat:ac15 :pax, ls[:hvi + 0.5sw, :ven - 1sw]); } with link = "point.de.Ventschow" { track(:first:station :double :cat:ac15 :pax, - ls[:ven - 1ssw, :ven + 1ssw] + ls[:ven - 1sw, :ven + 1sw] ); marker(:de.hp :cat:ac15 :pax :right, ls[:ven] >> 0.5dt); - marker(:de.uest :cat:ac15 :pax :right, ls[:ven] >> 0.5dt); - with layer = -4 marker(:de.bf :removed :right, ls[:ven] >> 0.5dt); - slabel(:bottom :cat:ac15 :pax, - ls[:ven] >> 0.5dt >> 1.2ssw, "Ventschow" + marker(:de.exbf :cat:ac15 :pax :right, ls[:ven] >> 0.5dt); + slabel(:bottom :cat:ac15 :pax, ls[:ven] >> 0.5dt >> 1.6sh, + "Ventschow" ); } with link = "line.de.1122" { - track(:first :double :cat:ac15 :pax, ls[:ven + 1ssw, :bla - 1ssw]); - with layer = 1 line_badge(:cat:ac15 :pax, ls[:ven + 3.0km], "1122"); + track(:first :double :cat:ac15 :pax, ls[:ven + 1sw, :bib - 0.5sw]); + line_label(:left:s :cat:ac15 :pax, ls[:ven + 3.0km] << 0.5dt, "1122"); } with link = "point.de.Bibow" { - with layer = -4 marker(:de.bk :removed :right, ls[:bib] >> 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ls[:bib - 0.5sw, :bib + 0.5sw] + ); + marker(:de.bk :removed :right, ls[:bib] >> 0.5dt); + slabel(:bottom :removed :light, ls[:bib] >> 0.5dt >> 1.1sh, "Bibow"); + } + + with link = "line.de.1122" { + track(:first :double :cat:ac15 :pax, ls[:bib + 0.5sw, :bla - 1sw]); } with link = "point.de.Blankenberg-Meckl" { + # DE 1122 track(:first:station :double :cat:ac15 :pax, - ls[:bla - 1ssw, :bla + 1ssw] + ls[:bla - 1sw, :bla + 1sw] + ); + + # DE 6936 + track(:second :station :removed, + ls[:bla - 1sw, :bla - 0.5sw] >> 0.5dt >> 1sh + ); + track(:second :station, + ls[:bla - 0.5sw, :bla + 1sw] >> 0.5dt >> 1sh ); - marker(:de.bf :cat:ac15 :pax :right, ls[:bla] >> 0.5dt); - slabel(:left :cat:ac15 :pax, ls[:bla + 1.5ssw] >> 0.5dt >> 2.8ssw, + + marker(:de.inbf :cat:ac15 :pax :right, ls[:bla] >> 0.5dt); + slabel(:left :cat:ac15 :pax, ls[:bla + 1.5sw] >> 0.5dt >> 2.6sh, hbox(:center:base, span(:bold, "Blankenburg "), span(:regular, "(Meckl)") @@ -231,41 +280,61 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :double :cat:ac15 :pax, ls[:bla + 1ssw, :fri - 1ssw]); + track(:first :double :cat:ac15 :pax, ls[:bla + 1sw, :fri - 1sw]); } with link = "point.de.Friedrichswalde-Meckl" { track(:first:station :double :cat:ac15 :pax, - ls[:fri - 1ssw, :fri + 1ssw] + ls[:fri - 1sw, :fri + 1sw] ); - with layer = -1 marker(:de.hp :removed :right, ls[:fri] >> 0.5dt); - with layer = -2 marker(:de.bf :gone :right, ls[:fri] >> 0.5dt); - slabel(:bottom :removed, ls[:fri] >> 0.5dt >> 1.2ssw, - hbox(:center:base, - span(:regular, "Friedrichswalde "), + marker(:de.bf :removed :right, ls[:fri] >> 0.5dt); + slabel(:bottom :removed, ls[:fri] >> 0.5dt >> 1.2sh + (-0.5sw, 0dt), + vbox(:center:base, + span(:regular, "Friedrichswalde "), span(:light, "(Meckl)") ) ); } with link = "line.de.1122" { - track(:first :double :cat:ac15 :pax, ls[:fri + 1ssw, :war - 1ssw]); + track(:first :double :cat:ac15 :pax, ls[:fri + 1ssw, :frb - 0.5sw]); } with link = "point.de.Friedrichswalde-Meckl-Bk" { - with layer = -4 marker(:de.bk :right, ls[:frb] >> 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ls[:frb - 0.5sw, :frb + 0.5sw] + ); + marker(:de.bk :right, ls[:frb] >> 0.5dt); + slabel(:right :light, ls[:frb - 0.7sw] >> 0.5dt >> 1.0sh, + hbox(:left:top, "Friedrichswalde (Meckl)") + ); + } + + with link = "line.de.1122" { + track(:first :double :cat:ac15 :pax, ls[:frb + 0.5sw, :eic - 0.5sw]); } with link = "point.de.Eickelberg" { - with layer = -4 marker(:de.bk :removed :left, ls[:eic] << 0.5dt); + track(:first :double:station :cat:ac15 :pax, + ls[:eic - 0.5sw, :eic + 0.5sw] + ); + marker(:de.bk :removed :left, ls[:eic] << 0.5dt); + slabel(:left :removed :light, ls[:eic - 0.5sw] << 0.5dt << 1.2sh, + "Eickelberg" + ); + } + + with link = "line.de.1122" { + track(:first :double :cat:ac15 :pax, ls[:eic + 0.5sw, :war - 1ssw]); } with link = "point.de.Warnow-Meckl" { track(:first:station :double :cat:ac15 :pax, - ls[:war - 1ssw, :war + 1ssw] + ls[:war - 1sw, :war + 1sw] ); marker(:de.bf :cat:ac15 :pax :left, ls[:war] << 0.5dt); - slabel(:left :cat:ac15 :pax, ls[:war + 1ssw] << 0.5dt << 1.4ssw, + slabel(:left :cat:ac15 :pax, + ls[:war + 1sw] << 0.5dt << 1.4sh + (2sw, 0dt), hbox(:center:base, span(:regular, "Warnow "), span(:light, "(Meckl)") @@ -274,149 +343,162 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :double :cat:ac15 :pax, ls[:war + 1ssw, :zer - 1ssw]); + track(:first :double :cat:ac15 :pax, ls[:war + 1sw, :zer - 1sw]); } with link = "point.de.Zernin" { track(:first:station :double :cat:ac15 :pax, - ls[:zer - 1ssw, :zer + 1ssw] + ls[:zer - 1sw, :zer + 1sw] ); - with layer = -1 marker(:de.hp :removed :right, ls[:zer] >> 0.5dt); - slabel(:right :removed, ls[:zer - 1ssw] >> 0.5dt >> 2.4ssw, - "Zernin" + marker(:de.hp :removed :right, ls[:zer] >> 0.5dt); + slabel(:right :removed, ls[:zer - 0.7sw] >> 0.5dt >> 1.0sh, + hbox(:left:top, "Zernin") ); } with link = "line.de.1122" { - track(:first :double :cat:ac15 :pax, ls[:zer + 1ssw, :but - 1ssw]); + track(:first :double :cat:ac15 :pax, ls[:zer + 1sw, :but - 1sw]); + line_label(:left:se :cat:ac15 :pax, ls[:zer + 3km] << 0.5dt, "1122"); } with link = "point.de.Bützow" { - track(:first:station :double :cat:ac15 :pax, - path("d4.de.6446")[:but - 1ssw, :but + 2.5ssw] + # DE 1122 - DE 6446 + track(:first :double:station :cat:ac15 :pax, + path("d3.de.6446")[:but - 1sw, :but + 1sw] ); - track(:first:station :cat:ac15 :pax, - ls[:but + 0.5ssw, :but + 0.51ssw] >> 0.5dt - .. ls[:but.f + 1.5ssw, :but.f + 1.51ssw] << 0.5dt - ); - with layer = -4 track(:first:station :removed, - ls[:but - 0.51ssw, :but - 0.5ssw] >> 0.5dt - -- ls[:but - 0.5ssw + 1dl, :but + 0.5ssw] >> 1.5dt - .. ls[:but.f + 1.5ssw, :but.f + 1.51ssw] >> 0.5dt + + # DE 1122 rechts + track(:first:station :removed, + ls[:but - 0.5sw - 1.1dl, :but - 0.5sw - 1dl] >> 0.5dt + -- ls[:but - 0.5sw, :but + 1sw] >> 1.5dt ); + marker(:de.bf :cat:ac15 :pax :left, ls[:but] << 0.5dt); - slabel(:left :cat:ac15 :pax, ls[:but - 0.4sw] << 0.5dt << 1.2ssw, + slabel(:left :cat:ac15 :pax, ls[:but - 0.4sw] << 0.5dt << 1.2sh, span(:bold, "Bützow") ); } with link = "line.de.1122" { - track(:first :cat:ac15 :pax :flip, - ls[:but.f + 1.5ssw, :swi - 1ssw] << 0.5dt + track(:first :leftother:rightsame :cat:ac15 :pax, + ls[:but + 1sw, :but.yr] >> 0.5dt + ); + track(:first :rightsame :cat:ac15 :pax, + ls[:but.yr - 0.1dl, :but.yr] >> 0.5dt + .. ls[:but.yyr, :swi - 1sw] << 0.5dt + ); + + track(:first :rightsame :removed, + ls[:but + 1sw, :but.yr] >> 1.5dt + ); + track(:first :rightsame :removed, + ls[:but.yr - 0.1dl, :but.yr] >> 1.5dt + .. ls[:but.yyr, :swi - 1sw] >> 0.5dt ); - track(:first :removed, ls[:but.f + 1.5ssw, :swi - 1ssw] >> 0.5dt); - with layer = 1 line_badge(:cat:ac15 :pax, ls[:swi - 2km], "1122"); + line_label(:right:n :cat:ac15 :pax, ls[:swi - 3km] >> 0.5dt, "1122"); } with link = "point.de.Schwiesower-Forst" { track(:first:station :cat:ac15 :pax, - ls[:swi - 1ssw, :swi + 1ssw] << 0.5dt + ls[:swi - 1sw, :swi + 1sw] << 0.5dt ); - with layer = -4 track(:first:station :removed, - ls[:swi - 1ssw, :swi + 1ssw] >> 0.5dt + track(:first:station :removed, + ls[:swi - 1sw, :swi + 1sw] >> 0.5dt ); - with layer = -4 marker(:de.bbf :removed :left, ls[:swi] << 0.5dt); - slabel(:top :removed, ls[:swi] << 0.5dt << 1.2ssw, + marker(:de.bbf :removed :left, ls[:swi] << 0.5dt); + slabel(:top :removed, ls[:swi] << 0.5dt << 1.2sh, "Schwiesower Forst" ); } with link = "line.de.1122" { - track(:first :cat:ac15 :pax, - ls[:swi.x - 1dl, :swi + 1ssw] >> 0.5dt + track(:first :rightsame :cat:ac15 :pax, + ls[:swi + 1sw, :swi.x - 1dl] << 0.5dt ); - with layer = -4 track(:first :removed :flip, - ls[:swi.x - 1dl, :swi + 1ssw] << 0.5dt + track(:first :leftsame :removed, + ls[:swi + 1sw, :swi.x - 1dl] >> 0.5dt ); track(:first:station :cat:ac15 :pax, ls[:swi.x - 1dl, :swi.x] << 0.5dt -- ls[:swi.x + 1dl, :swi.x + 2dl] >> 0.5dt ); - with layer = -4 track(:first:station :removed, + track(:first:station :removed, ls[:swi.x - 1dl, :swi.x + 1dl] >> 0.5dt ); - with layer = -4 track(:first:station :removed, + track(:first:station :removed, ls[:swi.x, :swi.x + 2dl] << 0.5dt ); - track(:first :cat:ac15 :pax, + track(:first :leftsame :cat:ac15 :pax, ls[:swi.x + 2dl, :gug - 1ssw] >> 0.5dt ); - with layer = -4 track(:first :removed :flip, - ls[:swi.x + 2dl, :gug - 1ssw] << 0.5dt + track(:first :rightsame :removed, + ls[:swi.x + 2dl, :gug - 1sw] << 0.5dt ); } with link = "point.de.Güstrow-Gbf" { - track(:first:station :cat:ac15 :pax, ls[:gug - 1ssw, :gus.r] << 1.5dt); - with layer = -4 track(:first:station :removed, - ls[:gug - 1ssw, :gus.r] << 0.5dt - ); - track(:first:station :cat:ac15 :pax, ls[:gug - 1ssw, :gus.r] >> 0.5dt); - with layer = -1 marker(:de.bft :right, ls[:gug] >> 0.5dt); + # DE 6445 + track(:first:station :cat:ac15 :pax, ls[:gug - 1sw, :gus.r] << 1.5dt); + + # DE 1122 + track(:first:station :removed, ls[:gug - 1sw, :gus.r] << 0.5dt); + track(:first:station :cat:ac15 :pax, ls[:gug - 1sw, :gus.r] >> 0.5dt); + + marker(:de.bft :right, ls[:gug] >> 0.5dt); } with link = "point.de.Güstrow" { track(:first:station :cat:ac15 :pax, - ls[:gus.r, :gus + 0.5ssw - 1dl] << 1.5dt - -- ls[:gus + 0.5ssw, :gus + 0.51ssw] << 0.5dt + ls[:gus.r, :gus + 0.5sw] << 1.5dt + -- ls[:gus + 0.5sw + 1dl, :gus + 0.5sw + 1.1dl] << 0.5dt ); - with layer = -4 track(:first:station :removed, - ls[:gus.r, :gus + 0.5ssw] << 0.5dt + track(:first:station :removed, + ls[:gus.r, :gus + 0.5sw] << 0.5dt ); track(:first:station :cat:ac15 :pax, - ls[:gus.r, :gus + 0.5ssw - 1dl] >> 0.5dt - -- ls[:gus + 0.5ssw, :gus + 1ssw] << 0.5dt + ls[:gus.r, :gus + 0.5sw - 1dl] >> 0.5dt + -- ls[:gus + 0.5sw, :gus + 1sw] << 0.5dt ); - with layer = -4 track(:first:station :removed, - ls[:gus + 0.5ssw - 1dl, :gus + 1ssw] >> 0.5dt + track(:first:station :removed, + ls[:gus + 0.5sw - 1dl, :gus + 1sw] >> 0.5dt ); track(:second:station :cat:ac15 :pax, - ls[:gus - 0.5ssw - 1.1dl, :gus - 0.5ssw - 1dl] >> 0.5dt - -- ls[:gus - 0.5ssw, :gus + 1ssw] >> 1.5dt + ls[:gus - 0.5sw - 1.1dl, :gus - 0.5sw - 1dl] >> 0.5dt + -- ls[:gus - 0.5sw, :gus + 1sw] >> 1.5dt ); marker(:de.bf :cat:ac15 :pax :right, ls[:gus] >> 1.5dt); - slabel(:left :cat:ac15 :pax, ls[:gus] >> 1.5dt >> 2.2ssw, - span(:bold, "Güstrow") + slabel(:left :cat:ac15 :pax, ls[:gus - 0.9sw] >> 1.5dt >> 1.0sh, + hbox(:right:top :bold, "Güstrow") ); } with link = "line.de.1122" { - track(:first :cat:ac15 :pax :flip, - ls[:gus + 1ssw, :pri - 1ssw] << 0.5dt + track(:first :rightsame :cat:ac15 :pax, + ls[:gus + 1sw, :pri - 1sw] << 0.5dt ); - with layer = -1 track(:first :removed, - ls[:gus + 1ssw, :pri - 1ssw] >> 0.5dt + track(:first :leftsame :removed, + ls[:gus + 1sw, :pri - 1sw] >> 0.5dt ); } with link = "point.de.Priemerburg" { track(:first:station :cat:ac15 :pax, - ls[:pri - 1ssw, :pri + 1ssw] << 0.5dt + ls[:pri - 1sw, :pri + 1sw] << 0.5dt ); - with layer = -4 track(:first:station :removed, - ls[:pri - 1ssw, :pri + 1ssw] >> 0.5dt + track(:first:station :removed, + ls[:pri - 1sw, :pri + 1sw] >> 0.5dt ); track(:second:station :cat:ac15 :pax, - ls[:pri - 1ssw, :pri + 1ssw] >> 1.5dt + ls[:pri - 1sw, :pri + 1sw] >> 1.5dt ); marker(:de.bf :cat:ac15 :pax :right, ls[:pri] >> 1.5dt); - label(ls[:pri + 1ssw] >> 1.5dt >> 1.0ssw, + label(ls[:pri + 1ssw] >> 1.5dt >> 1.0sh, hbox(:right:top :cat:ac15 :pax, vbox(:left:top :small, span(:bold, "Priemerburg – "), @@ -427,85 +509,92 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :cat:ac15 :pax :flip, - ls[:pri + 1ssw, :prs - 0.5ssw] << 0.5dt + track(:first :rightsame :cat:ac15 :pax, + ls[:pri + 1sw, :prs - 0.5sw] << 0.5dt + ); + track(:first :leftsame :removed, + ls[:pri + 1sw, :prs - 0.5sw] >> 0.5dt ); - track(:first :removed, ls[:pri + 1ssw, :prs - 0.5ssw] >> 0.5dt); } with link = "point.de.Priemerwald-Süd" { - track(:first:station :cat:ac15 :pax :flip, - ls[:prs - 0.5ssw, :prs + 0.5ssw] << 0.5dt + track(:first:station :cat:ac15 :pax, + ls[:prs - 0.5sw, :prs + 0.5sw] << 0.5dt ); track(:first:station :removed, - ls[:prs - 0.5ssw, :prs + 0.5ssw] >> 0.5dt + ls[:prs - 0.5sw, :prs + 0.5sw] >> 0.5dt ); track(:second:station, - ls[:prs - 0.5ssw, :prs + 0.5ssw] >> 1.5dt + ls[:prs - 0.5sw, :prs + 0.5sw] >> 1.5dt ); - with layer = -1 marker(:de.abzw :removed :left, ls[:prs] << 0.5dt); - slabel(:right :removed, ls[:prs + 0.5ssw] << 0.5dt << 1.5ssw, + marker(:de.abzw :removed :left, ls[:prs] << 0.5dt); + slabel(:right :removed, ls[:prs + 0.5sw] << 0.5dt << 1.5sh, span(:bold, "Priemerwald Süd") ); } with link = "line.de.1122" { - track(:first :cat:ac15 :pax :flip, - ls[:prs + 0.5ssw, :dev - 0.5ssw] << 0.5dt + track(:first :rightsame :cat:ac15 :pax, + ls[:prs + 0.5sw, :dev - 0.5sw] << 0.5dt + ); + track(:first :leftsame :removed, + ls[:prs + 0.5sw, :dev - 0.5sw] >> 0.5dt ); - track(:first :removed, ls[:prs + 0.5ssw, :dev - 1ssw] >> 0.5dt); } with link = "point.de.Devwinkel" { track(:first:station :cat:ac15 :pax, - ls[:dev - 1ssw, :dev + 1ssw] << 0.5dt + ls[:dev - 0.5sw, :dev + 0.5sw] << 0.5dt ); track(:first:station :removed, - ls[:dev - 1ssw, :dev + 1ssw] >> 0.5dt + ls[:dev - 0.5sw, :dev + 0.5sw] >> 0.5dt ); - with layer = -4 marker(:de.bk :removed :right, ls[:dev] >> 0.5dt); - with layer = -5 marker(:de.bbf :gone :right, ls[:dev] >> 0.5dt); - slabel(:right :removed, ls[:dev + 0.5ssw] << 1.5dt, "Devwinkel"); + marker(:de.bbf :removed :right, ls[:dev] >> 0.5dt); + slabel(:right :removed, ls[:dev + 0.5sw] << 1.5dt, "Devwinkel"); } with link = "line.de.1122" { - track(:first :cat:ac15 :pax :flip, - ls[:dev + 0.5ssw, :nie - 1ssw] << 0.5dt + track(:first :rightsame :cat:ac15 :pax, + ls[:dev + 0.5sw, :nie - 0.5sw] << 0.5dt + ); + track(:first :leftsame :removed, + ls[:dev + 0.5sw, :nie - 0.5sw] >> 0.5dt ); - track(:first :removed, ls[:dev + 0.5ssw, :nie - 1ssw] >> 0.5dt); } with link = "point.de.Nienhagen-Lalendorf" { track(:first:station :cat:ac15 :pax, - ls[:nie - 1ssw, :nie + 1ssw] << 0.5dt + ls[:nie - 0.5sw, :nie + 0.5sw] << 0.5dt ); track(:first:station :removed, - ls[:nie - 1ssw, :nie + 1ssw] >> 0.5dt + ls[:nie - 0.5sw, :nie + 0.5sw] >> 0.5dt ); - with layer = -1 marker(:de.hp :removed :right, ls[:nie] >> 0.5dt); - slabel(:left :removed, ls[:nie + 2ssw] >> 0.5dt >> 2.4ssw, + marker(:de.hp :removed :right, ls[:nie] >> 0.5dt); + slabel(:left :removed, ls[:nie + 2sw] >> 0.5dt >> 2.2sh, "Nienhagen" ); } with link = "line.de.1122" { - track(:first :cat:ac15 :pax :flip, - ls[:nie + 1ssw, :lal - 1ssw] << 0.5dt + track(:first :rightsame :cat:ac15 :pax, + ls[:nie + 0.5sw, :lal - 1sw] << 0.5dt + ); + track(:first :leftsame :removed, + ls[:nie + 0.5sw, :lal - 1sw] >> 0.5dt ); - track(:first :removed, ls[:nie + 1ssw, :lal - 1ssw] >> 0.5dt); } with link = "point.de.Lalendorf" { track(:first:station :cat:pax :ac15, - ls[:lal - 1ssw, :lal + 1ssw] << 0.5dt + ls[:lal - 1sw, :lal + 1sw] << 0.5dt ); - with layer = -4 track(:first:station :removed, - ls[:lal - 1ssw, :lal - 0.5ssw + 1dl] >> 0.5dt + track(:first:station :removed, + ls[:lal - 1sw, :lal - 0.5sw + 1dl] >> 0.5dt ); track(:first:station :cat:ac15 :pax, - ls[:lal - 0.51ssw, :lal - 0.5ssw] << 0.5dt - -- ls[:lal - 0.5ssw + 1dl, :lal + 1ssw] >> 0.5dt + ls[:lal - 0.51sw, :lal - 0.5sw] << 0.5dt + -- ls[:lal - 0.5sw + 1dl, :lal + 1sw] >> 0.5dt ); marker(:de.bf :cat:ac15 :pax :left, ls[:lal] << 0.5dt); @@ -515,142 +604,138 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :pax, ls[:lal + 1ssw, :nwo - 1ssw] << 0.5dt); - track(:first :removed, ls[:lal + 1ssw, :nwo - 1ssw] >> 0.5dt); - with layer = 1 line_badge(:pax, ls[:lal + 4.0km], "1122"); + track(:first :rightsame :pax, ls[:lal + 1sw, :nwo - 1sw] << 0.5dt); + track(:first :leftsame :removed, ls[:lal + 1sw, :nwo - 1sw] >> 0.5dt); + line_label(:left:s :pax, ls[:lal + 4.0km] << 0.5dt, "1122"); } with link = "point.de.Neu-Wokern" { - track(:first:station :pax, ls[:nwo - 1ssw, :nwo + 1ssw] << 0.5dt); - with layer = -1 track(:first:station :removed, - ls[:nwo - 1ssw, :nwo + 1ssw] >> 0.5dt - ); + track(:first:station :pax, ls[:nwo - 1sw, :nwo + 1sw] << 0.5dt); + track(:first:station :removed, ls[:nwo - 1sw, :nwo + 1sw] >> 0.5dt); marker(:de.hp :pax :right, ls[:nwo] >> 0.5dt); - with layer = -1 marker(:de.bf :removed :right, ls[:nwo] >> 0.5dt); - slabel(:bottom :pax, ls[:nwo] >> 0.5dt >> 1.2ssw, + marker(:de.exbf :pax :right, ls[:nwo] >> 0.5dt); + slabel(:bottom :pax, ls[:nwo] >> 0.5dt >> 1.6sh, "Neu Wokern" ); } with link = "line.de.1122" { - track(:first :pax, ls[:nwo + 1ssw, :tet - 1ssw] << 0.5dt); - track(:first :removed, ls[:nwo + 1ssw, :tet - 1ssw] >> 0.5dt); + track(:first :rightsame :pax, ls[:nwo + 1sw, :tet - 1sw] << 0.5dt); + track(:first :leftsame :removed, ls[:nwo + 1sw, :tet - 1sw] >> 0.5dt); } with link = "point.de.Teterow" { - track(:first:station :pax, ls[:tet - 1ssw, :tet + 1ssw] << 0.5dt); - with layer = -1 track(:first:station :removed, - ls[:tet - 1ssw, :tet + 0.5ssw] >> 0.5dt - -- ls[:tet + 0.5ssw + 1dl, :tet + 0.5ssw + 1.1dl] << 0.5dt + track(:first:station :pax, ls[:tet - 1sw, :tet + 1sw] << 0.5dt); + track(:first:station :removed, + ls[:tet - 1sw, :tet + 0.5sw] >> 0.5dt + -- ls[:tet + 0.5sw + 1dl, :tet + 0.5sw + 1.1dl] << 0.5dt ); marker(:de.bf :pax :left, ls[:tet] << 0.5dt); - slabel(:left :pax, ls[:tet + 1ssw] << 0.5dt << 1.2ssw, + slabel(:left :pax, ls[:tet + 1sw] << 0.5dt << 1.2sh, span(:bold, "Teterow") ); } with link = "line.de.1122" { track(:first :pax, - ls[:tet + 1ssw, :tet + 1.1ssw] << 0.5dt - .. ls[:tet.ff + 1dt, :hmi - 1ssw] + ls[:tet + 1sw, :tet + 1.1sw] << 0.5dt + .. ls[:tet.ff + 1dt, :hmi - 1sw] ); } with link = "point.de.Hohen-Mistorf" { - track(:first :pax, ls[:hmi - 1ssw, :hmi + 1ssw]); - with layer = -1 marker(:de.bf :removed :left, ls[:hmi]); - slabel(:right :removed, ls[:hmi + 0.5ssw] << 1.3ssw, + track(:first :pax, ls[:hmi - 1sw, :hmi + 1sw]); + marker(:de.bf :removed :left, ls[:hmi]); + slabel(:right :removed, ls[:hmi + 0.5sw] << 1.2sh, "Hohen Mistorf" ); } with link = "line.de.1122" { - track(:first :pax, ls[:hmi + 1ssw, :reb - 1ssw]); + track(:first :pax, ls[:hmi + 1ssw, :reb - 1sw]); } with link = "point.de.Remplin" { - track(:first :pax, ls[:reb - 1ssw, :rem + 1ssw]); - marker(:de.bk :removed :right, ls[:reb]); - with layer = -4 marker(:de.bf :gone :left, ls[:rem]); - slabel(:bottom :removed, ls[:reb] >> 1.0ssw, + track(:first :pax, ls[:reb - 1sw, :rem + 1sw]); + marker(:de.bf :removed :left, ls[:rem]); + slabel(:top :removed, ls[:rem] << 1.2sh, "Remplin" ); } with link = "line.de.1122" { - track(:first :pax, ls[:rem + 1ssw, :mal - 1ssw]); + track(:first :pax, ls[:rem + 1sw, :mal - 1sw]); } with link = "point.de.Malchin" { - track(:first:station :pax, ls[:mal - 1ssw, :mal + 1ssw]); + track(:first:station :pax, ls[:mal - 1sw, :mal + 1sw]); marker(:de.bf :pax :right, ls[:mal]); - slabel(:bottom :pax, ls[:mal] >> 1.4ssw, + slabel(:bottom :pax, ls[:mal] >> 1.4sw, span(:bold, "Malchin") ); } with link = "line.de.1122" { - track(:first :pax, ls[:mal + 1ssw, :leu - 1ssw]); + track(:first :pax, ls[:mal + 1sw, :leu - 1sw]); } with link = "point.de.Leuschentin" { - track(:first:station :pax, ls[:leu - 1ssw, :leu + 1ssw]); - with layer = -1 marker(:de.bk :removed :left, ls[:leu]); - with layer = -2 marker(:de.bf :gone :left, ls[:leu]); - slabel(:right :removed, ls[:leu + 0.6ssw] << 1.4ssw, + track(:first:station :pax, ls[:leu - 1sw, :leu + 1sw]); + marker(:de.bf :removed :left, ls[:leu]); + slabel(:right :removed, ls[:leu + 0.6sw] << 1.3sh, "Leutschentin" ); } with link = "line.de.1122" { - track(:first :pax, ls[:leu + 1ssw, :sar - 1ssw]); + track(:first :pax, ls[:leu + 1sw, :sar - 1sw]); } with link = "point.de.Scharpzow" { - track(:first:station :pax, ls[:sar - 1ssw, :sar + 1ssw]); - with layer = -1 marker(:de.bbf :removed :left, ls[:sar]); - slabel(:left :removed, ls[:sar + 1ssw] >> 2.0ssw, - "Scharpzow" + track(:first:station :pax, ls[:sar - 1sw, :sar + 1sw]); + marker(:de.bbf :removed :left, ls[:sar]); + slabel(:left :removed, ls[:sar + 1sw] >> 0.5dt, + hbox(:right:top, "Scharpzow") ); } with link = "line.de.1122" { - track(:first :pax, ls[:sar + 1ssw, :sta - 1ssw]); + track(:first :pax, ls[:sar + 1sw, :sta - 1sw]); } with link = "point.de.Reuterstadt-Stavenhagen" { - track(:first:station :pax, ls[:sta - 1ssw, :sta + 1ssw]); + track(:first:station :pax, ls[:sta - 1sw, :sta + 1sw]); marker(:de.bf :pax :right, ls[:sta]); - slabel(:left :pax, ls[:sta + 1.5ssw] >> 2.4ssw, - "Reuterstadt Stavenhagen" + slabel(:left :pax, ls[:sta + 1.5sw] >> 0.8sh, + hbox(:right:top, "Reuterstadt Stavenhagen") ); } with link = "line.de.1122" { - track(:first :pax, ls[:sta + 1ssw, :grw - 1ssw]); - with layer = 1 line_badge(:pax, ls[:sta + 3.1km], "1122"); + track(:first :pax, ls[:sta + 1sw, :grw - 1sw]); + line_label(:left:s :pax, ls[:sta + 3.1km], " 1122"); } with link = "point.de.Grischow-Meckl" { - track(:first:station :pax, ls[:grw - 1ssw, :grw + 1ssw]); + track(:first:station :pax, ls[:grw - 1sw, :grw + 1sw]); marker(:de.bf :pax :right, ls[:grw]); - slabel(:left :pax, ls[:grw + 1.5ssw] >> 2.4ssw, - hbox(:center:base, + slabel(:left :pax, ls[:grw + 1.5sw] >> 0.8sh, + hbox(:right:top, hbox(:center:base, span(:regular, "Grischow "), span(:light, "(Meckl)") - ) + )) ); } with link = "line.de.1122" { - track(:first :pax, ls[:grw + 1ssw, :kas - 1ssw]); + track(:first :pax, ls[:grw + 1sw, :kas - 1sw]); } with link = "point.de.Kastorf-Meckl" { - track(:first:station :pax, ls[:kas - 1ssw, :kas + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, ls[:kas]); - slabel(:left :removed, ls[:kas + 0.6ssw] >> 1.6ssw, + track(:first:station :pax, ls[:kas - 1sw, :kas + 1sw]); + marker(:de.bf :removed :right, ls[:kas]); + slabel(:left :removed, ls[:kas + 0.6sw] >> 1.6sh, hbox(:center:base, span(:regular, "Kastorf "), span(:light, "(Meckl)") @@ -659,25 +744,25 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :pax, ls[:kas + 1ssw, :kee - 1ssw]); + track(:first :pax, ls[:kas + 1sw, :kee - 1sw]); } with link = "point.de.Kleeth" { - track(:first:station :pax, ls[:kee - 1ssw, :kee + 1ssw]); - with layer = -1 marker(:de.bbf :right, ls[:kee]); - with layer = -4 marker(:de.bf :removed :right, ls[:kee]); - slabel(:left, ls[:kee + 0.6ssw] >> 1.6ssw, "Kleeth"); + track(:first:station :pax, ls[:kee - 1sw, :kee + 1sw]); + marker(:de.bbf :right, ls[:kee]); + marker(:de.exbf :right, ls[:kee]); + slabel(:left, ls[:kee + 0.6sw] >> 2.0sh, "Kleeth"); } with link = "line.de.1122" { - track(:first :pax, ls[:kee + 1ssw, :mol - 1ssw]); + track(:first :pax, ls[:kee + 1sw, :mol - 1sw]); } with link = "point.de.Mölln-Meckl" { - track(:first:station :pax, ls[:mol - 1ssw, :mol + 1ssw]); + track(:first:station :pax, ls[:mol - 1sw, :mol + 1sw]); marker(:de.hp :pax :right, ls[:mol]); - with layer = -1 marker(:de.bf :removed :right, ls[:mol]); - slabel(:left :pax, ls[:mol + 0.3ssw] >> 2.2ssw, + marker(:de.exbf :pax :right, ls[:mol]); + slabel(:left :pax, ls[:mol + 0.3sw] >> 2.4sh, hbox(:center:base, span(:regular, "Mölln "), span(:light, "(Meckl)") @@ -686,130 +771,158 @@ with detail = 3 { } with link = "line.de.1122" { - track(:first :pax, ls[:mol + 1ssw, :blh - 1ssw]); + track(:first :pax, ls[:mol + 1sw, :blh - 1sw]); } with link = "point.de.Blankenhof" { - track(:first:station :pax, ls[:blh - 1ssw, :blh + 1ssw]); - with layer = -1 marker(:de.bbf :right, ls[:blh]); - with layer = -4 marker(:de.bf :removed :right, ls[:blh]); - slabel(:bottom, ls[:blh] >> 1.4ssw, "Blankenhof"); + track(:first:station :pax, ls[:blh - 1sw, :blh + 1sw]); + marker(:de.bbf :right, ls[:blh]); + marker(:de.exbf :right, ls[:blh]); + slabel(:bottom, ls[:blh] >> 1.6sh, "Blankenhof"); } with link = "line.de.1122" { - track(:first :pax, ls[:blh + 1ssw, :wei - 1ssw]); + track(:first :pax, ls[:blh + 1sw, :wei - 1sw]); } with link = "point.de.Weitin" { - track(:first:station :pax, ls[:wei - 1ssw, :wei + 1ssw]); - with layer = -1 marker(:de.bbf :removed :left, ls[:wei]); - slabel(:left :removed, ls[:wei - 0.5ssw] << 1.4ssw, "Weitin"); + track(:first:station :pax, ls[:wei - 1sw, :wei + 1sw]); + marker(:de.bbf :removed :left, ls[:wei]); + slabel(:left :removed, ls[:wei - 0.5sw] << 1.4sh, "Weitin"); } with link = "line.de.1122" { - track(:first :pax, ls[:wei + 1ssw, :nbr - 1ssw]); + track(:first :pax, + ls[:wei + 1sw, :nbr.yys] + .. ls[:nbr.ys, :nbr - 1sw] >> 1dt + ); + line_label(:right:ne :pax, ls[:nbr - 2.5km], "1122"); } with link = "point.de.Neubrandenburg" { - track(:first:station :cat:ac15 :pax, ls[:nbr - 1ssw, :nbr.b1]); - marker(:de.bf :cat:ac15 :pax :right, ls[:nbr]); - slabel(:bottom :cat:ac15 :pax, ls[:nbr] >> 1.4ssw, + # DE 1122 + track(:first:station :cat:ac15 :pax, ls[:nbr - 1sw, :nbg - 1sw] >> 1dt); + + # DE 6088 + track(:first:station :cat:ac15 :pax, ls[:nbr - 1sw, :nbg - 1sw]); + + # DE 6767 + track(:second :station :removed, ls[:nbr - 1sw, :nbg - 1sw] >> 2dt); + + # DE 6789 + track(:second :station, ls[:nbr - 1sw, :nbg - 1sw] << 1dt); + + marker(:de.bf :cat:ac15 :pax :right, ls[:nbr] >> 2dt); + slabel(:bottom :cat:ac15 :pax, ls[:nbr] >> 2dt >> 1.2sh, span(:bold, "Neubrandenburg") ); } with link = "point.de.Neubrandenburg-Gbf" { - track(:first:station :cat:ac15 :pax, ls[:nbr.b1, :nbg + 1ssw]); - with layer = -1 marker(:de.bft :cat:ac15 :left, ls[:nbg]); + # DE 1122 + track(:first:station :cat:ac15 :pax, ls[:nbg - 1sw, :nbg + 1sw]); + + # DE 6088 + track(:first:station :cat:ac15 :pax, ls[:nbg - 1sw, :nbg + 1sw] >> 1dt); + + # DE 6767 + track(:second :station :removed, + ls[:nbg - 1sw, :nbg + 0.5sw] >> 2dt + -- ls[:nbg + 0.5sw + 1dl, :nbg + 0.5sw + 1.1dl] >> 1dt + ); + + # DE 6789 + track(:second :station, ls[:nbg - 1sw, :nbg + 1sw] << 1dt); + + marker(:de.bft :cat:ac15 :left, ls[:nbg] << 1dt); } with link = "line.de.1122" { - track(:first :pax, ls[:nbg + 1ssw, :kus - 1ssw]); + track(:first :pax, ls[:nbg + 1sw, :kus - 1sw]); } with link = "point.de.Küssow" { - track(:first:station :pax, ls[:kus - 1ssw, :kus + 1ssw]); - with layer = -1 marker(:de.bf :removed :right, ls[:kus]); + track(:first:station :pax, ls[:kus - 1sw, :kus + 1sw]); + marker(:de.bf :removed :right, ls[:kus]); slabel(:top :removed, ls[:kus] << 1.5dt, "Küssow"); } with link = "line.de.1122" { - track(:first :pax, ls[:kus + 1ssw, :spo - 1ssw]); + track(:first :pax, ls[:kus + 1sw, :spo - 1sw]); } with link = "point.de.Sponholz" { - track(:first:station :pax, ls[:spo - 1ssw, :spo + 1ssw]); + track(:first:station :pax, ls[:spo - 1sw, :spo + 1sw]); marker(:de.bf :pax :right, ls[:spo]); - slabel(:bottom :pax, ls[:spo] >> 1.2ssw, "Sponholz"); + slabel(:bottom :pax, ls[:spo] >> 1.2sh, "Sponholz"); } with link = "line.de.1122" { - track(:first :pax, ls[:spo + 1ssw, :ruh - 1ssw]); + track(:first :pax, ls[:spo + 1sw, :ruh - 1sw]); + line_label(:left:s :pax, ls[:spo + 2.3km], "1122"); } with link = "point.de.Rühlow" { - track(:first:station :pax, ls[:ruh - 1ssw, :ruh + 1ssw]); - with layer = -1 marker(:de.hp :removed :left, ls[:ruh]); - with layer = -2 marker(:de.bf :gone :left, ls[:ruh]); - slabel(:right :removed , ls[:ruh - 0.5ssw] << 1.6ssw, "Rühlow"); + track(:first:station :pax, ls[:ruh - 1sw, :ruh + 1sw]); + marker(:de.bf :removed :left, ls[:ruh]); + slabel(:right :removed, ls[:ruh + 0.5sw] << 1.4sh, "Rühlow"); } with link = "line.de.1122" { - track(:first :pax, ls[:ruh + 1ssw, :nee - 1ssw]); + track(:first :pax, ls[:ruh + 1sw, :nee - 1sw]); } with link = "point.de.Neetzka" { - track(:first:station :pax, ls[:nee - 1ssw, :nee + 1ssw]); + track(:first:station :pax, ls[:nee - 1sw, :nee + 1sw]); marker(:de.hp :pax :right, ls[:nee]); - with layer = -1 marker(:de.bf :removed :right, ls[:nee]); - slabel(:bottom :pax, ls[:nee] >> 1.5ssw, "Neetzka"); + marker(:de.exbf :pax :right, ls[:nee]); + slabel(:bottom :pax, ls[:nee] >> 1.7sh, "Neetzka"); } with link = "line.de.1122" { - track(:first :pax, ls[:nee + 1ssw, :oer - 1ssw]); - with layer = 1 line_badge(:pax, ls[:nee + 2.5km], "1122"); + track(:first :pax, ls[:nee + 1sw, :oer - 1sw]); } with link = "point.de.Oertzenhof" { - track(:first:station :pax, ls[:oer - 1ssw, :oer + 1ssw]); + track(:first:station :pax, ls[:oer - 1sw, :oer + 1sw]); marker(:de.bf :pax :right, ls[:oer]); - slabel(:bottom :pax, ls[:oer - 1ssw] >> 1.6ssw, + slabel(:bottom :pax, ls[:oer - 1sw] >> 1.6sh, "Oertzenhof" ); } with link = "line.de.1122" { - track(:first :pax, ls[:oer + 1ssw, :kre - 1ssw]); + track(:first :pax, ls[:oer + 1sw, :kre - 1sw]); } with link = "point.de.Kreckow" { - track(:first:station :pax, ls[:kre - 1ssw, :kre + 1ssw]); - with layer = -1 marker(:de.bbf :removed :left, ls[:kre]); - slabel(:top :removed, ls[:kre] << 1.4ssw, "Kreckow"); + track(:first:station :pax, ls[:kre - 1sw, :kre + 1sw]); + marker(:de.bbf :removed :left, ls[:kre]); + slabel(:top :removed, ls[:kre] << 1.2sh, "Kreckow"); } with link = "line.de.1122" { - track(:first :pax, ls[:kre + 1ssw, :gda - 1ssw]); + track(:first :pax, ls[:kre + 1sw, :gda - 1sw]); } with link = "point.de.Groß-Daberkow-Hp" { - track(:first:station :pax, ls[:gda - 1ssw, :gda + 1ssw]); + track(:first:station :pax, ls[:gda - 1sw, :gda + 1sw]); marker(:de.hp :removed :right, ls[:gda]); - slabel(:bottom :removed, ls[:gda] >> 1.2ssw, "Groß Daberkow"); + slabel(:bottom :removed, ls[:gda] >> 1.2sh, "Groß Daberkow"); } with link = "line.de.1122" { - track(:first :pax, ls[:gda + 1ssw, :lau - 1ssw]); + track(:first :pax, ls[:gda + 1sw, :lau - 1sw]); } with link = "point.de.Lauenhagen" { - track(:first:station :pax, ls[:lau - 1ssw, :lau + 1ssw]); - with layer = -1 marker(:de.bbf :removed :left, ls[:lau]); - slabel(:top :removed , ls[:lau] << 1.6ssw, "Lauenhagen"); + track(:first:station :pax, ls[:lau - 1sw, :lau + 1sw]); + marker(:de.bbf :removed :left, ls[:lau]); + slabel(:top :removed, ls[:lau] << 1.4sh, "Lauenhagen"); } with link = "line.de.1122" { - track(:first :pax, ls[:lau + 1ssw, :stw]); + track(:first :pax, ls[:lau + 1sw, :stw]); } # point.de.Strasburg-Uckerm-Strw de.6327 diff --git a/rules/de/w/d3/11/1151.map b/rules/de/w/d3/11/1151.map index 8b5c34b5..5aac49b6 100644 --- a/rules/de/w/d3/11/1151.map +++ b/rules/de/w/d3/11/1151.map @@ -1,87 +1,118 @@ # DE 1151. Wittenberge - Buchholz (Nordh) # -let wb = path("d4.de.w.1151"); +let wb = path("d3.de.w.1151"); with detail = 3 { # point.de.Wittenberge de.6100 with link = "line.de.1151" { - with layer = -1 track(:first :removed, wb[:wit.hh, :cum - 1ssw]); + track(:first :removed, + wb[:wit + 1.5sw, :wit.yd] << 1.5dt + .. wb[:wit.yyd + 2dt, :cum - 1sw] + ); + line_label(:left:ne :removed, wb[:wit.yyd + 3km], "1151"); } with link = "point.de.Cumlosen" { - track(:first:station :removed, wb[:cum - 1ssw, :cum + 1ssw]); + track(:first :station :removed, wb[:cum - 1sw, :cum + 1sw]); marker(:de.bf :removed :left, wb[:cum]); - slabel(:left :removed, wb[:cum - 1.5ssw] << 2.3ssw, - "Cumlosen" + slabel(:left :removed, wb[:cum - 0.3sw] << 0.9sh, + hbox(:right:top, "Cumlosen") ); } with link = "line.de.1151" { - track(:first :removed, wb[:cum + 1ssw, :lan - 1ssw]); + track(:first :removed, wb[:cum + 1sw, :lan - 1sw]); } with link = "point.de.Lanz" { - track(:first:station :removed, wb[:lan - 1ssw, :lan + 1ssw]); + track(:first:station :removed, wb[:lan - 1sw, :lan + 1sw]); marker(:de.bf :removed :right, wb[:lan]); - slabel(:top :removed, wb[:lan] >> 1.2ssw, "Lanz"); + slabel(:top :removed, wb[:lan] >> 1.1sh, "Lanz"); } with link = "line.de.1151" { - track(:first :removed, wb[:lan + 1ssw, :len - 1ssw]); - with layer = 1 line_badge(:removed, wb[:gan + 2.0km], "1151"); + track(:first :removed, wb[:lan + 1sw, :gan - 0.5sw]); } with link = "point.de.Gandow" { + track(:first:station :removed, wb[:gan - 0.5sw, :gan + 0.5sw]); marker(:de.bk :removed :left, wb[:gan]); + slabel(:bottom :removed :light, wb[:gan] << 1.1sh + (-0.5sw, 0dt), + "Gandow" + ); + } + + with link = "line.de.1151" { + track(:first :removed, wb[:gan + 0.5ssw, :len - 1sw]); } with link = "point.de.Lenzen-Elbe" { - track(:first:station :removed, wb[:len - 1ssw, :len + 1ssw]); + track(:first:station :removed, wb[:len - 1sw, :len + 1sw]); marker(:de.bf :removed :left, wb[:len]); - slabel(:left :removed, wb[:len - 1ssw] << 2.4ssw, - hbox(:center:base, + slabel(:left :removed, wb[:len - 0.5sw] << 1.2sh, + hbox(:right:top, hbox(:center:base, span(:regular, "Lenzen "), span(:light, "(Elbe)") - ) + )) ); } with link = "line.de.1151" { - track(:first :removed, wb[:len + 1ssw, :pol - 1ssw]); + track(:first :removed, wb[:len + 1sw, :eld - 0.5sw]); } with link = "point.de.Eldenburg" { - track(:first:station :removed, wb[:eld - 0.5ssw, :eld + 0.5ssw]); + track(:first:station :removed, wb[:eld - 0.5sw, :eld + 0.5sw]); marker(:de.bk :removed :right, wb[:eld]); + slabel(:top :removed :light, wb[:eld] >> 1.0sh, "Eldenburg"); + } + + with link = "line.de.1151" { + track(:first :removed, wb[:eld + 0.5sw, :pol - 1sw]); } with link = "point.de.Polz" { - track(:first:station :removed, wb[:pol - 1ssw, :pol + 1ssw]); + track(:first:station :removed, wb[:pol - 1sw, :pol + 1sw]); marker(:de.bf :removed :left, wb[:pol]); - slabel(:top :removed, wb[:pol] >> 0.5dt, "Polz"); + slabel(:bottom :removed, wb[:pol] << 1.1sh, "Polz"); } with link = "line.de.1151" { - with layer = -1 track(:first :removed, wb[:pol + 1ssw, :dom - 1ssw]); + track(:first :removed, wb[:pol + 1sw, :dom - 1sw]); + line_label(:left:n :removed, wb[:pol + 3.5km], "1151"); } with link = "point.de.Dömitz" { - track(:first:station :removed, wb[:dom - 1ssw, :dom + 1ssw]); - marker(:de.bf :removed :right, wb[:dom]); - slabel(:left :removed, wb[:dom - 1ssw] >> 2.0ssw, + # DE 1151 + track(:first :station :removed, wb[:dom - 1ssw, :dom + 1ssw]); + + # DE 6441 + track(:second :station :removed, + wb[:dom - 1sw, :dom + 0.5sw + 1dl] >> 1dt + -- wb[:dom + 0.5sw + 2dl, :dom + 0.5sw + 2.1dl] + ); + + marker(:de.bf :removed :right, wb[:dom] >> 1dt); + slabel(:left :removed, wb[:dom - 1sw] >> 1dt >> 1.8sh, span(:bold, "Dömitz") ); } with link = "line.de.1151" { - track(:first :removed, wb[:dom + 1ssw, :dog - 0.5ssw]); + track(:first :removed, wb[:dom + 1sw, :dog - 0.5sw]); } with link = "point.de.Dömitz-LGr" { - track(:first :removed, wb[:dog - 0.5ssw, :dog + 0.5ssw]); - with layer = -4 marker(:de.dirgr :removed :right, wb[:dog]); - with layer = -4 marker(:de.dirgr :removed :left, wb[:dog]); + track(:first :removed, wb[:dog - 0.5sw, :dog + 0.5sw]); + marker(:de.lgr :removed :right, wb[:dog]); + marker(:de.lgr :removed :left, wb[:dog]); + slabel(:left :removed :roman:italic, + wb[:dog] >> 1.5sh + (0.3sw, 0dt), + "NI/MV" + ); } + + # DE-A } diff --git a/rules/de/w/d3/61/6100.map b/rules/de/w/d3/61/6100.map index 0227e227..945317ca 100644 --- a/rules/de/w/d3/61/6100.map +++ b/rules/de/w/d3/61/6100.map @@ -1,6 +1,6 @@ # DE 6100. Berlin-Spandau - Hamburg-Altona # -let ba = path("d4.de.w.6100"); +let ba = path("d3.de.w.6100"); with detail = 3 { with link = "line.de.6100" { @@ -231,23 +231,30 @@ with detail = 3 { } with link = "point.de.Wittenberge" { - # Str. 6100 - track(:first:station :double :cat:ac15 :pax, ba[:wit - 1ssw, :wit.u]); + # DE 6100 + track(:first :double:station :cat:ac15 :pax, + ba[:wit - 1sw, :wit + 1sw] + ); - # Str. 1151 - with layer = -4 track(:first:station :removed, - ba[:wit.yd - 0.1dl, :wit.yd] << 0.5dt - .. path("d4.de.w.1151")[:wit.hh - 0.1dl, :wit.hh] + # DE ?? - DE 1151 + track(:first :station :cat:ac15 :pax, + ba[:wit - 1sw, :wit + 0.5sw + 1dl] << 1.5dt + -- ba[:wit + 0.5sw + 2dl, :wit + 0.5sw + 2.1dl] << 0.5dt + ); + track(:first :station :removed, + ba[:wit - 0.5sw + 1dl, :wit + 1.5sw] << 1.5dt ); - marker(:de.bf :cat:ac15 :pax :left, ba[:wit] << 0.5dt); - slabel(:left :cat:ac15 :pax, ba[:wit - 0.4ssw] << 0.5dt << 1.6ssw, + marker(:de.bf :cat:ac15 :pax :left, ba[:wit] << 1.5dt); + slabel(:left :cat:ac15 :pax, ba[:wit - 0.4ssw] << 1.5dt << 1.6ssw, span(:bold, "Wittenberge") ); } with link = "point.de.Wittenberge-Nord" { - track(:first:station :double :cat:ac15 :pax, ba[:wit.u, :win + 1ssw]); + track(:first:station :double :cat:ac15 :pax, + ba[:wit + 1sw, :win + 1sw] + ); marker(:de.bft :cat:ac15 :left, ba[:win] << 0.5dt); with layer = -1 marker( :de.bft.casing :cat:ac15 :left, ba[:win] << 0.5dt @@ -402,7 +409,7 @@ with detail = 3 { } with link = "point.de.point.de.Hagenow-Land" { - let ho = path("d4.de.w.6928"); + let ho = path("d3.de.w.6928"); track(:first:station :double :cat:ac15 :pax, ba[:hag - 1ssw, :hag + 1ssw] diff --git a/rules/de/w/d3/69/6928.map b/rules/de/w/d3/69/6928.map index 13c0aa08..9393cd3c 100644 --- a/rules/de/w/d3/69/6928.map +++ b/rules/de/w/d3/69/6928.map @@ -1,6 +1,6 @@ # DE 6928. Hagenow Land - Bad Oldesloe # -let ho = path("d4.de.w.6928"); +let ho = path("d3.de.w.6928"); with detail = 3 { # point.de.Hagenow-Land de.6928 diff --git a/rules/de/w/d4/11/1122.map b/rules/de/w/d4/11/1122.map index 1b4916b8..7afc6d57 100644 --- a/rules/de/w/d4/11/1122.map +++ b/rules/de/w/d4/11/1122.map @@ -1,6 +1,6 @@ # DE 1122. Lübeck Hbf - Strasburg (Meckl) # -let ls = path("d4.de.w.1122"); +let ls = path("d3.de.w.1122"); with detail = [4, 5] { with link = "point.de.Herrnburg-LGr" { @@ -459,8 +459,8 @@ with detail = [4, 5] { with link = "line.de.1122" { - track(:first :removed, ls[:ram + 0.5sw, :kle.a] << 0.5dt); - track(:first :pax, ls[:ram + 0.5sw, :kle.a] >> 0.5dt); + track(:first :removed, ls[:ram + 0.5sw, :kle.al] << 0.5dt); + track(:first :pax, ls[:ram + 0.5sw, :kle.al] >> 0.5dt); with layer = 1 line_badge(:pax, ls[:ram + 2.4km], "1122"); } @@ -711,7 +711,7 @@ with detail = [4, 5] { with link = "point.de.Bützow" { - let br = path("d4.de.6446"); + let br = path("d3.de.6446"); # Gl. 1 (Str. 1122 R - 6445 R) track(:first:station :cat:ac15 :pax, br[:but.a, :but.g] >> 0.5dt); @@ -1044,7 +1044,7 @@ with detail = [4, 5] { with link = "point.de.Priemerburg" { - let pp = path("d4.de.6926"); + let pp = path("d3.de.6926"); # Gl. 1 (Str. 1122 L) track(:first:station :cat:ac15 :pax, ls[:pri.a, :pri.f] << 1.5dt); @@ -1155,7 +1155,7 @@ with detail = [4, 5] { with link = "point.de.Priemerwald-Süd" { # Str. 6927 with layer = -4 track(:second:station :removed, - path("d4.de.6927")[:prs + 1sw, :prs] << 2.5dt + path("d3.de.6927")[:prs + 1sw, :prs] << 2.5dt -- ls[:prs + 3dl, :prs + 3.1dl] >> 0.5dt ); @@ -1171,7 +1171,7 @@ with detail = [4, 5] { # Str. 6939 with layer = -3 track(:second:station, - path("d4.de.6939")[:prs + 1sw, :prs - 1sw] >> 0.5dt + path("d3.de.6939")[:prs + 1sw, :prs - 1sw] >> 0.5dt ); with layer = -4 marker(:de.abzw :removed :left, ls[:prs] << 2.5dt); @@ -1257,7 +1257,7 @@ with detail = [4, 5] { with link = "point.de.Lalendorf" { - let ll = path("d4.de.6447"); + let ll = path("d3.de.6447"); # Gl. 1 (Str. 1122 L) track(:first:station :cat:ac15 :pax, ls[:lal.a, :lal.f] << 0.5dt); diff --git a/rules/de/w/d4/11/1151.map b/rules/de/w/d4/11/1151.map index dcec4e00..9f9f077d 100644 --- a/rules/de/w/d4/11/1151.map +++ b/rules/de/w/d4/11/1151.map @@ -1,6 +1,6 @@ # DE 1151. Wittenberge - Buchholz (Nordh) # -let wb = path("d4.de.w.1151"); +let wb = path("d3.de.w.1151"); with detail = [4, 5] { # point.de.Wittenberge de.6100 @@ -8,9 +8,9 @@ with detail = [4, 5] { with link = "line.de.1151" { track(:first :removed, - wb[:wit.hh, :cum - 1sw] + wb[:wit.yyd, :cum - 1sw] ); - with layer = 1 line_badge(:removed, wb[:wit.hh + 2.5km], "1151"); + with layer = 1 line_badge(:removed, wb[:wit.yyd + 2.5km], "1151"); } diff --git a/rules/de/w/d4/61/6100.map b/rules/de/w/d4/61/6100.map index ee13009e..eb4bf3cd 100644 --- a/rules/de/w/d4/61/6100.map +++ b/rules/de/w/d4/61/6100.map @@ -1,7 +1,7 @@ # DE 6100. Berlin-Spandau - Hamburg-Altona # -let ba = path("d4.de.w.6100"); -let ba.wis = path("d4.de.6100.wis"); +let ba = path("d3.de.w.6100"); +let ba.wis = path("d3.de.6100.wis"); with detail = [4, 5] { with link = "line.de.6100" { @@ -641,7 +641,7 @@ with detail = [4, 5] { with link = "point.de.Wittenberge" { - let mw = path("d4.de.w.6401"); + let mw = path("d3.de.w.6401"); # Gl. 1 (Str. 6100 R) track(:first:station :cat:ac15 :pax, ba[:wit.a, :wit.u] >> 0.5dt); @@ -724,7 +724,7 @@ with detail = [4, 5] { # Str. 1151 with layer = -4 track(:first:station :removed, ba[:wit.ym + 2.5dl, :wit.yd] << 1.5dt - .. path("d4.de.w.1151")[:wit.hh - 0.1dl, :wit.hh] + .. path("d3.de.w.1151")[:wit.yyd - 0.1dl, :wit.yyd] ); # Anschl. Stadt Wittenberg @@ -1104,7 +1104,7 @@ with detail = [4, 5] { # Gl. 11 (Str. 6935 - Str. 6441 R) track(:second:station :pax, - path("d4.de.6935")[:lud.b, :lud.yp - 2dl] >> 2.5dt + path("d3.de.6935")[:lud.b, :lud.yp - 2dl] >> 2.5dt ); track(:first:station :cat:ac15 :pax, ba[:lud.yp - 0.1dl, :lud.yp] >> 0.5dt @@ -1327,7 +1327,7 @@ with detail = [4, 5] { with link = "point.de.Hagenow-Land" { - let hh = path("d4.de.6442"); + let hh = path("d3.de.6442"); # Gl. 1 (Str. 6100 R) track(:first:station :cat:ac15 :pax, @@ -1403,7 +1403,7 @@ with detail = [4, 5] { with layer = -1 track(:second:station :pax, ba[:hag.yz, :hag.yz + 1dl] >> 1.5dt -- ba[:hag.yz + 2dl, :hag.yz + 3dl] >> 2.5dt - .. path("d4.de.w.6928")[:hag.gg - 0.1dl, :hag.gg] + .. path("d3.de.w.6928")[:hag.gg - 0.1dl, :hag.gg] ); marker(:de.bf :cat:ac15 :pax :right, hh[:hag] << 1.5dt); diff --git a/rules/de/w/d4/69/6928.map b/rules/de/w/d4/69/6928.map index 2e971cb6..3e17d2fa 100644 --- a/rules/de/w/d4/69/6928.map +++ b/rules/de/w/d4/69/6928.map @@ -1,6 +1,6 @@ # DE 6928. Hagenow Land - Bad Oldesloe # -let ho = path("d4.de.w.6928"); +let ho = path("d3.de.w.6928"); with detail = [4, 5] { # point.de.Hagenow-Land de.6928 @@ -61,7 +61,7 @@ with detail = [4, 5] { ); # Anschl. Bw - let hob = path("d4.de.6928.hbw"); + let hob = path("d3.de.6928.hbw"); track(:station, hob[:has.yb, :f]); track(:station, hob[:r - 0.1dl, :r] diff --git a/rules/de/w/d4/69/6939.map b/rules/de/w/d4/69/6939.map index e475a1ea..787602d9 100644 --- a/rules/de/w/d4/69/6939.map +++ b/rules/de/w/d4/69/6939.map @@ -1,6 +1,6 @@ # DE 6939. Meyenburg - Güstrow # -let mg = path("d4.de.6939"); +let mg = path("d3.de.6939"); with detail = [4, 5] { # ... diff --git a/rules/tmp-de/a/d3/10/1000.map b/rules/tmp-de/a/d3/10/1000.map new file mode 100644 index 00000000..9727efa7 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1000.map @@ -0,0 +1,81 @@ +# DE 1000. Flensburg Weiche - Harrislee Grenze +# +let flwhag = path("d4.de.1000"); + +with detail = 3 { + # point.de.Flensburg-Weiche de.1040 + + with link = "line.de.1000" { + with layer = 3 track(:first:station :double :cat:ac15, + flwhag[:flw.g, :ffle] + ); + with layer = 4 track(:first:station :cat:ac15, + flwhag[:ffle, :fri - 0.5ssw] << 0.5dt + ); + with layer = 4 track(:first:station :cat:ac15 :pax, + flwhag[:ffle, :fri - 0.5ssw] >> 0.5dt + ); + } + + with link = "point.de.Flensburg-Friedensweg" { + with layer = -1 track(:first:station :cat:ac15, + flwhag[:fri - 0.5ssw, :fri] << 0.5dt + ); + with layer = -1 track(:first:station :cat:ac15 :pax, + flwhag[:fri - 0.5ssw, :fri] >> 0.5dt + ); + track(:first:station :double :cat:ac15 :pax, + flwhag[:fri, :fri + 0.5ssw] + ); + marker(:de.abzw :cat:ac15, flwhag[:fri] >> 0.5dt); + } + + with link = "line.de.1000" { + track(:first :double :cat:ac15 :pax, + flwhag[:fri + 0.5ssw, :har - 1ssw] + ); + + guide(:linenum :cat:ac15 :pax, + flwhag[:fri + 1.5km] >> 1.2dt + -- flwhag[:fri + 1.5km] >> 3.5dt + ); + label(:linenum :cat:ac15 :pax, flwhag[:fri + 1.5km] >> 4.0dt, + hbox(:left:middle, "1000") + ); + } + + with link = "point.de.Harrislee" { + track(:first:station :double :cat:ac15 :pax, + flwhag[:har - 1ssw, :har + 1ssw] + ); + with layer = -1 marker(:de.bf :removed, flwhag[:har] >> .5dt); + slabel(:left :removed, flwhag[:har - 0.3sw] << 1.8dt, "Harrislee"); + } + + with link = "line.de.1000" { + track(:first :double :cat:ac15 :pax, + flwhag[:har + 1ssw, :hag - 0.5ssw] + ); + } + + with link = "point.int.Harrislee-Padborg" { + track(:first:station :double :cat:ac15 :pax, + flwhag[:hag - 0.5sw, :hag + 0.5sw] + ); + marker(:de.dirgr :cat:ac15, flwhag[:hag] >> 0.5dt); + marker(:statdt :cat:ac15, flwhag[:hag] << 0.5dt); + marker(:de.dirgr :cat:ac15 :left, flwhag[:hag] << 0.5dt); + label(:cat:ac15 :pax :badgesize, + flwhag[:hag] << 5dt, + hbox( + :right :middle, + vbox(:center :middle, + " DK FP ", + hbar(0.3), + " DE 1000 " + ) + ) + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1001.map b/rules/tmp-de/a/d3/10/1001.map new file mode 100644 index 00000000..8dbc3996 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1001.map @@ -0,0 +1,89 @@ +# DE 1001. Flensburg Weiche - Lindholm +# +let flwlin = path("d4.de.1001"); + +with detail = 3 { + # point.de.Flensburg-Weiche de.1040 + + with link = "line.de.1001" { + with layer = -1 track(:second :removed, flwlin[:flw.c, :han - 1sw]); + } + + with link = "point.de.Handewitt" { + track(:second :removed :station, flwlin[:han - 1sw, :han + 1sw]); + marker(:de.hst :removed :left, flwlin[:han]); + slabel(:bottom :removed, flwlin[:han] << 1.1sh, "Handewitt"); + } + + with link = "line.de.1001" { + track(:second :removed, flwlin[:han + 1sw, :una - 1sw]); + } + + with link = "point.de.Unaften" { + track(:second :removed :station, flwlin[:una - 1sw, :una + 1sw]); + marker(:de.hp :removed :right, flwlin[:una]); + slabel(:top :removed, flwlin[:una] >> 1.2sh, "Unaften"); + } + + with link = "line.de.1001" { + track(:second :removed, flwlin[:una + 1sw, :wal - 1sw]); + } + + with link = "point.de.Wallsbüll" { + track(:second :removed :station, flwlin[:wal - 1sw, :wal + 1sw]); + marker(:de.bf :removed :left, flwlin[:wal]); + slabel(:bottom :removed, flwlin[:wal] << 1.3ssw + (5pt, 0pt), + "Wallsbüll" + ); + } + + with link = "line.de.1001" { + track(:second :removed, flwlin[:wal + 1sw, :saf - 1sw]); + } + + with link = "point.de.Schafflund" { + track(:second :removed :station, flwlin[:saf - 1sw, :saf + 1sw]); + marker(:de.hst :removed :left, flwlin[:saf]); + slabel(:bottom :removed, flwlin[:saf] << 1.2sh, "Schafflund"); + } + + with link = "line.de.1001" { + track(:second :removed :flip, flwlin[:saf + 3.2km, :saf + 1sw]); + line_badge(:removed, flwlin[:saf + 3.2km], "1001"); + track(:second :removed, flwlin[:saf + 3.2km, :spr - 1sw]); + } + + with link = "point.de.Sprakebüll" { + track(:second :removed :station, flwlin[:spr - 1sw, :spr + 1sw]); + marker(:de.hst :removed :right, flwlin[:spr]); + slabel(:top :removed, flwlin[:spr - 1sw] >> 1.3sh, "Sprakebüll"); + } + + with link = "line.de.1001" { + track(:second :removed, flwlin[:spr + 1sw, :ach - 1sw]); + } + + with link = "point.de.Achtrup" { + track(:second :removed :station, flwlin[:ach - 1sw, :ach + 1sw]); + marker(:de.hst :removed :left, flwlin[:ach]); + slabel(:bottom :removed, flwlin[:ach] << 1.2sh, "Achtrup"); + } + + with link = "line.de.1001" { + track(:second :removed, flwlin[:ach + 1sw, :lec - 1sw]); + } + + with link = "point.de.Leck" { + track(:second :removed :station, flwlin[:lec - 1sw, :lec + 1sw]); + marker(:de.bf :removed :left, flwlin[:lec]); + slabel(:bottom :removed, flwlin[:lec] << 1.2sh, "Leck"); + } + + with link = "line.de.1001" { + with layer = -1 track(:second :removed, + flwlin[:lec + 1ssw, :lin.aa - 500m] + .. flwlin[:lin - 1ssw, :lin - 0.9ssw] >> 0.5dt + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1002.map b/rules/tmp-de/a/d3/10/1002.map new file mode 100644 index 00000000..ce4fc40e --- /dev/null +++ b/rules/tmp-de/a/d3/10/1002.map @@ -0,0 +1,28 @@ +# DE 1002. Flensburg Weiche - Flensburg Hafen Ost +# DE 1003. Flensburg Alter Bf - Flensburg Hafen West +# +let flafhw = path("d4.de.1003"); +let flwfho = path("d4.de.1002"); +let nf = path("d4.de.1040"); + +with detail = 3 { + # point.de.Flensburg-Weiche de.1040 + + with link = "line.de.1002" { + track(:second :removed :flip, + nf[:flw.f, :fle - 1.5ssw] << 1.5dt + .. flwfho[:fla - 1.1ssw, :fla - 1ssw] + ); + } + + with link = "point.de.Flensburg-Alter-Bf" { + track(:second :station :removed, flwfho[:fla - 1ssw, :fla + .5ssw]); + track(:station :removed, flwfho[:fla + .5ssw, :f]); + track(:station :removed, + flwfho[:fla + .5ssw, :fla + .6ssw] + .. flafhw[:afhw + 0.7km, :f] + ) + marker(:right :de.bf :removed, flwfho[:fla.bf - 0.5dt]); + } +} + diff --git a/rules/tmp-de/a/d3/10/1005.map b/rules/tmp-de/a/d3/10/1005.map new file mode 100644 index 00000000..5563d345 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1005.map @@ -0,0 +1,24 @@ +# DE 1005. Flensburg (ausschl) - Flensburg Friedensweg (ausschl) +# +let flefri = path("d4.de.1005"); + +with detail = 3 { + # point.de.Flensburg de.1040 + + with link = "line.de.1005" { + with layer = 3 track(:first :cat:ac15 :pax :flip, + flefri[:fle + .5ssw, :fle.r] >> 0.5dt + .. flefri[:fle.f + 1dt, :fri.aa] + ); + with layer = 3 track(:first:station :cat:ac15 :pax, + flefri[:fri.aa - 0.1dl, :fri.aa] + .. flefri[:ffle - 0.1dl, :ffle] >> 0.5dt + ); + with layer = 2 casing(:first :cat, + flefri[:fri.aa - 0.8km, :fri.aa + 0.4km] + ); + } + + # point.de.Flensburg-Friedensweg de.1000 +} + diff --git a/rules/tmp-de/a/d3/10/1010.map b/rules/tmp-de/a/d3/10/1010.map new file mode 100644 index 00000000..b2671c4f --- /dev/null +++ b/rules/tmp-de/a/d3/10/1010.map @@ -0,0 +1,31 @@ +# DE 1010. Schleswig - Schleswig Altstadt +# +let slesla = path("d4.de.1010"); + +with detail = 3 { + # point.de.Schleswig de.1040 + + with link = "line.de.1010" { + with layer = -1 track(:second:station :removed, + slesla[:asla - .1dl, :asla] >> 0.5dt + .. slesla[:asla + 500m, :sla - 1sw] + ); + + guide(:linenum :removed, + slesla[:asla + 1.0km] << 0.7dt + -- slesla[:asla + 1.0km] << 3.0dt + ); + label(:linenum :removed, slesla[:asla + 1.0km] << 3.0dt, + hbox(:right:middle, "1010 ") + ); + } + + with link = "point.de.Schleswig-Altstadt" { + track(:second:station :removed, slesla[:sla - 1sw, :sla.f]); + marker(:de.bf :removed :left, slesla[:sla]); + slabel(:left :removed, slesla[:sla + 0.3sw] << 1.4sh, + span(:small :bold :removed, "S. Altstadt") + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1011.map b/rules/tmp-de/a/d3/10/1011.map new file mode 100644 index 00000000..0fbccc44 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1011.map @@ -0,0 +1,97 @@ +# DE 1011. Jübeck - Husum +# +let jubhus = path("d4.de.1011"); + +with detail = 3 { + # point.de.Jübek de.1040 + + with link = "line.de.1011" { + track(:second :pax, jubhus[:jub.g + 1dt, :sol - 1ssw]); + line_label(:right:s :pax, jubhus[:sol - 2km], "1011"); + } + + with link = "point.de.Sollbrück" { + track(:second :station :pax, jubhus[:sol - 1ssw, :sol + 1ssw]); + marker(:de.awanst :removed :right, jubhus[:sol]); + marker(:de.exbf :removed :right, jubhus[:sol]); + slabel(:right :removed, jubhus[:sol + 0.5sw] << 1.5sh, + "Sollbrück" + ); + } + + with link = "line.de.1011" { + track(:second :pax, jubhus[:sol + 1ssw, :ahr - 1ssw]); + } + + with link = "point.de.Ahrenviöl" { + track(:second :station :pax, jubhus[:ahr - 1ssw, :ahr + 1ssw]); + marker(:de.hst :removed :left, jubhus[:ahr]); + marker(:de.exbf :removed :left, jubhus[:ahr]); + slabel(:bottom :removed, + jubhus[:ahr] << 1.8sh + (2.0ssw, 0dt), + "Ahrenviöl" + ); + } + + with link = "line.de.1011" { + track(:second :pax, jubhus[:ahr + 1ssw, :ohr - 1ssw]); + } + + with link = "point.de.Ohrstedt" { + track(:second :station :pax, jubhus[:ohr - 1ssw, :ohr + 1ssw]); + marker(:de.awanst :right, jubhus[:ohr]); + marker(:de.exbf :right, jubhus[:ohr]); + slabel(:bottom, jubhus[:ohr] + (2sh, 0.8dt), "Ohrstedt"); + } + + with link = "line.de.1011" { + track(:second :pax, jubhus[:ohr + 1ssw, :wes - 1ssw]); + } + + with link = "point.de.Wester-Ohrstedt" { + track(:second :station :pax, jubhus[:wes - 1ssw, :wes + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, jubhus[:wes]); + slabel(:left :removed, jubhus[:wes] >> 1.0sh + (1.5ssw, 0dt), + vbox(:right:bottom, "Wester-", "Ohrstedt ") + ); + } + + with link = "line.de.1011" { + track(:second :pax, jubhus[:wes + 1ssw, :swe - 1ssw]); + + guide(:linenum :pax, + jubhus[:wes + 1.2km] << 0.7dt + -- jubhus[:wes + 1.2km] << 3.0dt + ); + label(:linenum :pax, jubhus[:wes + 1.2km] << 3dt, + hbox(:left:top, "1011") + ); + } + + with link = "point.de.Schwesing" { + track(:second :station :pax, jubhus[:swe - 1ssw, :swe + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, jubhus[:swe]); + label(jubhus[:swe] << 0.2dt, + hbox(:left :top, span(:small :removed, "Schwesing")) + ); + } + + with link = "line.de.1011" { + track(:second :pax, jubhus[:swe + 1ssw, :ros - 1ssw]); + } + + with link = "point.de.Rosendahl" { + track(:second :station :pax, jubhus[:ros - 1ssw, :ros + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, jubhus[:ros]); + } + + with link = "line.de.1011" { + track(:second :pax, + jubhus[:ros + 1ssw, :hus.aa] + .. path("d4.de.1210")[:hus - 1.01sw, :hus - 1sw] >> 0.5dt + ); + } + + # point.de.Husum de.1210 +} + diff --git a/rules/tmp-de/a/d3/10/1012.map b/rules/tmp-de/a/d3/10/1012.map new file mode 100644 index 00000000..06320f00 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1012.map @@ -0,0 +1,133 @@ +# DE 1012. Büdelsdorf - Husum +# +let budhus = path("d4.de.1012"); + +with detail = 3 { + # point.de.Büdelsdorf de.1040 + + with link = "line.de.1012" { + track(:second:station, budhus[:bud.gg + 1dt, :gen - 1sw]); + } + + with link = "point.de.Rendsburg-Gewerbegebiet-Nord" { + with layer = -2 track(:second:station, + budhus[:gen - 1sw, :gen] + ); + marker(:de.anst :right, budhus[:gen]); + } + + with link = "line.de.1012" { + with layer = -4 track(:second :removed, budhus[:gen, :foc - 1sw]); + } + + with link = "point.de.Fockbek" { + track(:second:station :removed, budhus[:foc - 1sw, :foc + 1sw]); + marker(:de.anst :closed :left, budhus[:foc]); + marker(:de.exbf :closed :left, budhus[:foc]); + slabel(:left :closed, budhus[:foc] + (1.5dt, -1.8dt), "Fockbek"); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:foc + 1sw, :gar - 1sw]); + } + + with link = "point.de.Garlbek" { + track(:second:station :removed, budhus[:gar - 1sw, :gar + 1sw]); + marker(:de.hp :removed :right, budhus[:gar]); + slabel(:left :removed, budhus[:gar] + (3.5dt, -1.4sh), "Garlbek"); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:gar + 1sw, :hoh - 1sw]); + } + + with link = "point.de.Hohn" { + track(:second:station :removed, budhus[:hoh - 1sw, :hoh + 1sw]); + marker(:de.bf :removed :left, budhus[:hoh]); + slabel(:bottom :removed, budhus[:hoh] << 1.1sh, "Hohn"); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:hoh + 1sw, :chr - 1sw]); + line_label(:left:n :removed, budhus[:hoh + 3.5km], "1012"); + } + + with link = "point.de.Christiansholm" { + track(:second:station :removed, budhus[:chr - 1sw, :chr + 1sw]); + marker(:de.bf :removed :left, budhus[:chr]); + slabel(:top :removed, budhus[:chr] + (1sw, -1.3dt), "Christiansholm"); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:chr + 1sw, :erf - 1sw]); + } + + with link = "point.de.Erfde" { + track(:second:station :removed, budhus[:erf - 1sw, :erf + 1sw]); + marker(:de.bf :removed :left, budhus[:erf]); + slabel(:bottom :removed, budhus[:erf] << 1.1sh, "Erfde"); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:erf + 1sw, :nor - 1sw]); + } + + with link = "point.de.Norderstapel" { + track(:second :station :removed, budhus[:nor - 1sw, :nor + 1.5sw]); + track(:station :removed, + budhus[:nor + 0.4sw, :nor + 0.8sw] >> 1dt + -- budhus[:nor + 0.8sw + 1dl, :nor + 0.8sw + 1.1dl] + ); + + marker(:de.anst :removed :right, budhus[:nor + 0.8sw] >> 1dt); + marker(:de.exbf :removed :right, budhus[:nor + 0.8sw] >> 1dt); + slabel(:right :removed, budhus[:nor - 3.0sw] >> 1dt + (1sw, 0sw), + span(:bold, "Norderstapel") + ); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:nor + 1.5sw, :swa - 1sw]); + } + + with link = "point.de.Schwabstedt" { + track(:second:station :removed, budhus[:swa - 1sw, :swa + 1sw]); + marker(:de.anst :removed :left, budhus[:swa]); + marker(:de.exbf :removed :left, budhus[:swa]); + slabel(:left :removed, budhus[:swa] << 2.3sh, "Schwabstedt"); + } + + with link = "line.de.1012" { + track(:second :removed :flip, budhus[:ran - 2.4km, :swa + 1sw]); + line_label(:right:w :removed, budhus[:ran - 3km], "1012"); + track(:second :removed, budhus[:ran - 2.4km, :ran - 1sw]); + } + + + with link = "point.de.Rantrum" { + track(:second:station :removed, budhus[:ran - 1sw, :ran + 1sw]); + marker(:de.bf :removed :left, budhus[:ran]); + slabel(:right :removed, budhus[:ran - 0.7sh] >> 1dt, "Rantrum"); + } + + with link = "line.de.1012" { + track(:second :removed, budhus[:ran + 1sw, :mil - 1sw]); + } + + with link = "point.de.Mildstedt" { + track(:second:station :removed, budhus[:mil - 1sw, :mil + 1sw]); + marker(:de.anst :removed :left, budhus[:mil]); + marker(:de.exbf :removed :left, budhus[:mil]); + slabel(:right :removed, budhus[:mil - .7sw] >> 0.8dt, "Mildstedt"); + } + + with link = "line.de.1012" { + track(:second :removed, + budhus[:mil + 1sw, :hus.b] + .. budhus[:hus - 1.1sw, :hus - 1sw] >> 0.5dt + ); + } + + # point.de.Husum de.1210 +} + diff --git a/rules/tmp-de/a/d3/10/1020.map b/rules/tmp-de/a/d3/10/1020.map new file mode 100644 index 00000000..3e8e316b --- /dev/null +++ b/rules/tmp-de/a/d3/10/1020.map @@ -0,0 +1,235 @@ +# DE 1020. Kiel-Hassee - Flensburg +# +let hasfle = path("d4.de.1020"); + +with detail = 3 { + # point.de.Kiel-Hassee de.1022 + + with link = "line.de.1020" { + track(:second :pax, + hasfle[:has + 1ssw, :has + 1.1ssw] >> 0.5dt + .. hasfle[:has.ff, :kro - 1ssw] + ); + } + + with link = "point.de.Kronshagen" { + track(:second:station :pax, hasfle[:kro - 1ssw, :kro + 1ssw]); + marker(:de.hp :pax :left, hasfle[:kro]); + marker(:de.exbf :pax :left, hasfle[:kro]); + slabel(:left :pax, hasfle[:kro - 0.1sw] << 2.2sh, "Kronshagen"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:kro + 1ssw, :suc - 1ssw]); + } + + with link = "point.de.Suchsdorf" { + track(:second :station :pax, hasfle[:suc - 1ssw, :suc + 1ssw]); + marker(:de.bf :pax :left, hasfle[:suc]); + slabel(:left :pax, hasfle[:suc - 1sw] << 1.4sh, + span(:small :bold, "Suchsdorf") + ); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:suc + 1ssw, :lev - 1ssw]); + } + + with link = "point.de.Levensau" { + track(:second:station :pax, hasfle[:lev - 1ssw, :lev + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, hasfle[:lev]); + slabel(:left :removed, hasfle[:lev - 0.3sh] + (0dt, 0.55sh), + hbox(:right:top, "Levensau") + ); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:lev + 1ssw, :nwi - 1ssw]); + } + + with link = "point.de.Neuwittenbek" { + track(:second:station :pax, hasfle[:nwi - 1ssw, :nwi + 1ssw]); + track(:second :station, + hasfle[:nwi - 0.5sw - 1.1dl, :nwi - 0.5sw - 1dl] + -- hasfle[:nwi - 0.5sw, :nwi.f] >> 1dt + ); + marker(:de.bbf :left, hasfle[:nwi]); + marker(:de.exbf :left, hasfle[:nwi]); + slabel(:left, hasfle[:nwi - 0.1sw] << 2.6sh, + span(:bold, "Neuwittenbek") + ); + } + + with link = "line.de.1020" { + track(:second :pax :flip, hasfle[:nwi + 2.8km, :nwi + 1ssw]); + line_badge(:pax, hasfle[:nwi + 2.8km], "1020"); + track(:second :pax, hasfle[:nwi + 2.8km, :get - 1ssw]); + } + + with link = "point.de.Gettorf" { + track(:second:station :pax, hasfle[:get - 1ssw, :get + 1ssw]); + marker(:de.bf :pax :right, hasfle[:get]); + slabel(:right :pax, hasfle[:get - 0.4sw] >> 1.3sh, "Gettorf"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:get + 1ssw, :ndo - 1ssw]); + } + + with link = "point.de.Neudorf" { + track(:second:station :pax, hasfle[:ndo - 1ssw, :ndo + 1ssw]); + marker(:de.ldst :removed :left, hasfle[:ndo]); + slabel(:left :removed, hasfle[:ndo] << 2ssw, "Neudorf"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:ndo + 1ssw, :aho - 1ssw]); + } + + with link = "point.de.Altenhof-Schlesw" { + track(:second:station :pax, hasfle[:aho - 1ssw, :aho + 1ssw]); + marker(:de.hp :removed :right, hasfle[:aho]) + slabel(:right :removed, hasfle[:aho + 0.7sw] >> 1.2sh, + hbox(:left :base, + span(:small, "Altenhof "), + span(:small :light, "(Schlesw)") + ) + ); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:aho + 1ssw, :ecs - 1ssw]); + } + + with link = "point.de.Eckernförde" { + track(:second :station :pax, hasfle[:ecs - 1ssw, :ecs + 2ssw]); + marker(:de.bf :pax :right, hasfle[:ecs]); + slabel(:right :pax, hasfle[:ecs - 0.9sw] >> 1.3sh, + span(:bold, "Eckernförde") + ); + } + + with link = "line.de.1020" { + track(:second :pax :flip, hasfle[:rie - 3.2km, :ecs + 2ssw]); + line_badge(:pax, hasfle[:rie - 3.2km] << 0.2dt, "1020"); + track(:second :pax, hasfle[:rie - 3.2km, :rie - 1ssw]); + } + + with link = "point.de.Rieseby" { + track(:second:station :pax, hasfle[:rie - 1ssw, :rie + 1ssw]); + marker(:de.hp :pax :right, hasfle[:rie]); + marker(:de.exbf :pax :right, hasfle[:rie]); + slabel(:left :pax, hasfle[:rie - .5ssw] << 1.3dt, "Rieseby"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:rie + 1ssw, :lin - 3ssw]); + } + + with link = "point.de.Boren-Schleibrücke" { + track(:second:station :pax, hasfle[:lin - 3ssw, :lin - 1ssw]); + marker(:de.bk :left, hasfle[:sle]); + } + + with link = "point.de.Lindaunis" { + track(:second:station :pax, hasfle[:lin - 1ssw, :lin + 1ssw]); + marker(:de.hp :museum, hasfle[:lin]); + slabel(:right :museum, hasfle[:lin - 0.6sw] >> 1.5sh, "Lindaunis"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:lin + 1ssw, :fah - 1ssw]); + } + + with link = "point.de.Fahrtoft" { + track(:second:station :pax, hasfle[:fah - 1ssw, :fah + 1ssw]); + with layer = -1 marker(:de.hst :removed :left, hasfle[:fah]); + slabel(:right:removed, hasfle[:fah - 0.35ssw] >> 1dt, "Fahrtoft"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:fah + 1ssw, :sud - 1ssw]); + } + + with link = "point.de.Süderbrarup" { + track(:second:station :pax, hasfle[:sud - 1ssw, :sud + 1.5ssw]); + marker(:de.bf :pax :right, hasfle[:sud]); + slabel(:left :pax, hasfle[:sud - .5ssw] << 1.5dt, + span(:small :bold, "Süderbrarup") + ); + } + + with link = "line.de.1020" { + track(:second :pax :flip, hasfle[:sud + 3km, :sud + 1.5ssw]); + line_badge(:pax, hasfle[:sud + 3km] >> 0.2dt, "1020"); + track(:second :pax, hasfle[:sud + 3km, :moh - 1ssw]); + } + + with link = "point.de.Mohrkirch" { + track(:second:station :pax, hasfle[:moh - 1ssw, :moh + 1ssw]); + marker(:de.bf :removed, hasfle[:moh]); + slabel(:right :removed, hasfle[:moh - 0.6sw] >> 1.3sh, "Mohrkirch"); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:moh + 1ssw, :sor - 1ssw]); + } + + with link = "point.de.Sörup" { + track(:second:station :pax, hasfle[:sud - 1ssw, :sor + 1ssw]); + marker(:de.bf :pax :right, hasfle[:sor]); + slabel(:right :pax, hasfle[:sor - .5ssw] >> 1.3ssw, + span(:small :bold, "Sörup") + ); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:sor + 1ssw, :win - 1ssw]); + } + + with link = "point.de.Winderatt" { + track(:second:station :pax, hasfle[:win - 1ssw, :win + 1ssw]); + marker(:de.hp :closed, hasfle[:win]); + slabel(:left :removed, hasfle[:win + 0.8sw] << 0.5dt, + hbox(:right:top, "Winderatt") + ); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:win + 1ssw, :hus - 1ssw]); + } + + with link = "point.de.Husby" { + track(:second:station :pax, hasfle[:hus - 1ssw, :huh + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, hasfle[:hus]); + marker(:de.hp :pax :left, hasfle[:huh]); + slabel(:left :pax, hasfle[:huh - 0.6sw] << 0.9sh, + hbox(:right:top, "Husby") + ); + } + + with link = "line.de.1020" { + track(:second :pax, hasfle[:huh + 1ssw, :maa - 1ssw]); + } + + with link = "point.de.Maasbüll-Angeln" { + track(:second:station :pax, hasfle[:maa - 1ssw, :maa + 1ssw]); + marker(:de.bf :removed :left, hasfle[:maa]); + slabel(:right, hasfle[:maa - .4ssw] >> 1dt, + hbox(:left :base, + span(:small :removed, "Maasbüll "), + span(:small :light :removed, "(Angeln)") + ) + ); + } + + with link = "line.de.1020" { + track(:second :pax, + hasfle[:maa + 1ssw, :fle.aaa] + .. hasfle[:fle - 1.1ssw, :fle - 1ssw] >> 0.5dt + ); + } + + # point.de.Flensburg de.1040 +} + diff --git a/rules/tmp-de/a/d3/10/1021.map b/rules/tmp-de/a/d3/10/1021.map new file mode 100644 index 00000000..f67db901 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1021.map @@ -0,0 +1,26 @@ +# DE 1021. Kiel-Hassee Cittipark (ausschl.) - Kiel West +# +let hw = path("d4.de.1021"); + +with detail = 3 { + # point.de.Kiel-Hassee de.1022 + + with link = "line.de.1021" { + with layer = -4 track(:second:station :removed, + hw[:has.hn - 0.1dl, :has.hn] >> 0.5dt + .. hw[:has.gg + 1.5dt, :has.gg + 1.51dt] + ); + with layer = -4 track(:second :removed, + hw[:has.gg + 1.51dt, :kiw - 1ssw] + ); + } + + with link = "point.de.Kiel-West" { + track(:second :station :removed, hw[:kiw - 1ssw, :kiw + 1ssw]); + marker(:de.bf :removed :right, hw[:kiw]); + slabel(:top:removed, hw[:kiw + 1.1sh], + span(:small :bold :removed, "K. West") + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1022.map b/rules/tmp-de/a/d3/10/1022.map new file mode 100644 index 00000000..97ce20df --- /dev/null +++ b/rules/tmp-de/a/d3/10/1022.map @@ -0,0 +1,178 @@ +# DE 1022. Kiel Hbf - Osterrönfeld +# +let ko = path("d4.de.1022"); + +with detail = 3 { + # point.de.Kiel-Hbf de.1220 + + with link = "line.de.1022" { + track(:first :pax, + ko[:kie.ks - 1.1dt, :kie.ks - 1dt] >> 0.5dt + .. ko[:khg - 0.51ssw, :khg - 0.5ssw] >> 0.5dt + ); + } + + with link = "point.de.Kiel-Hg" { + with layer = -1 track(:first:station :double :cat:ac15, ko[:khg - 0.5ssw, :khg + 0.5ssw]); + + # Str. 1022 + track(:first:station :pax, + ko[:khg - 0.5ssw, :khg + 0.5ssw] >> 0.5dt + ); + + # Str. 1031 + track(:first:station, + ko[:khg - 0.5ssw, :khg + 0.5ssw] << 0.5dt + ); + + with layer = -4 marker(:de.abzw :removed, ko[:khg] >> 0.5dt); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:khg + 0.5ssw, :has - 1ssw] >> 0.5dt); + } + + with link = "point.de.Kiel-Hassee" { + track(:first:station :pax, ko[:has - 1ssw, :has + 1ssw] >> 0.5dt); + + with layer = -2 track(:first:station, + ko[:has - 1ssw, :has - 0.5ssw] << 0.5dt + ); + track(:first:station :pax, ko[:has - 0.5ssw, :has + 1ssw] << 0.5dt); + + marker(:de.bf :pax :left, ko[:has] << 0.5dt); + slabel(:left :pax, ko[:has - 0.2ssw] << 0.5dt + (0dt, 1.5dt), + vbox(:right :top, + span(:small :bold, "K.-Hassee Cittipark") + ) + ); + } + + with link = "line.de.1022" { + track(:first :pax, + ko[:has + 1ssw, :has + 1.1ssw] << 0.5dt + .. ko[:has.f, :rus - 1ssw] + ); + } + + with link = "point.de.Russee" { + track(:first:station :pax, ko[:rus - 1ssw, :rus + 1ssw]); + marker(:left :de.hp :pax, ko[:rus]); + #slabel(:top, ko[:rus] >> 1.4ssw, "K.-Russee"); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:rus + 1ssw, :met - 1ssw]); + } + + with link = "point.de.Kiel-Mettenhof" { + track(:first:station :pax, ko[:met - 1ssw, :met + 1ssw]); + with layer = -4 marker(:de.hp :removed :right, ko[:met]); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:met + 1ssw, :mel - 1ssw]); + } + + with link = "point.de.Melsdorf" { + track(:first :station :pax, ko[:mel - 1ssw, :mel + 1ssw]); + marker(:de.hp :pax :right, ko[:mel]); + slabel(:top :pax, ko[:mel] >> 1.15sh, "Melsdorf"); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:mel + 1ssw, :fle - 1ssw]); + } + + with link = "point.de.Flemhude" { + track(:first :station :pax, ko[:fle - 1ssw, :fle + 1ssw]); + with layer = -1 marker(:de.hst :removed :right, ko[:fle]); + slabel(:top :removed, ko[:fle] >> 1.2sh, "Flemhude"); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:fle + 1ssw, :ach - 1ssw]); + } + + with link = "point.de.Achterwehr" { + track(:first :station :pax, ko[:ach - 1ssw, :ach + 1ssw]); + marker(:de.hp :pax :left, ko[:ach]); + slabel(:right :pax, ko[:ach] + (0sw, 1sh), + hbox(:left:top, "Achterwehr") + ); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:ach + 1ssw, :fel - 1ssw]); + } + + with link = "point.de.Felde-Brandsbek" { + track(:first :station :pax, ko[:fel - 1ssw, :fel + 1ssw]); + marker(:de.bf :pax :left, ko[:fel]); + slabel(:bottom :pax, ko[:fel] << 1.2sh, + vbox(:center:top, " Felde-", "Brandsbek") + ); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:fel + 1ssw, :bre - 1ssw]); + with layer = 1 line_badge(:pax, ko[:fel + 2km] @ -4 >> 0.3dt, "1022"); + } + + with link = "point.de.Bredenbek" { + track(:first :station :pax, ko[:bre - 1ssw, :bre + 1ssw]); + marker(:de.hp :pax :left, ko[:bre]); + slabel(:bottom :pax, ko[:bre] << 1.1sh, "Bredenbek"); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:bre + 1ssw, :kro - 1ssw]); + } + + with link = "point.de.Kronsburg" { + track(:first :station :pax, ko[:kro - 1ssw, :kro + 1ssw]); + marker(:de.bf :right :removed, ko[:kro]); + slabel(:top :removed, ko[:kro] >> 1.1ssw, "Kronsburg"); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:kro + 1ssw, :ost - 1ssw]); + } + + with link = "point.de.Ostenfeld-Rendsburg" { + track(:first :pax, ko[:ost - 1ssw, :ost + 1ssw]); + marker(:de.hst :removed, ko[:ost]); + slabel(:left :removed, ko[:ost] >> 1.4sh + (1.8sw, 0sw), + vbox(:right :bottom, + span(:small :removed, "Ostenfeld"), + span(:small :light :removed, "(Kr Rendsburg)") + ) + ); + } + + with link = "line.de.1022" { + track(:first :pax, ko[:ost + 1ssw, :sul - 1ssw]); + } + + with link = "point.de.Schülldorf" { + track(:first :station :pax, ko[:sul - 1ssw, :sul + 1ssw]); + marker(:right :de.hp :pax, ko[:sul]); + slabel(:right :pax, ko[:sul + .5ssw] << 1.4sh, + "Schülldorf" + ); + } + + with link = "line.de.1022" { + track(:first :pax, + ko[:sul + 1ssw, :oro.r - 1.5dt] + .. ko[:oro.s, :ora - 0.5ssw] >> 1.5dt + ); + } + + with link = "point.de.Osterrönfeld-Awanst" { + track(:first :station :pax, ko[:ora - 0.5ssw, :ora + 0.5ssw] >> 1.5dt); + with layer = -2 marker(:de.awanst, ko[:ora] >> 1.5dt); + } + + # point.de.Osterrönfeld de.1040 +} diff --git a/rules/tmp-de/a/d3/10/1023.map b/rules/tmp-de/a/d3/10/1023.map new file mode 100644 index 00000000..f4a27acf --- /dev/null +++ b/rules/tmp-de/a/d3/10/1023.map @@ -0,0 +1,270 @@ +# DE 1023. Kiel Hbf (ausschl.) - Neustadt (Holst) +# +let kn = path("d4.de.1023"); + +with detail = 3 { + # point.de.Kiel-Hbf de.1220 + + with link = "line.de.1023" { + with layer = -1 track(:first :pax, + path("d4.de.1220")[:kie.aa - 200m, :kie.aa - 201m] << 0.5dt + .. kn[:kss - 0.51sw, :kss - 0.5sw] + ); + } + + with link = "point.de.Kiel-Hbf-Ss" { + track(:first:station :pax, kn[:kss - 0.5sw, :kss + 0.5sw]); + track(:second:station, kn[:kss - 0.5sw, :kss + 0.5sw] << 1dt); + with layer = 2 track(:first:station, + kn[:kss - 0.5sw, :kss - 0.5dl] >> 1dt + -- kn[:kss + 0.5dl, :kss + 0.51dl] + ); + marker(:de.abzw :left, kn[:kss] << 1dt); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:kss + 0.5sw, :elh - 1sw]); + } + + with link = "point.de.Kiel-Elmschenhagen" { + track(:first:station :pax, kn[:elh - 1sw, :elh + 1sw]); + marker(:de.bf :pax :left, kn[:elh]); + with layer = -1 slabel(:right :pax, kn[:elm] << 1.7sh - (1sh, 0sh), + "K.-Elmschenhagen" + ); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:elh + 1sw, :kro - 1sw]); + } + + with link = "point.de.Kroog" { + track(:first:station :pax, kn[:kro - 1sw, :kro + 1sw]); + marker(:de.hp :closed :right, kn[:kro]); + slabel(:bottom :closed, kn[:kro] >> 1.1sh, "Kroog"); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:kro + 1sw, :raw - 1sw]); + } + + with link = "point.de.Raisdorf-West" { + track(:first:station :pax, kn[:raw - 1sw, :raw + 1sw]); + marker(:de.awanst :left, kn[:raw]); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:raw + 1sw, :rai - 1sw]); + } + + with link = "point.de.Raisdorf" { + track(:first:station :pax, kn[:rai - 1sw, :rai + 1sw]); + marker(:de.bf :pax :right, kn[:rai]); + slabel(:right :pax, kn[:rai + .6sw] << 1dt, "Raisdorf"); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:rai + 1sw, :pre - 1sw]); + with layer = -1 casing(:first, kn[:pre.a - 1dt, :pre.a + 1dt]); + + guide(:linenum :pax, + kn[:rai + 3.2km] << 1.0dt + -- kn[:rai + 3.2km] << 3.0dt + ); + label(:linenum :pax, kn[:rai + 3.2km] << 3.5dt, + hbox(:left:middle, "1023") + ); + } + + with link = "point.de.Preetz" { + track(:first:station :pax, kn[:pre - 1sw, :pre + 1sw]); + marker(:de.bf :pax :left, kn[:pre]); + slabel(:right :pax, kn[:pre - 0.4sw] << 1.5sh, + hbox(:left:top, "Preetz") + ); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:pre + 1sw, :kuh - 1sw]); + } + + with link = "point.de.Kühren-Holst" { + track(:first:station :pax, kn[:kuh - 1sw, :kuh + 1sw]); + with layer = -1 marker(:de.bf :removed :right, kn[:kuh]); + slabel(:left, kn[:kuh + .15sw] >> 1.8sh, + hbox(:center :base, + span(:small:removed, "Kühren "), + span(:small :light :removed, "(Holst)") + ) + ); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:kuh + 1sw, :wah - 1sw]); + } + + with link = "point.de.Wahlstorf" { + track(:first:station :pax, kn[:wah - 1sw, :wah + 1sw]); + marker(:de.bf :removed :left, kn[:wah]); + slabel(:right :removed, kn[:wah + .4sw] << 1.3sh, "Wahlstorf"); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:wah + 1sw, :asc - 1sw]); + with layer = 1 line_badge(:pax, kn[:asc - 2km] << 0.1dt, "1023"); + } + + with link = "point.de.Ascheberg-Holst" { + track(:first:station :pax, kn[:asc - 1sw, :asc + 1sw]); + with layer = -4 track(:first:station :closed, + path("d4.de.1041")[:asc.b, :asc.r] + ); + marker(:de.bf :pax :right, kn[:asc]); + label(kn[:asc] >> 1.1sh - (1.5sw, 0sw), + vbox(:left :top :pax, + hbox(:left :base, + span(:small :bold, "Ascheberg "), + span(:small, "(Holst)") + ) + ) + ); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:asc + 1sw, :plo - 1sw]); + } + + with link = "point.de.Plön" { + track(:first:station :pax, kn[:plo - 1sw, :plo + 1sw]); + marker(:de.bf :pax :left, kn[:plo]); + slabel(:top :pax, kn[:plo] << 1.1sw - (.5sw, 0sw), "Plön"); + } + + with link = "line.de.1023" { + track(:first :pax, kn[:plo + 1ssw, :tim - 1ssw]); + guide(:linenum :pax, + kn[:plo + 2.8km] << 0.7dt + -- kn[:plo + 2.8km] << 3dt + ); + label(:linenum :pax, kn[:plo + 2.8km] << 3dt, + hbox(:center:bottom, "1023") + ); + } + + with link = "point.de.Timmdorf" { + track(:first:station :pax, kn[:tim - 1ssw, :tim + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, kn[:tim]); + slabel(:bottom :removed, kn[:tim] >> 1.2ssw, "Timmdorf"); + } + + with link = "line.de.1023" { + track(:first :pax, + kn[:tim + 1ssw, :mal - 1ssw - .4km] + .. kn[:mal - 1ssw - .1dl, :mal - 1ssw] << 0.5dt); + } + + with link = "point.de.Malente-Gremsmühlen" { + track(:first:station :pax, kn[:mal - 1ssw, :mal + 1ssw] << 0.5dt); + track(:first:station :pax, + kn[:mal - 1ssw - .1dl, :mal - 1ssw] << 0.5dt + -- kn[:mal - 1ssw + 1dl, :mal + 1ssw] >> 0.5dt + ); + with layer = -1 track(:second :station :closed, + path("d4.de.1112")[:mal.bbb, :mal.bbb - .1dl] + .. kn[:mal - .2ssw, :mal + .5ssw] << 0.5dt << 1ssw + ); + marker(:de.hp :pax :left, kn[:mal] << 0.5dt); + marker(:de.uest :pax :left, kn[:mal] << 0.5dt); + with layer = -4 marker(:de.bf :removed :left, kn[:mal] << 0.5dt); + slabel(:right :pax, kn[:mal + 1.5ssw] << 2dt, + span(:small :bold, "Bad Malente-Gremsmühlen") + ); + } + + with link = "line.de.1023" { + track(:double :first :pax, kn[:mal + 1ssw, :eut - 1ssw]); + with layer = 1 line_badge(:pax, kn[:eut - 2.4km], "1023"); + } + + with link = "point.de.Eutin" { + track(:first:station :pax, kn[:eut - 1ssw, :eut + .5ssw] << 0.5dt); + with layer = -4 track(:second:station :removed, + kn[:eut + .5ssw, :eut + 1ssw] << .5dt + ); + track(:first:station :pax, kn[:eut - 1ssw, :eut + 1ssw] >> 0.5dt); + marker(:de.bf :pax :left, kn[:eut - .5ssw] << 0.5dt); + slabel(:right :pax, kn[:eut] << .5dt << 1.3ssw, + span(:small :bold, "Eutin") + ); + } + + with link = "line.de.1023" { + track(:second :removed, + kn[:eut + 1ssw, :eut.fff] << .5dt + .. kn[:rob - 1.1ssw, :rob - 1ssw] + ); + with layer = 1 line_badge( + :removed, kn[:eut.fff - 0.7km] << 0.5dt, "1023" + ); + } + + with link = "point.de.Röbel" { + track(:second:station :removed, kn[:rob - 1ssw, :rob + 1ssw]); + marker(:de.hp :removed :right, kn[:rob]); + slabel(:right :removed, kn[:rob + .3ssw] << .7ssw, "Röbel"); + } + + with link = "line.de.1023" { + track(:second :removed, kn[:rob + 1ssw, :buj - 1ssw]); + } + + with link = "point.de.Bujendorf" { + track(:second :station :removed, kn[:buj - 1ssw, :buj + 1ssw]); + marker(:de.bf :removed :left, kn[:buj]); + slabel(:right :removed, kn[:buj] << 1.5ssw, "Bujendorf"); + } + + with link = "line.de.1023" { + track(:second :removed, kn[:buj + 1ssw, :ove - 1ssw]); + } + + with link = "point.de.Ovelgönne-Holst" { + track(:second :station :removed, kn[:ove - 1ssw, :ove + 1ssw]); + marker(:de.hp :removed :right, kn[:ove]); + slabel(:bottom :removed, kn[:ove] >> 1.4ssw, "Ovelgönne"); + } + + with link = "line.de.1023" { + track(:second :removed, kn[:ove + 1ssw, :neg.a]); + } + + with link = "point.de.Neustadt-Holst-Gbf" { + with layer = -4 track(:second :removed, kn[:neg.a, :neg.ns]); + track(:first:station :pax, path("d4.de.1100")[:neg.b, :neg.nn]); + track(:first:station, path("d4.de.1100")[:neg.nn, :neg.g]); + track(:first:station :pax, kn[:neg.nn, :nst.a]); + + marker(:de.gbf, kn[:neg]); + slabel(:right, kn[:neg - 0.4ssw] >> 1.7ssw, + hbox(:left :base, + span(:small :bold, "Neustadt "), + span(:small, "(Holst) "), + span(:small :bold, "Gbf") + ) + ); + } + + with link = "point.de.Neustadt-Holst" { + track(:first:station :pax, kn[:nst.a, :nst + 0.5ssw]); + marker(:de.hp :pax :left, kn[:f - .5ssw]); + marker(:de.awanst :pax :left, kn[:f - .5ssw]); + with layer = -1 marker(:de.bf :gone :left, kn[:f - .5ssw]); + slabel(:right :pax, kn[:nst] + (1.0ssw, 0ssw), + hbox(:left :base, + span(:small :bold, "Neustadt "), + span(:small, "(Holst) ") + ) + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1030.map b/rules/tmp-de/a/d3/10/1030.map new file mode 100644 index 00000000..13de4331 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1030.map @@ -0,0 +1,17 @@ +# DE 1030. Meimersdorf - Kiel Hgbf +# +let mg = path("d4.de.1030"); + +with detail = 3 { + # point.de.Meimersdorf-Rbf de.1031 + + with link = "point.de.Kiel-Hgbf" { + with layer = 3 track(:first :removed, + mg[:mer - 0.1dt, :mer] << 1.5dt + .. mg[:khg - 1dl, :khg] << 2dt + ); + + marker(:de.gbf :top :removed, mg[:khg] << 2dt); + } +} + diff --git a/rules/tmp-de/a/d3/10/1031.map b/rules/tmp-de/a/d3/10/1031.map new file mode 100644 index 00000000..d745df71 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1031.map @@ -0,0 +1,38 @@ +# DE 1031. Meimersdorf Mf - Rbf Meimersdorf - Kiel-Hassee +# +let ak = path("d4.de.1220"); +let mh = path("d4.de.1031"); + +with detail = 3 { + # point.de.Meimersdorf-Mf de.1220 + + with link = "point.de.Meimersdorf-Rbf" { + with layer = 4 track(:first:station :cat:ac15, + ak[:mei + 1ssw, :meo - 2dl] << 1.5dt + ); + with layer = 4 track(:first:station, ak[:meo - 2dl, :kie.aa] << 1.5dt); + + marker(:de.bbf :cat:ac15 :left, ak[:meg] << 1.5dt); + slabel(:left :cat:ac15, ak[:mei + 0.5ssw] << 2.5dt, + "Meimersdorf" + ); + } + + with link = "line.de.1031" { + with layer = -2 track(:first, + ak[:kie.aa, :kie.aa + 0.1dl] << 1.5dt + .. mh[:khg - 0.51ssw, :khg - 0.5ssw] << 0.5dt + ); + } + + # point.de.Kiel-Hg de.1022 + + with link = "line.de.1031" { + with layer = -2 track(:first, + mh[:khg + 0.5ssw, :has - 0.5ssw] << 0.5dt + ); + } + + # point.de.Kiel-Hassee de.1022 +} + diff --git a/rules/tmp-de/a/d3/10/1033.map b/rules/tmp-de/a/d3/10/1033.map new file mode 100644 index 00000000..2b7ea936 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1033.map @@ -0,0 +1,20 @@ +# DE 1033. DE 1033 - Meimersdorf Mitte - Kiel SS +# +let ak = path("d4.de.1220"); +let kn = path("d4.de.1023"); + +with detail = 3 { + # point.de.Meimersdorf-Rbf de.1031 + + with link = "line.de.1033" { + with layer = 2 track(:first, + ak[:meo - 0.1dl, :meo] << 1.5dt + .. kn[:kss - 0.51ssw, :kss - 0.5ssw] >> 1dt + ); + with layer = 1 casing(:first, + ak[:meo - 0.1dl, :meo] << 1.5dt + .. kn[:kss - 0.51ssw, :kss - 0.5ssw] >> 1dt + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1040.map b/rules/tmp-de/a/d3/10/1040.map new file mode 100644 index 00000000..0462cac7 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1040.map @@ -0,0 +1,350 @@ +# DE 1040. Neumünster - Flensburg +# +let nf = path("d4.de.1040"); + +with detail = 3 { + # point.de.Neumünster de.1220 + # point.de.Neumünster-Gbf de.1220 + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:neu.yf + 1sw, :asp - 1sw]); + track(:first :double :removed, + path("d4.de.1040.neu")[:neu.yh, :xneu] + ); + } + + with link = "point.de.Stover" { + marker(:de.bk :removed :left, nf[:sto] << 0.5dt); + } + + with link = "point.de.Aspe" { + track(:first:station :double :cat:ac15 :pax, + nf[:asp - 1sw, :asp + 1sw] + ); + marker(:de.bf :removed :right, nf[:asp] >> 0.5dt); + slabel(:right :removed, nf[:asp - 0.5sw] >> 0.5dt >> 1.2sh, "Aspe"); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:asp + 1sw, :nor - 1sw]); + } + + with link = "point.de.Nortorf" { + track(:first:station :double :cat:ac15 :pax, + nf[:nor - 1sw, :nor + 1sw] + ); + marker(:de.bf :cat:ac15 :pax :right, nf[:nor] >> 0.5dt); + slabel(:right :cat:ac15 :pax, nf[:nor - 0.7sw] >> 0.5dt >> 1.3sh, + "Nortorf" + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax :flip, + nf[:nor + 3.5km, :nor + 1sw] + ); + line_badge(:cat:ac15 :pax, nf[:nor + 3.5km], "1040"); + track(:first :double :cat:ac15 :pax, nf[:nor + 3.5km, :bok - 1sw]); + } + + with link = "point.de.Bokel" { + track(:first:station :double :cat:ac15 :pax, + nf[:bok - 1sw, :bok + 1sw] + ); + marker(:de.hp :removed:left, nf[:bok] << 0.5dt); + marker(:de.exbf :removed:left, nf[:bok] << 0.5dt); + slabel(:left :removed, nf[:bok - 0.4sw] << 1.0dt << 1.9sw, "Bokel"); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:bok + 1sw, :boh - 1sw]); + } + + with link = "point.de.Bokelholm" { + track(:first:station :double :cat:ac15 :pax, + nf[:boh - 1sw, :boh + 1sw] + ) + with layer = -4 marker(:de.bf :right :removed, nf[:boh] >> 0.5dt); + slabel(:right :removed, nf[:boh - 0.4sw] >> 0.5dt >> 1.4sw, + "Bokelholm" + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:boh + 1sw, :oro - 1sw]); + } + + with link = "point.de.Osterrönfeld" { + # Str. 1040 + track(:first:station :double :cat:ac15 :pax, + nf[:oro - 1sw, :oro + 1.5sw] + ); + + # Str. 1022 + with layer = -2 track(:first:station :pax, + nf[:ora + 0.5sw, :ora + 0.51sw] >> 1.5dt + -- nf[:ora + 0.5sw + 1dl, :ora + 0.5sw + 1.1dl] >> 0.5dt + ); + + with layer = -2 marker(:de.bbf :cat:ac15 :right, + nf[:ora + 1sw + 1dl] >> 0.5dt + ); + slabel(:right :cat:ac15, nf[:ora] + (1.3km, 0dt), + span(:bold, "Osterrönfeld") + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:oro + 1.5sw, :orb - 0.5sw]); + } + + with link = "point.de.Osterrönfeld-Brücke" { + track(:first:station :double :cat:ac15 :pax, + nf[:orb - 0.5sw, :orb + 0.5sw] + ); + marker(:de.uest :cat:ac15 :right, nf[:orb] >> 0.5dt); + } + + with link = "line.de.1040" { + with layer = 3 track(:first :double :cat:ac15 :pax, + nf[:orb + 0.5sw, :ren.a] + ); + with layer = 1 casing(:first :double :cat:ac15 :pax, + nf[:bhbx - 1sw, :bhbx + 1sw] + ); + } + + with link = "point.de.Hochbrücke" { + with layer = 2 marker(:de.bk :removed :left, nf[:hbr] << 0.5dt); + } + + + with link = "point.de.Rendsburg-Brücke" { + with layer = 2 marker(:de.uest :removed :left, nf[:rbr] << 0.5dt); + } + + with link = "point.de.Rendsburg-Schleife" { + with layer = 2 marker(:de.bk :removed :left, nf[:rsl] << 0.5dt); + } + + with link = "point.de.Rendsburg" { + track(:first:station :double :cat:ac15 :pax, + nf[:ren.a, :bud.a] + ); + marker(:de.bf :cat:ac15 :pax :left, nf[:ren] << 0.5dt); + slabel(:left :cat:ac15 :pax, nf[:ren] - (1.5km, 0dt), + hbox(:right:top :bold, "Rendsburg") + ); + } + + with link = "point.de.Büdelsdorf" { + # Str. 1040 + track(:double :first :station :cat:ac15 :pax, + nf[:bud.a, :bud + 1.5sw] + ); + + # Str. 1012 + with layer = -2 track(:second:station, + nf[:bud + 0.5sw, :bud + 0.51sw] << 0.5dt + .. path("d4.de.1012")[:bud.gg + 0.9dt, :bud.gg + 1dt] + ); + with layer = -1 marker(:de.bf :removed :left, nf[:bud] << 0.5dt); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:bud + 1.5sw, :adu - 1sw]); + } + + + with link = "point.de.Alt-Duvenstedt" { + track(:first:station :double :cat:ac15 :pax, + nf[:adu - 1sw, :adu + 1sw] + ); + with layer = -1 marker(:de.hst :removed :right, nf[:adu] >> 0.5dt); + with layer = -2 marker(:de.bf :gone :right, nf[:adu] >> 0.5dt); + slabel(:right :removed, nf[:adu - 0.6sw] >> 0.5dt >> 1.5sw, + "Alt Duvenstedt" + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:adu + 1sw, :ows - 1sw]); + } + + + with link = "point.de.Owschlag" { + track(:double :first :station :cat:ac15 :pax, nf[:ows.a, :ows.f]); + marker(:de.bf :cat:ac15 :pax, nf[:ows] >> 0.5dt); + slabel(:left :cat:ac15 :pax, nf[:ows - 0.5sw] << 2.5dt, + span(:bold, "Owschlag") + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:ows + 1sw, :lot - 1sw]); + with layer = 1 line_badge(:cat:ac15 :pax, nf[:ows + 3.2km], "1040"); + } + + with link = "point.de.Lottorf" { + track(:first:station :double :cat:ac15 :pax, + nf[:lot - 1sw, :lot + 1sw] + ); + with layer = -1 marker(:de.uest :removed :right, nf[:lot] >> 0.5dt); + with layer = -2 marker(:de.bf :gone :right, nf[:lot] >> 0.5dt); + slabel(:right :removed, nf[:lot - 0.6sw] >> 0.5dt >> 1.6sw, + "Lottorf" + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:lot + 1sw, :sle - 1sw]); + } + + + with link = "point.de.Schleswig" { + track(:first:station :double :cat:ac15 :pax, nf[:sle.a, :sle.f]); + marker(:de.bf :cat:ac15 :pax :right, nf[:sle] >> 0.5dt); + slabel(:right :cat:ac15 :pax, nf[:sle - 0.6sw] + (1.5sw, -0.5sw), + span(:bold, "Schleswig") + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:sle + 1sw, :sub - 1sw]); + } + + with link = "point.de.Schuby" { + track(:first:station :double :cat:ac15 :pax, + nf[:sub - 1sw, :sub + 1sw] + ); + with layer = -1 marker(:de.bf :left :removed, nf[:sub] << 0.5dt); + marker(:de.awanst :cat:ac15 :left, nf[:sub.f] << 0.5dt); + slabel(:left :cat:ac15, nf[:sub.f] << 0.5dt << 1.4sw, + hbox(:center :top, + "Schuby ", + span(:removed, "(Kr Schleswig)") + ) + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:sub - 1sw, :jub - 1sw]); + with layer = 1 line_badge(:cat:ac15 :pax, nf[:sub + 3.5km], "1040"); + } + + + with link = "point.de.Jübek" { + track(:first:station :double :cat:ac15 :pax, + nf[:jub - 1sw, :jub.r + 1sw] + ); + with layer = -2 track(:second:station :pax, + nf[:jub.r - .1dl, :jub.r] << 0.5dt + .. path("d4.de.1011")[:jub.g + 1dt, :jub.g + 1.1dt] + ); + + with layer = 1 marker(:de.bf :cat:ac15 :pax :left, nf[:jub] << 0.5dt); + slabel(:right :cat:ac15 :pax, nf[:jub - 0.6sw] >> 1.8dt, + span(:bold, "Jübek") + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:jub.r + 1sw, :egb - 1sw]); + } + + with link = "point.de.Eggebek" { + track(:first:station :double :cat:ac15 :pax, + nf[:egb - 1sw, :egb + 1sw] + ); + marker(:de.anst :removed:left, nf[:egb] << 0.5dt); + with layer = -1 marker(:de.bf :gone:left, nf[:egb] << 0.5dt); + slabel(:right :removed, nf[:egb - 0.6sw] >> 1.5dt, + "Eggebek" + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:egb + 1sw, :tar - 1sw]); + } + + + with link = "point.de.Tarp" { + track(:first:station :double :cat:ac15 :pax, + nf[:tar - 1sw, :tar + 1sw] + ); + marker(:de.bf :removed, nf[:tar] >> .5dt); + with layer = 1 marker(:de.hp :cat:ac15 :pax, nf[:tar] >> .5dt); + slabel(:right :cat:ac15 :pax, nf[:tar - 0.4sw] >> 0.5dt >> 2.0sw, + "Tarp" + ); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:tar + 1sw, :bar - 1sw]); + with layer = 1 line_badge(:cat:ac15 :pax, nf[:tar + 2.3km], "1040"); + } + + with link = "point.de.Barderup" { + track(:first:station :double :cat:ac15 :pax, + nf[:bar - 1sw, :bar + 1sw] + ); + with layer = -4 marker(:de.hp :removed :left, nf[:bar] << .5dt); + with layer = -4 marker(:de.bk :removed :left, nf[:bar] << .5dt); + slabel(:right :removed, nf[:bar - 0.4sw] >> 1.5dt, "Barderup"); + } + + with link = "line.de.1040" { + track(:first :double :cat:ac15 :pax, nf[:bar + 1sw, :fws - 1sw]); + } + + with link = "point.de.Flensburg-Weiche-Süd" { + track(:first:station :double :cat:ac15 :pax, + nf[:fws - 1sw, :fws + 1sw] + ); + marker(:de.bft :cat:ac15 :right, nf[:fws] >> 0.5dt); + } + + with link = "point.de.Flensburg-Weiche" { + # Str. 1040 + track(:first:station :double :cat:ac15 :pax, + nf[:fws + 1sw, :flw.f] + ); + + # Str. 1001 + with layer = -4 track(:second:station :closed, + path("d4.de.1001")[:flw.c, :flw.c - 0.1dl] + .. nf[:flw.x, :flw.x + 0.1dl] << 0.5dt + ); + + # Str. A05 + with layer = -5 track(:second:station :removed, + path("d4.de.a05")[:flw.aal + 750m, :flw.aal + 751m] << 1.5dt + .. nf[:flw.x, :flw.x + 0.1dl] << 0.5dt + ); + + # Str. 1000 + with layer = -1 track(:first:station :double :cat:ac15, + path("d4.de.1000")[:flw, :flw.g] + ); + + marker(:de.bbf :cat:ac15 :right, nf[:flw] >> 0.5dt); + slabel(:right :cat:ac15, nf[:flw - 0.4sw] >> 0.5dt >> 2.2sw, + span(:bold, "Flensburg Weiche") + ); + } + + with link = "line.de.1040" { + track(:first :double:leftother :cat:ac15 :pax, nf[:flw.f, :fle - 1sw]); + } + + with link = "point.de.Flensburg" { + track(:first:station :double :cat:ac15 :pax, + nf[:fle - 1sw, :fle.r] + ); + marker(:de.bf :cat:ac15 :pax :left, nf[:fle] << 0.5dt); + slabel(:right :cat:ac15 :pax, nf[:fle] + (1.2km, 0.7km), + hbox(:left:top :bold :medium, "Flensburg") + ); + } +} + diff --git a/rules/tmp-de/a/d3/10/1041.map b/rules/tmp-de/a/d3/10/1041.map new file mode 100644 index 00000000..4e8d55f5 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1041.map @@ -0,0 +1,58 @@ +# DE 1041. Neumünster - Ascheberg (Holst) +# +let na = path("d4.de.1041"); + +with detail = 3 { + # point.de.Neumünster de.1220 + + with link = "line.de.1041" { + track(:first :removed, na[:neu.hh, :bok - 1ssw]); + } + + with link = "point.de.Bokhorst" { + track(:first:station :removed, na[:bok - 1ssw, :bok + 1ssw]); + marker(:de.bf :removed :left, na[:bok]); + slabel(:top :removed, na[:bok] << 1.4ssw, "Bokhorst"); + } + + with link = "line.de.1041" { + track(:first :removed, na[:bok + 1ssw, :wan - 1ssw]); + with layer = 1 line_badge(:removed, na[:bok + 2.7km], "1041"); + } + + with link = "point.de.Wankendorf" { + track(:first :station :removed, na[:wan - 1ssw, :wan + 1ssw]); + marker(:de.bf :removed :right, na[:wan]); + slabel(:right :removed, na[:wan - 2.5ssw] >> 0.6ssw, + hbox(:left:top, "Wankendorf") + ); + } + + with link = "line.de.1041" { + track(:first :removed, na[:wan + 1ssw, :per - 1ssw]); + } + + with link = "point.de.Perdoel" { + track(:first :station :removed, na[:per - 1ssw, :per + 1ssw]); + marker(:de.hp :removed:left, na[:per]); + with layer = -1 marker(:de.bf :gone :left, na[:per]); + slabel(:left :removed, na[:per - 0.5ssw] << 1.4ssw, "Perdoel"); + } + + with link = "line.de.1041" { + track(:first :removed, na[:per + 1ssw, :kal - 1ssw]); + } + + with link = "point.de.Kalübbe" { + track(:first :station :removed, na[:kal - 1ssw, :kal + 1ssw]); + marker(:de.hp :removed :left, na[:kal]); + slabel(:left :removed, na[:kal - 0.5ssw] << 1.4ssw, "Kalübbe"); + } + + with link = "line.de.1041" { + track(:first :removed, na[:kal + 1ssw, :asc.b]); + } + + # point.de.Ascheberg-Holst de.1023 +} + diff --git a/rules/tmp-de/a/d3/10/1042.map b/rules/tmp-de/a/d3/10/1042.map new file mode 100644 index 00000000..8f3458b4 --- /dev/null +++ b/rules/tmp-de/a/d3/10/1042.map @@ -0,0 +1,179 @@ +# DE 1042. Neumünster - Heide (Holst) +# +let nh = path("d4.de.1042"); + +with detail = 3 { + # point.de.Neumünster de.1220 + + with link = "line.de.1042" { + track(:second :pax, nh[:neu.kk, :nst - 1ssw]); + } + + with link = "point.de.Neumünster-Stadtwald" { + track(:second:station :pax, nh[:nst - 1ssw, :nst + 1ssw]); + marker(:de.hp :pax :open :left, nh[:nst]); + slabel(:left :pax, nh[:nst] >> 1.0dt, "N. Stadtwald"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:nst + 1ssw, :was - 1ssw]); + } + + with link = "point.de.Wasbek" { + track(:second:station :pax, nh[:was - 1ssw, :was + 1ssw]); + marker(:de.hp :pax :open :left, nh[:was]); + with layer = -1 marker(:de.bf :gone :left, nh[:was]); + slabel(:bottom :pax, nh[:was] << 1.4ssw, "Wasbek"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:was + 1ssw, :bun - 1ssw]); + } + + with link = "point.de.Bünzenfeld" { + track(:second:station :pax, nh[:bun - 1ssw, :bun + 1ssw]); + marker(:de.ldst :removed :left, nh[:bun]); + slabel(:left:removed, nh[:bun - 1ssw] << 1.0ssw, + hbox(:right:top, "Bünzenfeld") + ); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:bun + 1ssw, :auk - 1ssw]); + } + + with link = "point.de.Aukrug" { + track(:second:station :pax, nh[:auk - 1ssw, :auk + 1ssw]); + marker(:de.hp :pax :open :right, nh[:auk]); + with layer = -1 marker(:de.bf :gone :right, nh[:auk]); + slabel(:top :pax :open, nh[:auk] >> 1.4ssw, + vbox(:center :bottom, + span(:removed, "Innien"), + "Aukrug" + ) + ); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:auk + 1ssw, :hwe - 1ssw]); + with layer = 1 line_badge(:pax, nh[:auk + 3km], "1042"); + } + + with link = "point.de.Hohenwestedt" { + track(:second:station :pax, nh[:hwe - 1ssw, :hwe + 1ssw]); + marker(:de.bf :pax :open :right, nh[:hwe]); + slabel(:bottom :pax, nh[:hwe - 0.7km] << 0.5dt, + span(:small :bold, "Hohenwestedt") + ); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:hwe + 1ssw, :ost - 1ssw]); + } + + with link = "point.de.Osterstedt" { + track(:second:station :pax, nh[:ost - 1sw, :ost + 1sw]); + marker(:de.hp :pax :open :right, nh[:ost]); + with layer = -1 marker(:de.bf :gone :right, nh[:ost]); + slabel(:top :pax :open, nh[:ost] >> 1.4ssw + (1ssw, 0ssw), + "Osterstedt" + ); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:ost + 1ssw, :ber - 1ssw]); + } + + with link = "point.de.Beringstedt" { + track(:second:station :pax, nh[:ber - 1ssw, :ber + 1ssw]); + marker(:de.hp :pax :open :left, nh[:ber]); + with layer = -1 marker(:de.bf :gone :left, nh[:ber]); + slabel(:top :pax :open, nh[:ber] >> 1dt, "Beringstedt"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:ber + 1ssw, :gok - 1ssw]); + } + + + with link = "point.de.Gokels" { + track(:second:station :pax, nh[:gok - 1ssw, :gok + 1ssw]); + marker(:de.hp :pax :open :left, nh[:gok]); + with layer = -1 marker(:de.bf :gone :left, nh[:gok]); + slabel(:bottom :pax :open, nh[:gok] << 1.4ssw, "Gokels"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:gok + 1ssw, :had - 1ssw]); + } + + with link = "point.de.Hademarschen" { + track(:second:station :pax, nh[:had - 1ssw, :had + 1ssw]); + marker(:de.hp :pax :open :right, nh[:had]); + with layer = -1 marker(:de.bf :gone :right, nh[:had]); + slabel(:top :pax :open, nh[:had] >> 1.4ssw, "Hademarschen"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:had + 1ssw, :bel - 1ssw]); + } + + with link = "point.de.Beldorf" { + track(:second:station :pax, nh[:bel - 1ssw, :bel + 1ssw]); + marker(:de.hp :pax :open :left, nh[:bel]); + with layer = -1 marker(:de.bf :gone :left, nh[:bel]); + slabel(:bottom :pax :open, nh[:bel] << 1.4ssw, "Beldorf"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:bel + 1ssw, :bed - 1ssw]); + } + + with link = "point.de.Beldorf-Dkst" { + track(:second:station :pax, nh[:bed - 1ssw, :bed + 1ssw]); + with layer = -1 marker(:de.dkst :closed :right, nh[:bed]); + } + + with link = "struct.de.Hochbrücke-Grünental" { + slabel(:left, nh[:bgrf] << 1.5dt, + hbox(:right:top :italic, + "Hochbrücke Grünental" + ) + ); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:bed + 1ssw, :alb - 1ssw]); + } + + with link = "point.de.Albersdorf" { + track(:second:station :pax, nh[:alb - 1ssw, :alb + 1ssw]); + marker(:de.hp :pax :open :left, nh[:alb]); + with layer = -1 marker(:de.bf :gone :left, nh[:alb]); + slabel(:left :pax :open, nh[:alb - 0.4ssw] << 2.6ssw, "Albersdorf"); + } + + with link = "line.de.1042" { + track(:second :pax, nh[:alb + 1ssw, :nha - 1ssw]); + with layer = 1 line_badge(:pax, nh[:alb + 4km], "1042"); + } + + with link = "point.de.Nordhastedt" { + track(:second:station :pax, nh[:nha - 1ssw, :nha + 1ssw]); + marker(:de.hp :pax :open :right, nh[:nha]); + with layer = -1 marker(:de.bf :gone :right, nh[:nha]); + slabel(:top :pax :open, nh[:nha] >> 1.4ssw + (2ssw, 0ssw), + "Nordhastedt" + ); + } + + with link = "line.de.1042" { + track(:second :pax, + nh[:nha + 1ssw, :hei.bb - 1ssw] + .. nh[:hei - 1.1ssw, :hei - 1ssw] >> 1.5dt + ); + } + + # point.de.Heide-Holst de.1210 +} + diff --git a/rules/tmp-de/a/d3/10/1043.map b/rules/tmp-de/a/d3/10/1043.map new file mode 100644 index 00000000..8ff62d6e --- /dev/null +++ b/rules/tmp-de/a/d3/10/1043.map @@ -0,0 +1,226 @@ +# DE 1043. Neumünster - Bad Oldesloe +# +let no = path("d4.de.1043"); + +with detail = 3 { + # point.de.Neumünster de.1220 + + with link = "line.de.1043" { + track(:first :pax, + no[:neu + 1ssw, :neu.b + 50m] << 1.5dt + .. no[:nes - 1.1ssw, :nes - 1ssw] << 0.5dt + ); + with layer = -4 track(:first :removed, + no[:neu.b + 49m, :neu.b + 50m] << 0.5dt + .. no[:nes - 1.1ssw, :nes - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Neumünster-Süd-AKN" { + track(:first:station :pax, no[:nes - 1ssw, :nes + 1.5ssw] << 0.5dt); + with layer = -4 track(:first:station :removed, + no[:nes - 1ssw, :nes + 1.5ssw] >> 0.5dt + ); + track(:second:station :pax, + no[:nes + 0.5ssw, :nes + 1.5ssw] >> 1.5dt + ); + marker(:de.bf :pax :right, no[:nes] >> 0.5dt); + slabel(:right :pax, no[:nes + 0.7ssw] << 1.5dt, + span(:bold, "N. Süd AKN") + ); + } + + with link = "line.de.1043" { + track(:first :pax, no[:nes + 1.5ssw, :kku - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:nes + 1.5ssw, :kku - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Kleinkummerfeld" { + track(:first:station :pax, no[:kku - 1ssw, :kku + 1ssw] << 0.5dt); + with layer = -4 track(:first:station :removed, + no[:kku - 1ssw, :kku + 1ssw] >> 0.5dt + ); + with layer = -2 marker(:de.bf :removed, no[:kku] >> 0.5dt); + slabel(:bottom :removed, no[:kku] >> 0.5dt >> 1.8ssw, + vbox(:center:top, " Klein-", "kummerfeld") + ); + } + + with link = "line.de.1043" { + track(:first :open :pax, no[:kku + 1ssw, :rio - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:kku + 1ssw, :rio - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Rickling-Ölweiche" { + track(:first:station :pax, no[:rio - 1ssw, :rio + 1ssw] << 0.5dt); + with layer = -4 track(:first:station :removed, + no[:rio - 1ssw, :rio + 1ssw] >> 0.5dt + ); + with layer = -5 marker(:de.hp :gone :left, no[:rio] << 0.5dt); + with layer = -4 marker(:de.anst :removed :left, no[:rio] << 0.5dt); + slabel(:right :removed, no[:rio - 1ssw] << 0.5dt << 1.3ssw, + "Rickling Ölweiche" + ); + } + + with link = "line.de.1043" { + track(:first :open :pax, no[:rio + 1ssw, :rin - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:rio + 1ssw, :rin - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Rickling" { + track(:first:station :pax, no[:rin - 1ssw, :ric + 1ssw] << 0.5dt); + with layer = -1 track(:first :station :removed, + no[:rin - 1ssw, :ric + 1ssw] >> 0.5dt + ); + marker(:de.hp :pax :left, no[:rin] << 0.5dt); + with layer = -1 marker(:de.bf :removed :left, no[:ric] << 0.5dt); + slabel(:right :pax, no[:ric + 0.5ssw] << 0.5dt << 1.4ssw, "Rickling"); + } + + with link = "line.de.1043" { + track(:first :pax, no[:ric + 1ssw, :wah - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:ric + 1ssw, :wah - 1ssw] >> 0.5dt + ); + with layer = 1 line_badge(:pax, no[:ric + 3km], "1043"); + } + + with link = "point.de.Wahlstedt" { + track(:first:station :pax, no[:wah - 1ssw, :wah + 1ssw] << 0.5dt); + with layer = -4 track(:first:station :removed, + no[:wah - 1ssw, :wah + 1ssw] >> 0.5dt + ); + marker(:de.hp :pax :open :left, no[:wah] << 0.5dt); + slabel(:right :pax :open, no[:wah + 0.5ssw] << 0.5dt << 1.4ssw, + "Wahlstedt" + ); + } + + with link = "line.de.1043" { + track(:first :pax, no[:wah + 1ssw, :fah - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:wah + 1ssw, :fah - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Fahrenkrug" { + track(:first :station :pax, no[:fah - 1ssw, :fak + 1ssw] << 0.5dt); + with layer = -4 track(:first :station :removed, + no[:fah - 1ssw, :fak + 1ssw] >> 0.5dt + ); + marker(:de.bft :left, no[:fak] << 0.5dt); + with layer = -2 marker(:de.bf :removed :right, no[:fah] >> 0.5dt); + slabel(:left :open, no[:fak + 1ssw] >> 0.5dt >> 2.2ssw, + "Fahrenkrug" + ); + } + + with link = "line.de.1043" { + track(:first :pax, no[:fak + 1ssw, :seb - 1ssw] << 0.5dt); + with layer = -1 track(:first :removed, + no[:fak + 1ssw, :seb - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Bad-Segeberg" { + track(:first:station :pax, no[:seb - 1ssw, :seg + 1ssw] << 0.5dt); + with layer = -4 track(:first:station :removed, + no[:seb - 1ssw, :seg + 1ssw] >> 0.5dt + ); + marker(:de.bf :pax :left, no[:seb] << 0.5dt); + with layer = -1 marker(:de.bf :removed :left, no[:seg] << 0.5dt); + slabel(:right :pax :open, no[:seg - .5ssw] << 0.5dt << 1.5ssw, + span(:small :bold, "Bad Segeberg") + ); + } + + with link = "line.de.1043" { + track(:first :pax, no[:seg + 1ssw, :ago - 1ssw] << 0.5dt); + with layer = -1 track(:first :removed, + no[:seg + 1ssw, :ago - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Altengörs" { + track(:first:station :pax, no[:ago - 1ssw, :ago + 1ssw] << 0.5dt); + with layer = -4 track(:first:station :removed, + no[:ago - 1ssw, :ago + 1ssw] >> 0.5dt + ); + marker(:de.hp :pax :left, no[:ago] << 0.5dt); + slabel(:right :pax, no[:ago + 0.7ssw] << 0.5dt << 1.6ssw, "Altengörs"); + } + + with link = "line.de.1043" { + track(:first :pax, no[:ago + 1ssw, :wak - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:ago + 1ssw, :wak - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Wakendorf" { + track(:first :station :pax, no[:wak - 1ssw, :wak + 1ssw] << 0.5dt); + with layer = -1 track(:first :station :removed, + no[:wak - 1ssw, :wak + 1ssw] >> 0.5dt + ); + marker(:de.hp :pax :right, no[:wak] >> 0.5dt); + with layer = -2 marker(:de.bf :removed :right, no[:wak] >> 0.5dt); + slabel(:left :pax :open, no[:wak] >> 0.5dt >> 2.2ssw, "Wakendorf"); + } + + with link = "line.de.1043" { + track(:first :pax, no[:wak + 1ssw, :frh - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:wak + 1ssw, :frh - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Fresenburg" { + track(:first :station :pax, no[:frh - 1ssw, :fre + 1ssw] << 0.5dt); + with layer = -1 track(:first :station :removed, + no[:frh - 1ssw, :fre + 1ssw] >> 0.5dt + ); + marker(:de.hp :pax :open :right, no[:frh] >> 0.5dt); + with layer = -2 marker(:de.bf :gone :right, no[:fre] >> 0.5dt); + slabel(:left :pax :open, no[:fre + 0.5ssw] >> 0.5dt >> 1.7ssw, + "Fresenburg" + ); + } + + with link = "line.de.1043" { + track(:first :pax, no[:fre + 1ssw, :pog - 1ssw] << 0.5dt); + with layer = -4 track(:first :removed, + no[:fre + 1ssw, :pog - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Poggensee" { + track(:first :station :pax, no[:pog - 1ssw, :pog + 1ssw] << 0.5dt); + with layer = -1 track(:first :station :removed, + no[:pog - 1ssw, :pog + 1ssw] >> 0.5dt + ); + with layer = -2 marker(:de.hp :removed :left, no[:pog] << 0.5dt); + slabel(:left :removed, no[:pog + .6ssw] >> 2.0dt, "Poggensee"); + } + + with link = "line.de.1043" { + track(:first :pax, + no[:pog + 1ssw, :pog + 1.1ssw] << 0.5dt + .. no[:old.yn - 2.1ssw, :old.yn - 2ssw] >> 0.5dt + ); + with layer = -1 track(:first :removed, + no[:pog + 1ssw, :pog + 1.1ssw] >> 0.5dt + .. no[:old.yn - 2.1ssw, :old.yn - 2ssw] >> 1.5dt + ); + } + + + # point.de.Bad-Oldesloe de.1120 +} + diff --git a/rules/tmp-de/a/d3/11/1100.map b/rules/tmp-de/a/d3/11/1100.map new file mode 100644 index 00000000..91d4627c --- /dev/null +++ b/rules/tmp-de/a/d3/11/1100.map @@ -0,0 +1,321 @@ +# DE 1100. Lübeck Hbf (ausschl.) - Puttgarden +# +let lp = path("d4.de.1100"); + +with detail = 3 { + with link = "line.de.1100" { + track(:first :double :cat:ac15 :pax, lp[:lub.a, :wal - 0.5ssw]); + } + + with link = "point.de.Schwartau-Waldhalle-Wr" { + with layer = -2 track(:first :station :double :pax, + lp[:wal, :wal + 0.5ssw] + ); + track(:first :station :double :cat:ac15 :pax, + lp[:wal - 0.5ssw, :wal + 0.1dl] + .. path("d4.de.1113")[:aa - 0.1dl, :aa] + ); + with layer = -2 marker(:de.abzw :cat:ac15 :left, lp[:wal] << 0.5dt); + slabel(:left :cat:ac15, lp[:wal - 0.4ssw] << 0.5dt << 1.4ssw, + span(:bold :condensed, "S. Waldhalle") + ); + } + + with link = "line.de.1100" { + with layer = -2 track(:first :double :pax, + lp[:wal + 0.5ssw, :swr - 1ssw] + ); + } + + with link = "point.de.Bad-Schwartau" { + track(:first:station :double :pax, lp[:swr - 1ssw, :swa - 0.5ssw]); + marker(:de.hp :pax :left, lp[:swr] << 0.5dt); + with layer = -1 marker(:de.bf :gone :left, lp[:swr] << 0.5dt); + slabel(:left :pax, lp[:swr - 1.0ssw] << 0.5dt << 1.3ssw, + span(:bold, "Bad Schwartau") + ); + } + + with link = "point.de.Bad-Schwartau-Abzw" { + track(:first :pax, lp[:swa - 0.5ssw, :swa + 0.5ssw] << 0.5dt); + track(:first :pax, lp[:swa - 0.5ssw, :swa + 0.5ssw] >> 0.5dt); + with layer = -1 marker(:de.abzw :left, lp[:swa] << 0.5dt); + } + + with link = "line.de.1100" { + track(:first :pax, + lp[:swa + 0.5ssw, :aeut.ff - 1km] >> 0.5dt + .. lp[:rat - 2ssw, :rat - 1ssw] + ); + } + + with link = "point.de.Ratekau" { + track(:first :pax, lp[:rat - 1ssw, :rat + 1ssw]); + with layer = -2 marker(:de.bbf :left, lp[:rat]); + with layer = -3 marker(:de.bf :gone :left, lp[:rat]); + slabel(:right, lp[:rat - 0.4ssw] >> 1.7dt, "Ratekau"); + } + + with link = "line.de.1100" { + track(:first :pax, lp[:rat + 1ssw, :tim - 1ssw]); + } + + with link = "point.de.Timmendorferstrand" { + track(:first :station :pax, lp[:tim - 1ssw, :tim + 1ssw]); + marker(:de.bf :pax :right, lp[:tim]); + label(lp[:tim] >> 1.4ssw, + vbox(:left:middle :pax :small, "Timmen-", "dorfer", "Strand") + ); + + } + + with link = "line.de.1100" { + track(:first :pax, lp[:tim + 1ssw, :sar - 1ssw]); + } + + with link = "point.de.Scharbeutz" { + track(:first :station :pax, lp[:sar - 1ssw, :sar + 1ssw]); + marker(:de.bf :pax :right, lp[:sar]); + slabel(:right :pax, lp[:sar - 0.6ssw] >> 1.4ssw, "Scharbeutz"); + } + + with link = "line.de.1100" { + track(:first :pax, lp[:sar + 1ssw, :haf - 1ssw]); + with layer = 1 line_badge(:pax, lp[:sar + 1.5km], "1100"); + } + + with link = "point.de.Haffkrug" { + track(:first :station :pax, lp[:haf - 1ssw, :haf + 1ssw]); + marker(:de.bf :pax :right, lp[:haf]); + slabel(:right :pax, lp[:haf - 0.3ssw] >> 1.9ssw, + "Haffkrug" + ); + } + + with link = "line.de.1100" { + track(:first :pax, lp[:haf + 1ssw, :sie - 1ssw]); + } + + with link = "point.de.Sierksdorf" { + track(:first :station :pax, lp[:sie - 1ssw, :sib + 1ssw]); + marker(:de.bf :pax :right, lp[:sie]); + with layer = -1 marker(:de.bft :left :closed, lp[:sib]); + slabel(:right :pax, lp[:sie - 0.4ssw] >> 2.4ssw, "Sierksdorf"); + } + + with link = "line.de.1100" { + track(:first :pax, lp[:sib + 1ssw, :neg - 1ssw]); + } + + # point.de.Neustadt-Holst-Gbf: 1023. + + with link = "line.de.1100" { + track(:first, lp[:neg + 0.5ssw, :ssl - 0.5ssw]); + } + + with link = "point.de.Südschleuse" { + track(:first :station, lp[:ssl - 0.5ssw, :ssl + 0.5ssw]); + with layer = -1 marker(:de.abzw :removed :left, lp[:ssl]); + } + + with link = "line.de.1100" { + track(:first, lp[:ssl + 0.5ssw, :has - 0.5ssw]); + } + + with link = "point.de.Hasselburg" { + track(:first :station, lp[:has - 1ssw, :has + 1ssw]); + with layer = -1 marker(:de.bbf :right, lp[:has]); + slabel(:right, lp[:has - 0.3ssw] >> 1.9ssw, "Hasselburg"); + } + + with link = "line.de.1100" { + track(:first, lp[:has + 1ssw, :gsl - 1ssw]); + } + + with link = "point.de.Groß-Schlamin" { + track(:first :station, lp[:gsl - 1ssw, :gsl + 1ssw]); + with layer = -1 marker(:de.bbf :left, lp[:gsl]); + slabel(:left, lp[:gsl - 0.6ssw] << 1.5ssw, "Groß Schlamin"); + } + + with link = "line.de.1100" { + track(:first, lp[:gsl + 1ssw, :bes - 1ssw]); + } + + with link = "point.de.Beschendorf" { + track(:first :station, lp[:bes - 1ssw, :bes + 1ssw]); + with layer = -1 marker(:de.bbf :left, lp[:bes]); + slabel(:left, lp[:bes - 0.6ssw] << 1.6ssw, "Beschendorf"); + } + + with link = "line.de.1100" { + track(:first, lp[:bes + 1ssw, :len - 1ssw]); + } + + with link = "point.de.Lensahn" { + track(:first :station, lp[:len - 1ssw, :len + 1ssw]); + marker(:de.bf :left, lp[:len]); + slabel(:left, lp[:len - 0.6ssw] << 1.6ssw, "Lensahn"); + } + + with link = "line.de.1100" { + track(:first, lp[:len + 1ssw, :gru - 1ssw]); + } + + with link = "point.de.Grüner-Hirsch" { + track(:first :station, lp[:gru - 1ssw, :gru + 1ssw]); + with layer = -1 marker(:de.bbf :left, lp[:gru]); + slabel(:left, lp[:gru - 0.6ssw] << 1.6ssw, "Grüner Hirsch"); + } + + with link = "line.de.1100" { + track(:first, lp[:gru + 1ssw, :old - 2ssw]); + with layer = 1 line_badge(:open, lp[:gru + 2.7km], "1100"); + } + + with link = "point.de.Oldenburg-Holst" { + track(:first :station, lp[:old - 2ssw, :old + 1ssw]); + with layer = -1 marker(:de.bft :left, lp[:old - 1ssw]); + marker(:de.bf :left, lp[:old]); + slabel(:left, lp[:old - 0.3ssw] << 1.5ssw, + hbox(:center:base, + span(:regular, "Oldenburg "), + span(:light, "(Holst) ") + ) + ); + } + + with link = "line.de.1100" { + track(:first, lp[:old + 1ssw, :ols - 1ssw]); + } + + with link = "point.de.Oldenburg-Holst-Stadt" { + track(:first :station, lp[:ols - 1ssw, :ols + 1ssw]); + with layer = -1 marker(:de.anst :removed :left, lp[:ols]); + with layer = -2 marker(:de.hp :gone :left, lp[:ols]); + slabel(:top :removed, lp[:ols] << 1.4ssw, + hbox(:center:base, + span(:regular, "Oldenburg "), + span(:light, "(Holst) "), + span(:regular, "Stadt") + ) + ); + } + + with link = "line.de.1100" { + track(:first, lp[:ols + 1ssw, :goh - 1ssw]); + } + + with link = "point.de.Göhl" { + track(:first :station, lp[:goh - 1ssw, :goh + 1ssw]); + with layer = -2 marker(:de.bbf :right, lp[:goh]); + slabel(:bottom, lp[:goh] >> 1.2ssw, "Göhl"); + } + + with link = "line.de.1100" { + track(:first, lp[:goh + 1ssw, :her - 1ssw]); + } + + with link = "point.de.Heringsdorf-Holst" { + track(:first :station, lp[:her - 1ssw, :her + 1ssw]); + with layer = -1 marker(:de.bf :closed :right, lp[:her]); + with layer = -2 slabel(:right :closed, + lp[:her - 0.4ssw] >> 2.2ssw, + hbox(:center:base, + span(:regular, "Heringsdorf "), + span(:light, "(Holst)") + ) + ); + } + + with link = "line.de.1100" { + track(:first, lp[:her + 1ssw, :nki - 1ssw]); + } + + with link = "point.de.Neukirchen-Holst" { + track(:first :station, lp[:nki - 1ssw, :nki + 1ssw]); + with layer = -2 marker(:de.bbf :left, lp[:nki]); + slabel(:left, lp[:nki - 0.5ssw] << 1.3ssw, + hbox(:center:base, + span(:regular, "Neukirchen "), + span(:light, "(Holst)") + ) + ); + } + + with link = "line.de.1100" { + track(:first, lp[:nki + 1ssw, :lus - 1ssw]); + } + + with link = "point.de.Lütjenbrode-Süd" { + track(:first :station, lp[:lus - 1ssw, :lus + 1ssw]); + with layer = -1 marker(:de.abzw :removed :right, lp[:lus]); + } + + with link = "line.de.1100" { + track(:first, lp[:lus + 1ssw, :luo - 1ssw]); + } + + with link = "point.de.Lütjenbrode-Ost" { + track(:first :station, lp[:luo - 1ssw, :luo + 1ssw]); + with layer = -1 marker(:de.anst :removed :left, lp[:luo]); + with layer = -2 marker(:de.abzw :gone :left, lp[:luo]); + } + + with link = "line.de.1100" { + track(:first, lp[:luo + 1ssw, :gbr - 1ssw]); + } + + with link = "point.de.Großenbrode" { + track(:first :station, lp[:gbr - 1ssw, :gbr + 1ssw]); + marker(:de.bf :left, lp[:gbr]); + with layer = -1 slabel(:right, lp[:gbr - 0.4ssw] + (5pt, 3pt), + span(:bold, "Großenbrode") + ); + } + + with link = "line.de.1100" { + track(:first, lp[:gbr + 1ssw, :bfea]); + } + + with link = "struct.de.Fehmarnsundbrücke" { + track(:first, lp[:bfea, :bfef]); + slabel(:left, lp[:bfea + 450m] << 2dt, + span(:italic, "Fehmarnsundbrücke") + ); + } + + with link = "line.de.1100" { + track(:first, lp[:bfef, :str - 1ssw]); + } + + with link = "point.de.Strukkamp" { + track(:first :station, lp[:str - 1ssw, :str + 1ssw]); + with layer = -1 marker(:de.bbf :left, lp[:str]); + slabel(:left, lp[:str - 0.4ssw] << 1.3ssw, "Strukkamp"); + } + + with link = "line.de.1100" { + track(:first, lp[:str + 1ssw, :buw - 1ssw]); + } + + with link = "point.de.Burg-Fehmarn-West" { + track(:first :station, lp[:buw - 1ssw, :buw + 1ssw]); + with layer = -1 marker(:de.bbf :right, lp[:buw]); + with layer = -1 marker(:de.hp.casing :right, lp[:buw]); + } + + with link = "line.de.1100" { + track(:first, lp[:buw + 1ssw, :put - 1ssw]); + with layer = 1 line_badge(:open, lp[:buw + 3.2km], "1100"); + } + + with link = "point.de.Puttgarden" { + track(:first :station, lp[:put - 1ssw, :put + 0.6ssw]); + marker(:de.bf :left, lp[:put]); + slabel(:left, lp[:put - 0.7ssw] << 1.5ssw, + span(:bold, "Puttgarden") + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1103.map b/rules/tmp-de/a/d3/11/1103.map new file mode 100644 index 00000000..adf163a1 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1103.map @@ -0,0 +1,147 @@ +# DE 1103. Fehmarnsund - Orth (Fehmarn) +# +let fo = path("d4.de.1103"); + +with detail = 3 { + with link = "point.de.Fehmarnsund" { + track(:third:station :removed, fo[:feh.a, :feh.a + 1.5ssw]); + marker(:de.bf :removed :right, fo[:feh.a + 0.5sw]); + slabel(:right :removed, fo[:feh.a] >> 2.1ssw, + span(:bold, "Fehmarnsund") + ); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:feh.f, :wul - 1ssw]); + } + + with link = "point.de.Wulfen-Fehmarn" { + track(:third:station :removed, fo[:wul - 1ssw, :wul + 1ssw]); + marker(:de.hp :removed :left, fo[:wul]); + slabel(:right :removed, fo[:wul - 0.4ssw] >> 1dt >> 3pt, + hbox(:center:base, + span(:regular, "Wulfen "), + span(:light, "(Fehmarn)") + ) + ); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:wul + 1ssw, :bus - 1ssw]); + + guide(:linenum :removed, + fo[:wul + 1km] << 0.7dt + -- fo[:wul + 1km] << 2dt + ); + label(:linenum, fo[:wul + 1km] << 2dt, + hbox(:center:bottom :badgesize :removed, "1103") + ); + } + + with link = "point.de.Burgstaaken" { + track(:third:station :removed, fo[:bus - 1ssw, :bus + 1ssw]); + marker(:de.hp :removed :right, fo[:bus]); + slabel(:right :removed, fo[:bus - 0.1ssw] >> 1.8ssw, + "Burgstaaken" + ); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:bus + 1ssw, :bur - 1ssw]); + } + + with link = "point.de.Burg-Fehmarn" { + track(:second:station :removed, fo[:bur - 1ssw, :bur - 0.5ssw]); + track(:second:station, fo[:bur - 0.5ssw, :bur + 1ssw]); + + marker(:de.bft :right, fo[:bur]); + with layer = -1 marker(:de.bf :gone :right, fo[:bur]); + slabel(:right, fo[:bur - 0.6ssw] >> 1.4ssw, + span(:bold, "Fehmarn-Burg") + ); + } + + with link = "line.de.1103", layer = -2 { + let lp = path("d4.de.1100"); + + track(:second, + fo[:bur + 1ssw, :bur + 1.1ssw] + .. lp[:fort + 0.1ssw, :fort] + ); + track(:second :removed, + lp[:fort + 0.1ssw, :fort] + .. fo[:fort + 300m, :lan - 1ssw] + ); + } + + with link = "point.de.Landkirchen" { + track(:third:station :removed, fo[:lan - 1ssw, :lan + 1ssw]); + marker(:de.bf :removed :left, fo[:lan]); + slabel(:left:removed, fo[:lan - 0.7ssw] << 2.8ssw + (1ssw, 0ssw), + "Landkirchen" + ); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:lan + 1ssw, :aje - 1ssw]); + + guide(:linenum :removed, + fo[:lan + 1km] >> 0.7dt + -- fo[:lan + 1km] >> 2dt + ); + label(:linenum, fo[:lan + 1km] >> 2dt, + hbox(:center:bottom :badgesize :removed, " 1103") + ); + } + + with link = "point.de.Alt-Jellingsdorf" { + track(:third:station :removed, fo[:aje - 1ssw, :aje + 1ssw]); + marker(:de.hp :removed :left, fo[:aje]); + slabel(:left :removed, fo[:aje - 0.7ssw] << 3.0ssw + (2ssw, 0ssw), + "Alt Jellingsd." + ); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:aje + 1ssw, :lem - 1ssw]); + } + + with link = "point.de.Lemkendorf" { + track(:third:station :removed, fo[:lem - 1ssw, :lem + 1ssw]); + marker(:de.hst :removed :right, fo[:lem]); + with layer = -1 marker(:de.bf :gone :right, fo[:lem]); + slabel(:right :removed, fo[:lem] >> 1.4ssw, "Lemkendorf"); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:lem + 1ssw, :pet - 1ssw]); + } + + with link = "point.de.Petersdorf-Fehmarn" { + track(:third:station :removed, fo[:pet - 1ssw, :pet + 1ssw]); + marker(:de.bf :removed :right, fo[:pet]); + slabel(:top :removed, fo[:pet] >> 1.4ssw, + vbox(:center:base, + span(:regular, "Petersdorf"), + span(:light, "(Fehmarn)") + ) + ); + } + + with link = "line.de.1103" { + track(:third :removed, fo[:pet + 1ssw, :ort - 1ssw]); + } + + with link = "point.de.Orth-Fehmarn" { + track(:third:station :removed, fo[:ort - 1ssw, :ort.f]); + marker(:de.hst :removed :left, fo[:ort]); + with layer = -1 marker(:de.bf :gone :left, fo[:ort]); + slabel(:left :removed, fo[:ort + 0.4ssw] >> 1dt, + hbox(:center:base, + span(:bold, "Orth "), + span(:regular, "(Fehmarn)") + ) + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1110.map b/rules/tmp-de/a/d3/11/1110.map new file mode 100644 index 00000000..b50b395a --- /dev/null +++ b/rules/tmp-de/a/d3/11/1110.map @@ -0,0 +1,81 @@ +# DE 1110. Eutin - Bad Schwartau Abzw (ausschl.) +# +let el = path("d4.de.1110"); + +with detail = 3 { + with link = "line.de.1110" { + track(:first :pax, + el[:eut + 1ssw, :eut.x] >> 0.5dt + .. el[:eut.gg + 0.2km, :boc - 1ssw] + ); + } + + with link = "point.de.Bockholt" { + track(:first:station :pax, el[:boc - 1ssw, :boc + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, el[:boc]); + slabel(:left :removed, el[:boc + 0.35ssw] >> 1.7ssw, "Bockholt"); + } + + with link = "line.de.1110" { + track(:first :pax, el[:boc + 1ssw, :ott - 1ssw]); + with layer = 1 line_badge(:open :pax, el[:boc + 1.7km], "1110"); + } + + with link = "point.de.Ottendorf-Holst" { + track(:first:station :pax, el[:ott - 1ssw, :ott + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, el[:ott]); + slabel(:left :removed, el[:ott + 0.5ssw] >> 1.5ssw, + hbox(:right:base, + span(:regular, "Ottendorf "), + span(:light, "(Holst)") + ) + ); + } + + with link = "line.de.1110" { + track(:first :pax, el[:ott + 1ssw, :pon - 1ssw]); + } + + with link = "point.de.Pönitz-Holst" { + track(:first:station :pax, el[:pon - 1ssw, :pon + 1ssw]); + marker(:de.bf :pax :right, el[:pon]); + label(el[:pon] << 1.0dt, + vbox(:left:middle :small :pax, + span(:bold, "Ponitz"), + span(:regular, " (Holst)") + ) + ); + } + + with link = "line.de.1110" { + track(:first :pax, el[:pon + 1ssw, :gle - 1ssw]); + } + + with link = "point.de.Gleschendorf" { + track(:first:station :pax, el[:gle - 1ssw, :gle + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, el[:gle]); + slabel(:right :removed, el[:gle + 0.3ssw] << 0.7dt, + "Gleschend." + ); + } + + with link = "line.de.1110" { + track(:first :pax, el[:gle + 1ssw, :pan - 1ssw]); + with layer = 1 line_badge(:open :pax, el[:pan - 1.7km], "1110"); + } + + with link = "point.de.Pansdorf" { + track(:first:station :pax, el[:pan - 1ssw, :pan + 1ssw]); + marker(:de.bf :pax :left, el[:pan]); + slabel(:left :pax, el[:pan + 0.4ssw] >> 2dt, "Pansdorf"); + } + + with link = "line.de.1110" { + track(:first :pax, + el[:pan + 1ssw, :f - 300m] + .. path("d4.de.1100")[:aeut, :swa + 0.5ssw] >> 0.5dt + ); + } +} + + diff --git a/rules/tmp-de/a/d3/11/1111.map b/rules/tmp-de/a/d3/11/1111.map new file mode 100644 index 00000000..e16b940a --- /dev/null +++ b/rules/tmp-de/a/d3/11/1111.map @@ -0,0 +1,43 @@ +# DE 1111. Pönitz (Holst) (ausschl.) - Ahrensbök +# +let pa = path("d4.de.1111"); + +with detail = 3 { + with link = "line.de.1111" { + track(:second :removed, pa[:aahr, :bra - 1ssw]); + with layer = 1 line_badge(:removed, pa[:bra - 1.4km], "1111"); + } + + with link = "point.de.Brauner-Hirsch" { + track(:second:station :removed, pa[:bra - 1ssw, :bra + 1ssw]); + marker(:de.hp :removed :right, pa[:bra]); + slabel(:left :removed, pa[:bra - 1ssw] >> 1.5ssw, "Brauner Hirsch"); + } + + with link = "line.de.1111" { + track(:second :removed, pa[:bra + 1ssw, :hol - 1ssw]); + } + + with link = "point.de.Holstendorf" { + track(:second:station :removed, pa[:hol - 1ssw, :hol + 1ssw]); + marker(:de.bf :removed :right, pa[:hol]); + slabel(:left :removed, pa[:hol + 0.8ssw] >> 1.5ssw, + "Holstendorf" + ); + } + + with link = "line.de.1111" { + track(:second :removed, pa[:hol + 1ssw, :ahr - 1ssw]); + } + + + with link = "point.de.Ahrensbök" { + track(:second:station :removed, pa[:ahr - 1ssw, :f]); + marker(:de.bf :removed :right, pa[:ahr]); + slabel(:left :removed, pa[:ahr + 0.6ssw] >> 1.5ssw, + span(:bold, "Ahrensbök") + ); + } + +} + diff --git a/rules/tmp-de/a/d3/11/1112.map b/rules/tmp-de/a/d3/11/1112.map new file mode 100644 index 00000000..d84e55b3 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1112.map @@ -0,0 +1,125 @@ +# DE 1112. Bad Malente-Gremsmühlen (ausschl.) - Lütjenburg +# +let ml = path("d4.de.1112"); + +with detail = 3 { + with link = "line.de.1112" { + track(:second :closed, ml[:mal.bbb, :man - 1ssw]); + } + + with link = "point.de.Malente-Nord" { + track(:second:station :closed, ml[:man - 1ssw, :man + 1ssw]); + marker(:de.hp :closed :left, ml[:man]); + slabel(:left :closed, ml[:man + 1ssw] << 1.5ssw, "Malente Nord"); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:man + 1ssw, :hol - 1ssw]); + } + + with link = "point.de.Holsteinische-Schweiz" { + track(:second:station :closed, ml[:hol - 1ssw, :hol + 1ssw]); + marker(:de.hp :closed :right, ml[:hol]); + with layer = -1 marker(:de.bf :gone :right, ml[:hol]); + slabel(:right :closed, ml[:hol] >> 2.2ssw, + "Holsteinische Schweiz" + ); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:hol + 1ssw, :bru - 1ssw]); + } + + with link = "point.de.Bruhnskoppel" { + track(:second:station :closed, ml[:bru - 1ssw, :bru + 1ssw]); + marker(:de.hp :closed :left, ml[:bru]); + slabel(:left :closed, ml[:bru - 0.8ssw] << 1.4ssw, + "Bruhnskoppel" + ); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:bru + 1ssw, :maw - 1ssw]); + } + + with link = "point.de.Malkwitz" { + track(:second:station :closed, ml[:maw - 1ssw, :maw + 1ssw]); + marker(:de.hp :closed :left, ml[:maw]); + slabel(:left :closed, ml[:maw - 0.4ssw] << 1.4ssw, "Malkwitz"); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:maw + 1ssw, :ben - 1ssw]); + } + + with link = "point.de.Benz" { + track(:second:station :closed, ml[:ben - 1ssw, :ben + 1ssw]); + marker(:de.anst :closed :left, ml[:ben]); + with layer = -1 marker(:de.bf :removed :left, ml[:ben]); + slabel(:left :closed, ml[:ben - 0.6ssw] << 1.4ssw, "Benz"); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:ben + 1ssw, :fle - 1ssw]); + } + + with link = "point.de.Flehm" { + track(:second:station :closed, ml[:fle - 1ssw, :fle + 1ssw]); + marker(:de.hp :closed :right, ml[:fle]); + slabel(:right :closed, ml[:fle - 0.6ssw] >> 1.6ssw, "Flehm"); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:fle + 1ssw, :kle - 1ssw]); + } + + with link = "point.de.Kletkamp" { + track(:second:station :closed, ml[:kle - 1ssw, :kle + 1ssw]); + marker(:de.hst :closed :right, ml[:kle]); + with layer = -1 marker(:de.bf :gone :right, ml[:kle]); + slabel(:right :closed, ml[:kle] >> 1.6ssw + (0ssw, 0.5ssw), + "Kletkamp" + ); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:kle + 1ssw, :ble - 1ssw]); + } + + with link = "point.de.Blekendorf" { + track(:second:station :closed, ml[:ble - 1ssw, :ble + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, ml[:ble]); + slabel(:right :closed, ml[:ble - 0.7ssw] >> 1.4ssw, "Blekendorf"); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:ble + 1ssw, :fre - 1ssw]); + with layer = 1 line_badge(:closed, ml[:ble + 1.0km], "1112"); + } + + with link = "point.de.Frederikental" { + track(:second:station :closed, ml[:fre - 1ssw, :fre + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, ml[:fre]); + slabel(:right :removed, ml[:fre - 0.5ssw] >> 1dt, + "Frederikental" + ); + } + + with link = "line.de.1112" { + track(:second :closed, ml[:fre + 1ssw, :lut - 1ssw]); + } + + with link = "point.de.Lütjenburg" { + track(:second:station :closed, ml[:lut - 1ssw, :lut + 1ssw]); + with layer = -1 track(:third:station :removed, + path("d4.de.AK2")[:lut.bb + 0.1dl, :lut.bb] + .. ml[:lut - 1.1ssw, :lut - 1ssw] + ); + + marker(:de.bf :closed :left, ml[:lut]); + slabel(:right :closed, ml[:lut - 0.5ssw] >> 1dt, + span(:bold, "Lütjenburg") + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1113.map b/rules/tmp-de/a/d3/11/1113.map new file mode 100644 index 00000000..55954575 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1113.map @@ -0,0 +1,139 @@ +# DE 1113. Schwartau Waldhalle - Lübeck-Travemünde Strand +# +let wt = path("d4.de.1113"); + +with detail = 3 { + # point.de.Schwartau-Waldhalle-Wr de.1100 + + with link = "line.de.1113" { + track(:first :double :cat:ac15 :pax, wt[:aa, :dan - 1ssw]); + } + + with link = "point.de.Lübeck-Dänischburg" { + track(:first:station :double :cat:ac15 :pax, + wt[:dan - 1ssw, :dan + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, wt[:dan] << 0.5dt); + slabel(:bottom :cat:ac15 :pax, wt[:dan] >> 1dt, + vbox(:center:bottom, + span(:bold, "L.-"), + span(:bold, "Dänischbg.") + ) + ); + } + + with link = "line.de.1113" { + track(:first :double :cat:ac15 :pax, wt[:dan + 1ssw, :kuc - 1ssw]); + } + + with link = "point.de.Lübeck-Kücknitz" { + track(:first:station :double :cat:ac15 :pax, + wt[:kuc - 1ssw, :kua - 1ssw] + ); + with layer = -1 marker(:de.bf :removed :left, wt[:kuc] << 0.5dt); + } + + with link = "point.de.Lübeck-Kücknitz-Abzw" { + track(:first:station :cat:ac15 :pax, + wt[:kua - 1ssw, :kua + 0.5ssw] >> 0.5dt + ); + + track(:first:station :cat:ac15 :pax, + wt[:kua - 1ssw, :kua] << 0.5dt + ); + with layer = -2 track(:first:station :cat:ac15, + wt[:kua, :kua + 0.5ssw] << 0.5dt + ); + + with layer = -2 marker(:de.abzw :cat:ac15 :left, wt[:kua] << 0.5dt); + label(:cat:ac15, wt[:kua - 0.5ssw] << 0.5dt << 1.2ssw, + hbox(:right:bottom, + vbox(:center:bottom :small, + span(:bold, "L.-Kücknitz") + ) + ) + ); + } + + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax :tight, + wt[:kua + 0.5ssw, :kua + 0.51ssw] >> 0.5dt + .. wt[:kur - 1.1ssw, :kur - 1ssw] + ); + with layer = -1 casing(:first, wt[:kua.x - 200m, :kua.x + 400m]); + } + + + with link = "point.de.Lübeck-Kücknitz-Roter-Hahn" { + track(:first:station :cat:ac15 :pax, wt[:kur - 1ssw, :kur + 1ssw]); + marker(:de.hp:cat:ac15 :pax :right, wt[:kur]); + slabel(:right:cat:ac15 :pax, wt[:kur - 0.2ssw] >> 2.4ssw, + "L.-K. Roter Hahn" + ); + } + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:kur + 1ssw, :pop - 1ssw]); + } + + with link = "point.de.Lübeck-Pöppendorf" { + track(:first:station :cat:ac15 :pax, wt[:pop - 1ssw, :pop + 1ssw]); + with layer = -1 marker(:de.bf :removed :left, wt[:pop]); + slabel(:left :removed, wt[:pop - 0.4ssw] << 1.4ssw, + "L.-Pöppendorf" + ); + } + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:pop + 1ssw, :ska - 1ssw]); + } + + + with link = "point.de.Lübeck-Travemünde-Skandinavienkai" { + track(:first:station :cat:ac15 :pax, wt[:ska - 1ssw, :ska + 1ssw]); + marker(:de.hp:cat:ac15 :pax :left, wt[:ska]); + slabel(:right:cat:ac15 :pax, wt[:ska - 0.6ssw] >> 1dt + (0dt, 0.5dt), + "L.-T. Skandinavienkai" + ); + } + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:ska + 1ssw, :trh - 1ssw]); + + guide(:linenum :cat:ac15 :pax, + wt[:ska + 1ssw] << 1.0dt + -- wt[:ska + 1.2ssw] << 1.0dt - (2.0dt, 0dt) + ); + label(:linenum :cat:ac15 :pax, + wt[:ska + 1.2ssw] << 1.0dt - (2.0dt, 0dt), + hbox(:right:middle :badgesize, "1113 ") + ); + } + + with link = "point.de.Lübeck-Travemünde-Hafen" { + track(:first:station :cat:ac15 :pax, wt[:trh - 1ssw, :trh + 1ssw]); + marker(:de.hp:cat:ac15 :pax :right, wt[:trh]); + with layer = -1 marker(:de.bf :gone :right, wt[:trh]); + slabel(:right:cat:ac15 :pax, wt[:trh] >> 1ssw + (1.3ssw, 0ssw), + span(:bold, "L.-Travemünde Hafen") + ); + } + + with link = "line.de.1113" { + track(:first :cat:ac15 :pax, wt[:trh + 1ssw, :trs - 1ssw]); + } + + with link = "point.de.Lübeck-Travemünde-Hafen" { + track(:first:station :cat:ac15 :pax, wt[:trs - 1ssw, :trs]); + + marker(:de.hp:cat:ac15 :pax :top, wt[:trs]); + with layer = -1 marker(:de.bf :gone :top, wt[:trs]); + track(:first:pax:cat:ac15, wt[:trs] << 0.5ssw -- wt[:trs] >> 0.5ssw); + slabel(:right:cat:ac15 :pax, wt[:trs] + (1.4ssw, -0.6ssw), + span(:bold, "Lübeck-Travemünde Strand") + ); + } + +} + diff --git a/rules/tmp-de/a/d3/11/1114.map b/rules/tmp-de/a/d3/11/1114.map new file mode 100644 index 00000000..92283e4d --- /dev/null +++ b/rules/tmp-de/a/d3/11/1114.map @@ -0,0 +1,54 @@ +# DE 1114. Lübeck-Travemünde Hafen - Niendorf (Ostsee) +# +let tn = path("d4.de.1114"); + +with detail = 3 { + with link = "point.de.Lübeck-Travemünde-Nord" { + with layer = -1 track(:second:station :removed, + tn[:anie, :anie + 2ssw] + ); + marker(:de.hp :removed :left, tn[:anie + 1ssw]); + slabel(:left :removed, tn[:anie + 0.2ssw] << 1.8ssw, + "L.-T. Nord" + ); + } + + with link = "line.de.1114" { + track(:second :removed, tn[:anie + 2ssw, :bro - 1ssw]); + + guide(:linenum :removed, + tn[:bro - 0.6km] << 0.7dt + -- tn[:bro - 0.6km] << 2.5dt + ); + label(:linenum, tn[:bro - 0.6km] << 2.5dt, + hbox(:right:middle :badgesize :removed, "1114 ") + ); + } + + with link = "point.de.Lübeck-Brodten" { + track(:second:station :removed, + tn[:bro - 1ssw, :bro + 1ssw] + ); + marker(:de.hst :removed :right, tn[:bro]); + slabel(:right :removed, tn[:bro - 0.7ssw] >> 1.4ssw, + "Lübeck-Brodten" + ); + } + + with link = "line.de.1114" { + track(:second :removed, tn[:bro + 1ssw, :nie - 1ssw]); + } + + with link = "point.de.Niendorf-Ostsee" { + track(:second:station :removed, tn[:f - 2ssw, :f]); + marker(:de.bf :removed :right, tn[:f - 1ssw]); + slabel(:right :removed, tn[:f] >> 1.4ssw, + hbox(:center:base, + span(:bold, "Niendorf "), + "(Ostsee)" + ) + ); + } +} + + diff --git a/rules/tmp-de/a/d3/11/1115.map b/rules/tmp-de/a/d3/11/1115.map new file mode 100644 index 00000000..81f0a77e --- /dev/null +++ b/rules/tmp-de/a/d3/11/1115.map @@ -0,0 +1,14 @@ +# DE 1115. Lübeck-Dänischburg (ausschl.) - Lübeck Herrenwyk +# +let dh = path("d4.de.1115"); +let wt = path("d4.de.1113"); + +with detail = 3 { + with link = "line.de.1115" { + track(:private, + wt[:aher, :aher + 1m] >> 0.5dt + .. dh[:a + 300m, :f] + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1117.map b/rules/tmp-de/a/d3/11/1117.map new file mode 100644 index 00000000..937a2293 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1117.map @@ -0,0 +1,22 @@ +# DE 1117. Lübeck-Kücknitz (ausschl.) - Lübeck Skandinavienkai +# +let ks = path("d4.de.1117"); + +with detail = 3 { + with link = "line.de.1117" { + with layer = -2 track(:second :cat:ac15, + ks[:kua + 0.5ssw, :kua + 0.51ssw] << 0.5dt + .. ks[:kur - 1.1ssw, :kur + 0.5ssw] << 1dt + .. ks[:ska + 499m, :ska + 500m] + ); + } + + with link = "point.de.Lübeck-Skandinavienkai" { + track(:second:station :cat:ac15, ks[:ska + 500m, :ska + 500m + 2ssw]); + marker(:de.gbf :cat:ac15 :right, ks[:ska + 500m + 1ssw]); + slabel(:right :cat:ac15, ks[:ska + 500m + 2ssw] >> 1.2ssw, + span(:bold, "Lübeck Skandinavienkai") + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1120.map b/rules/tmp-de/a/d3/11/1120.map new file mode 100644 index 00000000..3d380e67 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1120.map @@ -0,0 +1,260 @@ +# DE 1120. Lübeck Hbf - Hamburg Hbf +# +let lh = path("d4.de.1120"); + +with detail = 3 { + with link = "point.de.Lübeck-Hbf" { + track(:first:station :double :cat:ac15 :pax, lh[:lub.a, :lub.f]); + marker(:de.bf :cat:ac15 :pax :left, lh[:lub] << 0.5dt); + slabel(:right :cat:ac15 :pax, + lh[:lub] << 0.5dt << 3.2ssw - (2ssw, 0ssw), + span(:bold, "Lübeck Hbf") + ); + } + + with link = "point.de.Lübeck-Hgbf" { + track(:first:station :double :cat:ac15 :pax, lh[:lub.f, :lua - 1ssw]); + with layer = -1 marker(:de.bbf :cat:ac15 :left, + lh[:lua - 2ssw] << 0.5dt + ); + } + + with link = "point.de.Lübeck-Hgbf-Abzw" { + let lb = path("d4.de.1121"); + + # Str. 1120 + track(:first:station :double :cat:ac15 :pax, + lh[:lua - 1ssw, :lua.k + 1ssw] + ); + + # Str. 1121 + with layer = -1 track(:first :pax, + lh[:lua.k, :lua.k + 0.1dl] << 0.5dt + .. lb[:lua.yb - 0.1dl, :lua.yb] >> 1dt + ); + + # Str. 1122 + with layer = -1 track(:first :pax, + lh[:lua - 0.1dl, :lua] << 0.5dt + -- lh[:lua + 1dl, :lua.k] << 1.5dt + .. lb[:lua.yb - 0.1dl, :lua.yb] + ); + with layer = -4 track(:first :removed, + lh[:lua + 0.9dl, :lua + 1dl] << 1.5dt + -- lh[:lua + 2dl, :lua.k] << 2.5dt + .. lb[:lua.yb - 0.1dl, :lua.yb] << 1dt + ); + + with layer = -1 marker(:de.abzw :cat:ac15 :right, lh[:lua] >> 0.5dt); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:lua.k + 1ssw, :nie - 1ssw]); + } + + with link = "point.de.Lübeck-Niendorf" { + track(:first:station :double :cat:ac15 :pax, + lh[:nie - 1ssw, :nie + 1ssw] + ); + with layer = -1 marker(:de.bf :removed :right, lh[:nie] >> 0.5dt); + slabel(:top :removed, lh[:nie + 2ssw] >> 0.5dt >> 1.4ssw, + "L.-Niendorf" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:nie + 1ssw, :rei - 1ssw]); + } + + with link = "point.de.Wesenberg-Holst" { + with layer = -1 marker(:de.bk :removed :left, lh[:wes] << 0.5dt); + } + + with link = "point.de.Reinfeld-Holst" { + track(:first:station :double :cat:ac15 :pax, + lh[:rei - 1ssw, :rei + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lh[:rei] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:rei - 1ssw] >> 0.5dt >> 1.4ssw, + hbox(:center:base, + span(:regular, "Reinfeld "), + span(:light, "(Holst)") + ) + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:rei + 1ssw, :old.yn - 2ssw]); + } + + with link = "point.de.Steinfeld" { + with layer = -4 marker(:de.bk :removed :left, lh[:ste] << 0.5dt); + } + + with link = "point.de.Bad-Oldesloe" { + # Str. 1120 + track(:first:station :double :cat:ac15 :pax, + lh[:old.yn - 2ssw, :old + 1ssw] + ); + + # Str. 1043 + let no = path("d4.de.1043"); + with layer = -1 track(:first:station :pax, + no[:old.yn - 2ssw, :old.yn] >> 0.5dt + ); + with layer = -4 track(:first:station :removed, + no[:old.yn - 2ssw, :old - 0.5ssw] >> 1.5dt + ); + + # Str. 1141/6928/9120 + with layer = -4 track(:second:station :closed, + lh[:old + 0.5ssw, :old + 1ssw] >> 1.5dt + ); + + marker(:de.bf :cat:ac15 :pax :right, lh[:old] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lh[:old + 0.4ssw] << 2.0dt, + span(:bold, "Bad Oldesloe") + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:old + 1ssw, :kup - 1ssw]); + with layer = -5 casing(:first :double :cat, lh[:old.yr, :old.f]); + } + + with link = "point.de.Kupfermühle" { + track(:first:station :double :cat:ac15 :pax, + lh[:kup - 1ssw, :kup + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, lh[:kup] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:kup + 0.6ssw] >> 0.5dt >> 1.4ssw, + "Kupfermühle" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:kup + 1ssw, :bar - 1ssw]); + } + + with link = "point.de.Tremsbüttel" { + with layer = -1 marker(:de.bk :removed :left, lh[:tre] << 0.5dt); + } + + with link = "point.de.Bargteheide" { + track(:first:station :double :cat:ac15 :pax, + lh[:bar - 1ssw, :bar + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lh[:bar] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:bar + 0.6ssw] >> 0.5dt >> 1.4ssw, + "Bargteheide" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:bar + 1ssw, :gar - 1ssw]); + with layer = 1 line_badge(:pax :cat:ac15, lh[:bar + 1.7km], "1120"); + } + + with link = "point.de.Delingsdorf" { + with layer = -1 marker(:de.bk :removed :right, lh[:del] >> 0.5dt); + } + + with link = "point.de.Ahrensburg-Gartenholz" { + track(:first:station :double :cat:ac15 :pax, + lh[:gar - 1ssw, :gar + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, lh[:gar] << 0.5dt); + label(lh[:gar] << 0.5dt << 1.6ssw, + vbox(:left:middle :cat:ac15 :pax :small, + " Ahrensburg-", "Gartenholz" + ) + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:gar + 1ssw, :ahr - 1ssw]); + } + + with link = "point.de.Ahrensburg-Nord" { + with layer = -1 marker(:de.awanst :cat:ac15 :right, lh[:ahn] >> 0.5dt); + } + + + with link = "point.de.Ahrensburg" { + track(:first:station :double :cat:ac15 :pax, + lh[:ahr - 1ssw, :ahr + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lh[:ahr] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lh[:ahr + 0.8ssw] >> 0.5dt >> 1.4ssw, + "Ahrensburg" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:ahr + 1ssw, :rab - 1ssw]); + } + + with link = "point.de.Meiendorf" { + with layer = -1 marker(:de.bk :removed :right, lh[:mei] >> 0.5dt); + } + + with link = "point.de.Hamburg-Rahlstedt-Bbf" { + track(:first:station :double :cat:ac15 :pax, + lh[:rab - 1ssw, :rab + 1ssw] + ); + with layer = -1 marker(:de.bft :cat:ac15 :right, lh[:rab] >> 0.5dt); + } + + with link = "point.de.Hamburg-Rahlstedt" { + track(:first:station :double :cat:ac15 :pax, + lh[:rab + 1ssw, :rah + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, lh[:rah] << 0.5dt); + slabel(:right :cat:ac15 :pax, lh[:rah + 0.3ssw] << 0.5dt << 2.0ssw, + "Hamburg-Rahlstedt" + ); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:ahr + 1ssw, :ton - 1ssw]); + } + + with link = "point.de.Wandsbek-Ost-Bk" { + with layer = -1 marker(:de.bk :removed :left, lh[:wab] << 0.5dt); + } + + with link = "point.de.Hamburg-Tonndorf" { + track(:first:station :double :cat:ac15 :pax, + lh[:ton - 1ssw, :ton + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, lh[:ton] >> 0.5dt); + } +} + + +let lh = path("d3.de.1120"); + +with detail = 3 { + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, + lh[:ton + 1ssw, :wan - 1ssw] + ); + } + + with link = "point.de.Hamburg-Wandsbek" { + track(:first:station :double :cat:ac15 :pax, + lh[:wan - 1ssw, :wan + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lh[:wan] >> 0.5dt); + } + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, lh[:wan + 1ssw, :ham.aa - 1ssw]); + with layer = -1 casing(:first :double :cat, lh[:wan + 1ssw, :has]); + + track(:first:station :double :cat:ac15 :pax, + lh[:ham.aa - 1ssw, :ham.aa] + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1121.map b/rules/tmp-de/a/d3/11/1121.map new file mode 100644 index 00000000..bddb0375 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1121.map @@ -0,0 +1,157 @@ +# DE 1121. Lübeck Hbf - Büchen +# +let lb = path("d4.de.1121"); + +with detail = 3 { + # point.de.Lübeck-Hbf de.1100 + # point.de.Lübeck-Hgbf de.1120 + # point.de.Lübeck-Hgbf-Abzw de.1120 + + with link = "line.de.1121" { + track(:first:pax, + lb[:lua.yb, :lua.yb + 0.1dl] >> 1dt + .. lb[:hoc - 1.1ssw, :hoc - 1ssw] + ); + } + + with link = "point.de.Lübeck-Hochschulstadtteil" { + track(:first:station :pax, lb[:hoc - 1ssw, :hoc + 1ssw]); + marker(:de.hp :pax :right, lb[:hoc]); + slabel(:left :pax, lb[:hoc - 0.6ssw] >> 1.2ssw, + vbox(:right:top, + span(:open, "L. Hochschul-"), + span(:open, "stadtteil") + ) + ); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:hoc + 1ssw, :flu - 1ssw]); + } + + with link = "point.de.Lübeck-Flughafen" { + track(:first:station :pax, lb[:flu - 1ssw, :flu + 100m]); + marker(:de.hp :pax :left, lb[:flu]); + slabel(:right :pax, lb[:flu + 0.4ssw] << 1.3ssw, + "Lübeck Flughafen" + ); + } + + + with link = "point.de.Lübeck-Blankensee" { + track(:first:station :pax, lb[:flu + 100m, :bla + 1ssw]); + with layer = -1 marker(:de.bf :removed :left, lb[:bla]); + slabel(:left :removed, lb[:bla + 0.4ssw] >> 1dt, + "Lübeck-Blankensee" + ); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:bla + 1ssw, :sar - 1ssw]); + with layer = 1 line_badge(:pax, lb[:bla + 2.5km], "1121"); + } + + + with link = "point.de.Sarau" { + track(:first:station :pax, lb[:sar - 1ssw, :sar + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, lb[:sar]); + slabel(:right :removed, lb[:sar + 0.6ssw] << 1.4ssw, "Sarau"); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:sar + 1ssw, :pog - 1ssw]); + } + + with link = "point.de.Pogeez" { + track(:first:station :pax, lb[:pog - 1ssw, :pog + 1ssw]); + with layer = -1 marker(:de.bbf :left, lb[:pog]); + slabel(:right, lb[:pog + 0.6ssw] << 1.4ssw, "Pogeez"); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:pog + 1ssw, :rat.a]); + } + + with link = "point.de.Pogeez-Bk" { + with layer = -1 marker(:de.bk :removed :right, lb[:pob]); + } + + with link = "point.de.Ratzeburg" { + track(:first:station :pax, lb[:rat.a, :rat.f]); + marker(:de.bf :pax :left, lb[:rat] >> 0.5ssw); + slabel(:left :pax, lb[:rat + 0.5ssw] >> 1.5dt, + span(:bold, "Ratzeburg ") + ); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:rat.f, :mol - 1ssw]); + with layer = 1 line_badge(:open :pax, lb[:rat + 4.7km], "1121"); + } + + with link = "point.de.Mölln-Lauenburg" { + track(:first:station :pax, lb[:mol - 1sw, :mol + 1sw]); + marker(:de.bf :pax :left, lb[:mol]); + slabel(:left :pax, lb[:mol + 0.4ssw] >> 1.5dt, + hbox(:center:base, + span(:bold, "Mölln "), + span(:regular, "(Lauenburg)") + ) + ); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:mol + 1ssw, :moi - 0.5ssw]); + } + + with link = "point.de.Mölln-Lauenburg-Industriegleis" { + track(:first:station :pax, lb[:moi - 0.5ssw, :moi + 0.5ssw]); + marker(:de.awanst :right, lb[:moi]); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:moi + 0.5ssw, :gub - 1ssw]); + } + + with link = "point.de.Güster-Bahnsteig" { + track(:first:station :pax, lb[:gub - 1ssw, :gub + 1ssw]); + with layer = -1 marker(:de.bft :removed :left, lb[:gub]); + } + + with link = "point.de.Güster" { + track(:first:station :pax, lb[:gub + 1ssw, :gus + 1ssw]); + with layer = -1 marker(:de.bbf :left, lb[:gus]); + slabel(:right, lb[:gus + 0.4ssw] << 2.2ssw, "Güster"); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:gus + 1ssw, :ros - 1ssw]); + } + + with link = "point.de.Roseburg" { + track(:first:station :pax, lb[:ros - 1ssw, :ros + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, lb[:ros]); + slabel(:left :removed, lb[:ros + 0.6ssw] >> 1.6ssw, "Roseburg"); + } + + with link = "line.de.1121" { + track(:first :pax, lb[:ros + 1ssw, :nus - 1ssw]); + with layer = 1 line_badge(:open :pax, lb[:nus - 2.0km], "1121"); + } + + with link = "point.de.Büchen-Nüssau" { + track(:first:station :pax, lb[:nus - 1ssw, :nus + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, lb[:nus]); + slabel(:right :removed, lb[:nus + 0.6ssw] << 1.4ssw, + "Büchen-Nüssau" + ); + } + + with link = "line.de.1121" { + track(:first :pax, + lb[:nus + 1ssw, :buc.g - 1.5dt] + .. path("d4.de.a.6100")[:buc + 0.51ssw, :buc + 0.5ssw] << 0.5dt + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1122.map b/rules/tmp-de/a/d3/11/1122.map new file mode 100644 index 00000000..e7d6e0b6 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1122.map @@ -0,0 +1,50 @@ +# DE 1122. Lübeck Hbf - Strasburg (Meckl) +# +let ls = path("d4.de.a.1122"); + +with detail = 3 { + # point.de.Lübeck-Hbf de.1120 + # point.de.Lübeck-Hgbf de.1120 + # point.de.Lübeck-Hgbf-Abzw de.1120 + + with link = "line.de.1122" { + track(:first :pax, + ls[:lua.yb, :lua.yb + 0.1dl] + .. ls[:lua.xb, :stn - 0.5ssw] >> 0.5dt + ); + track(:first :removed, + ls[:lua.yb, :lua.yb + 0.1dl] << 1dt + .. ls[:lua.xb, :stn - 0.5ssw] << 0.5dt + ); + } + + with link = "point.de.Strecknitz" { + track(:first:station :pax, ls[:stn - 0.5ssw, :stn + 0.5ssw] >> 0.5dt); + with layer = -4 track(:first:station :removed, + ls[:stn - 0.5ssw, :stn] << 0.5dt + ); + with layer = -1 track(:second:station, + ls[:stn - 1.1dl, :stn - 1dl] >> 0.5dt + -- ls[:stn, :stn + 0.5ssw] << 0.5dt + ); + marker(:de.abzw :left, ls[:stn] << 0.5dt); + } + + with link = "point.de.Lübeck-St-Jürgen" { + track(:first:station :pax, ls[:stn + 0.5ssw, :sju + 1ssw] >> 0.5dt); + track(:second:station, ls[:stn + 0.5ssw, :sju + 1ssw] << 0.5dt); + marker(:de.hp :pax :right, ls[:sju] >> 0.5dt); + slabel(:right :pax, ls[:sju - 1ssw] >> 1.2ssw, + vbox(:left:top, + span(:open, "L. St"), + span(:open, "Jürgen") + ) + ); + } + + with link = "line.de.1122" { + track(:first :pax, ls[:sju + 1ssw, :heg - 0.5ssw] >> 0.5dt); + track(:first :removed, ls[:stn.ys, :heg - 0.5ssw] << 0.5dt); + } +} + diff --git a/rules/tmp-de/a/d3/11/1131.map b/rules/tmp-de/a/d3/11/1131.map new file mode 100644 index 00000000..784ab01c --- /dev/null +++ b/rules/tmp-de/a/d3/11/1131.map @@ -0,0 +1,55 @@ +# DE 1131. Lübeck Hgbf - Lübeck-Schlutup +# +let lp = path("d4.de.1131"); + +with detail = 3 { + # point.de.Lübeck-Hgbf de.1130 + + # point.de.Strecknitz de.1122 + + with link = "line.de.1131" { + track(:second, + lp[:stn + 0.5ssw, :stn.ys] << 0.5dt + .. lp[:stn.yys + 2dt, :bra - 1ssw] + ); + } + + with link = "point.de.Brandenbaum" { + track(:second:station, lp[:bra - 1ssw, :bra + 1ssw]); + marker(:de.abzw :right, lp[:bra]); + slabel(:right, lp[:bra - 0.4ssw] >> 1.4ssw, + span(:bold, "Brandenbaum") + ); + } + + with link = "line.de.1131" { + track(:second :flip, lp[:bra + 1ssw, :kir - 0.5ssw]); + } + + with link = "point.de.Lübeck-Kirschenallee" { + track(:second:station, lp[:kir - 0.5ssw, :kir + 0.5ssw]); + with layer = -1 marker(:de.anst :removed :right, lp[:kir]); + } + + with link = "line.de.1131" { + track(:second :flip, lp[:kir + 0.5ssw, :tan - 0.5ssw]); + } + + with link = "point.de.Lübeck-Schlutuper-Tannen" { + track(:second:station, lp[:tan - 0.5ssw, :tan + 0.5ssw]); + marker(:de.anst :left, lp[:tan]); + } + + with link = "line.de.1131" { + track(:second :flip, lp[:tan + 0.5ssw, :slu - 1ssw]); + } + + with link = "point.de.Lübeck-Schlutup" { + track(:second:station, lp[:slu - 1ssw, :f]); + marker(:de.gbf :left, lp[:slu]); + slabel(:right, lp[:slu - 0.3ssw] >> 6pt, + span(:bold, "Lübeck-Schlutup") + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1132.map b/rules/tmp-de/a/d3/11/1132.map new file mode 100644 index 00000000..f1643cc1 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1132.map @@ -0,0 +1,23 @@ +# DE 1132. Lübeck-Schlutup - Lübeck-Schlutup Fischereihafen +# +let sf = path("d4.de.1132"); + +with detail = 3 { + with link = "line.de.1132" { + track(:private, sf[:slu.w31, :slu.w51 - 0.5ssw]); + } + + with link = "point.de.Lübeck-Schlutup-W51" { + track(:private:station, sf[:slu.w51 - 0.5ssw, :slu.w51 + 0.5ssw]); + } + + with link = "line.de.1132" { + track(:private, sf[:slu.w51 + 0.5ssw, :slh - 1ssw]); + } + + + with link = "point.de.Lübeck-Schlutup-Fischereihafen" { + track(:private:station, sf[:slh - 1ssw, :f]); + } +} + diff --git a/rules/tmp-de/a/d3/11/1133.map b/rules/tmp-de/a/d3/11/1133.map new file mode 100644 index 00000000..33571d84 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1133.map @@ -0,0 +1,21 @@ +# DE 1133. Lübeck-Schlutup - Lübeck-Schlutup Breitling +# +let sb = path("d4.de.1133"); + +with detail = 3 { + with link = "point.de.Lübeck-Schlutup-W51" { + with layer = -1 { + track(:private:station :removed, + sb[:slu.w51, :slu.w51 + 0.5ssw] + ); + } + } + + with link = "line.de.1133" { + track(:private :removed, sb[:slu.w51 + 0.5ssw, :bre - 1ssw]); + } + + with link = "point.de.Lübeck-Schlutup-Breitling" { + track(:private:station :removed, sb[:bre - 1ssw, :f]); + } +} diff --git a/rules/tmp-de/a/d3/11/1137.map b/rules/tmp-de/a/d3/11/1137.map new file mode 100644 index 00000000..9bd0c580 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1137.map @@ -0,0 +1,20 @@ +# DE 1137. Brandenbaum - Lübeck Konstinbahnhof +# +let bk = path("d4.de.1137"); + +with detail = 3 { + # point.de.Brandenbaum de.1131 + + with link = "line.de.1137" { + track(:second, + bk[:bra.yk - 0.1dl, :bra.yk] + .. bk[:aa, :kon - 1ssw] + ); + } + + with link = "point.de.Lübeck-Konstinbahnhof" { + track(:second:station, bk[:kon - 1ssw, :kon + 1ssw]); + marker(:de.gbf :left, bk[:kon]); + } +} + diff --git a/rules/tmp-de/a/d3/11/1141.map b/rules/tmp-de/a/d3/11/1141.map new file mode 100644 index 00000000..f1f5e10b --- /dev/null +++ b/rules/tmp-de/a/d3/11/1141.map @@ -0,0 +1,175 @@ +# DE 1141. Schwarzenbek - Bad Oldesloe +# +let so = path("d4.de.1141"); + +with detail = 3 { + with link = "line.de.1141" { + with layer = -1 track(:second :removed, + so[:swa.x, :swa.x + 0.1dl] >> 0.5dt + .. so[:swa.gg, :hav - 1ssw] + ); + } + + with link = "point.de.Havekost" { + track(:second:station :removed, so[:hav - 1ssw, :hav + 1ssw]); + marker(:de.hp :removed :left, so[:hav]); + slabel(:right :removed, so[:hav - 0.5ssw] >> 1dt, "Havekost"); + } + + with link = "line.de.1141" { + track(:second :removed, so[:hav + 1ssw, :moh - 1ssw]); + } + + with link = "point.de.Möhnsen" { + track(:second:station :removed, so[:moh - 1ssw, :moh + 1ssw]); + marker(:de.hst :removed :right, so[:moh]); + with layer = -1 marker(:de.bf :gone :right, so[:moh]); + slabel(:right :removed, so[:moh - 0.7ssw] >> 1.4ssw, + "Möhnsen" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:moh + 1ssw, :dah - 1ssw]); + with layer = 1 line_badge(:removed, so[:moh + 1.9km], "1141"); + } + + with link = "point.de.Dahmker" { + track(:second:station :removed, so[:dah - 1ssw, :dah + 1ssw]); + marker(:de.hp :removed :left, so[:dah]); + slabel(:left :removed, so[:dah - 0.3ssw] << 1.8ssw, "Dahmker"); + } + + with link = "line.de.1141" { + track(:second :removed, so[:dah + 1ssw, :ham - 1ssw]); + } + + with link = "point.de.Hamfelde" { + track(:second:station :removed, so[:ham - 1ssw, :ham + 1ssw]); + marker(:de.hp :removed :left, so[:ham]); + slabel(:left :removed, so[:ham - 0.3ssw] << 1.8ssw, "Hamfelde"); + } + + with link = "line.de.1141" { + track(:second :removed, so[:ham + 1ssw, :vor - 1ssw]); + } + + with link = "point.de.Vorburg-Trittau" { + track(:second:station :removed, so[:vor - 1ssw, :vor + 1ssw]); + marker(:de.hp :removed :left, so[:vor]); + slabel(:right :removed, so[:vor - 0.3ssw] >> 0.5dt, + "Vorburg-Trittau" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:vor + 1ssw, :tri - 1ssw]); + } + + with link = "point.de.Trittau" { + track(:second:station :removed, so[:tri - 1ssw, :tri + 1ssw]); + marker(:de.bf :removed :left, so[:tri]); + slabel(:right :removed, so[:tri - 0.5ssw] >> 0.8dt, + span(:bold, "Trittau") + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:tri + 1ssw, :gro - 1ssw]); + } + + with link = "point.de.Grönwohld" { + track(:second:station :removed, so[:gro - 1ssw, :gro + 1ssw]); + marker(:de.hp :removed :left, so[:gro]); + slabel(:right :removed, so[:gro - 0.5ssw] >> 1dt, + "Gröhnwohld" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:gro + 1ssw, :dwe - 1ssw]); + } + + with link = "point.de.Dwerkathen" { + track(:second:station :removed, so[:dwe - 1ssw, :dwe + 1ssw]); + marker(:de.hst :removed :right, so[:dwe]); + with layer = -1 marker(:de.bf :gone :right, so[:dwe]); + slabel(:right :removed, so[:dwe - 0.6ssw] >> 1.4ssw, + "Dwerkathen" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:dwe + 1ssw, :spr - 1ssw]); + } + + with link = "point.de.Sprenge" { + track(:second:station :removed, so[:spr - 1ssw, :spr + 1ssw]); + marker(:de.hp :removed :left, so[:spr]); + slabel(:right :removed, so[:spr - 0.3sw] >> 1.3dt, + "Sprenge" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:spr + 1ssw, :mol - 1ssw]); + } + + with link = "point.de.Mollhagen" { + track(:second:station :removed, so[:mol - 1ssw, :mol + 1ssw]); + marker(:de.bf :removed :left, so[:mol]); + slabel(:left :removed, so[:mol - 0.3ssw] << 1.8ssw, + "Mollhagen" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:mol + 1ssw, :bar - 1ssw]); + with layer = 1 line_badge(:removed, so[:mol + 1.9km], "1141"); + } + + with link = "point.de.Barkhorst" { + track(:second:station :removed, so[:bar - 1ssw, :bar + 1ssw]); + marker(:de.hst :removed :left, so[:bar]); + with layer = -1 marker(:de.bf :gone :left, so[:bar]); + slabel(:right :removed, so[:bar - 0.6ssw] >> 0.8dt, + "Barkhorst" + ); + } + + with link = "line.de.1141" { + track(:second :removed, so[:bar + 1ssw, :roh - 1ssw]); + } + + with link = "point.de.Rohlfshagen" { + track(:second:station :removed, so[:roh - 1ssw, :roh + 1ssw]); + marker(:de.hst :removed :left, so[:roh]); + with layer = -1 marker(:de.bf :gone :left, so[:roh]); + slabel(:right :removed, so[:roh - 0.6ssw] >> 0.8dt, + "Rohlfshagen" + ); + } + + with link = "line.de.1141" { + with layer = 2 track(:second :removed, + so[:roh + 1ssw, :rup - 1ssw] + ); + with layer = 1 casing(:second, so[:rup.x - 2dt, :rup.x + 2dt]); + } + + with link = "point.de.Rümpel", layer = 2 { + track(:second:station :removed, so[:rup - 1ssw, :rup + 1ssw]); + marker(:de.hp :removed :left, so[:rup]); + slabel(:left :removed, so[:rup - 0.5ssw] + (-1.4ssw, 0.6ssw), + "Rümpel" + ); + } + + with link = "line.de.1141" { + with layer = -1 track(:second:station :removed, + so[:rup + 1ssw, :rup + 1.1ssw] + .. so[:old.ys, :old.ys + 0.1dt] << 0.5dt + ); + } +} + diff --git a/rules/tmp-de/a/d3/11/1150.map b/rules/tmp-de/a/d3/11/1150.map new file mode 100644 index 00000000..4a38ae46 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1150.map @@ -0,0 +1,106 @@ +# DE 1150. Lüneburg - Büchen +# +let lb = path("d4.de.1150"); + +with detail = 3 { + # point.de.Lüneburg de.1720 + + with link = "line.de.1150" { + track(:first :pax, lb[:lun.kk, :jag - 1ssw]); + } + + with link = "point.de.Jäger" { + track(:first:station :pax, lb[:jag - 1ssw, :jag + 1ssw]); + with layer = -4 marker(:de.anst :removed :left, lb[:jag]); + with layer = -5 marker(:de.hp :gone:left, lb[:jag]); + slabel(:left :removed, lb[:jag + 0.7ssw] << 1.2ssw, "Jäger"); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:jag + 1ssw, :ade - 1ssw]); + } + + with link = "point.de.Adendorf" { + track(:first:station :pax, lb[:ade - 1ssw, :ade + 1ssw]); + with layer = -2 marker(:de.bbf :left, lb[:ade]); + with layer = -4 marker(:de.bf :removed :left, lb[:ade]); + slabel(:left, lb[:ade - 0.6ssw] << 1.4ssw, "Adendorf"); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:ade + 1ssw, :ech - 1ssw]); + with layer = 1 line_badge(:pax, lb[:ade + 4.0km], "1150"); + } + + with link = "point.de.Echem" { + track(:first:station :pax, lb[:ech - 1ssw, :ech + 1ssw]); + marker(:de.hp :pax :left, lb[:ech]); + with layer = -4 marker(:de.bf :removed :left, lb[:ech]); + slabel(:left :pax, lb[:ech - 0.8ssw] << 1.5ssw, + span(:bold, "Echem") + ); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:ech + 1ssw, :hoh - 1ssw]); + } + + with link = "point.de.Hohnstorf" { + track(:first:station :pax, lb[:hoh - 1ssw, :hoh + 1ssw]); + with layer = -4 marker(:de.hp :removed :left, lb[:hoh]); + slabel(:left :removed, lb[:hoh - 1ssw] << 1.0ssw, + "Hohnstorf" + ); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:hoh + 1ssw, :lau - 1ssw]); + } + + with link = "point.de.Lauenburg-Elbe" { + track(:first:station :pax, lb[:lau - 1ssw, :lau + 1ssw]); + marker(:de.bf :pax :left, lb[:lau]); + slabel(:left :pax, lb[:lau + 1ssw] << 1.5ssw, + hbox(:center:base, + span(:regular, "Lauenburg "), + span(:light, "(Elbe)") + ) + ); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:lau + 1ssw, :dan - 0.5ssw]); + } + + with link = "point.de.Dalldorf-Kreuz" { + with layer = -1 marker(:de.bk :removed :left, lb[:dak]); + } + + with link = "point.de.Dalldorf" { + track(:first:station :pax, lb[:dan - 1ssw, :dal + 1ssw]); + marker(:de.bbf :right, lb[:dan]); + with layer = -4 marker(:de.bf :removed :right, lb[:dal]); + slabel(:left, lb[:dan] << 1.2dt, "Dalldorf"); + } + + with link = "line.de.1150" { + track(:first :pax, lb[:dal + 1ssw, :wit - 1ssw]); + } + + with link = "point.de.Witzeeze" { + track(:first:station :pax, lb[:wit - 1ssw, :wit + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, lb[:wit]); + slabel(:left :removed, lb[:wit - 0.6ssw] << 1dt, "Witzeeze"); + } + + with link = "line.de.1150" { + track(:first :pax, + lb[:wit + 1ssw, :buc.b - 500m] + .. path("d4.de.a.6100")[:buc - 0.51ssw, :buc - 0.5ssw] + << 0.5dt << 1ssw + ); + } + + # point.de.Büchen de.6100 +} + diff --git a/rules/tmp-de/a/d3/11/1151.map b/rules/tmp-de/a/d3/11/1151.map new file mode 100644 index 00000000..2a2752d5 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1151.map @@ -0,0 +1,321 @@ +# DE 1151. Wittenberge - Buchholz (Nordh) +# +let wb = path("d4.de.a.1151"); + +with detail = 3 { + with link = "line.de.1151" { + track(:first :removed, wb[:dog + 0.5ssw, :dan - 1ssw]); + } + + with link = "point.de.Quickborn-Dannenberg" { + track(:first:station :removed, wb[:qui - 0.5ssw, :qui + 0.5ssw]); + marker(:de.bk :removed :left, wb[:qui]); + } + + with link = "point.de.Dannenberg-Ost" { + track(:first:station :pax, wb[:dan - 1ssw, :dan.yl]); + marker(:de.bf :pax :left, wb[:dan]); + slabel(:right :pax, wb[:dan + 1ssw] << 2.8ssw, + span(:bold, "Dannenberg Ost") + ); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:dan.yl, :pis - 1ssw]); + } + + with link = "point.de.Pisselberg" { + track(:second:station :pax, wb[:pis - 1ssw, :pis + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, wb[:pis]); + slabel(:left :removed, wb[:pis - 0.5ssw] << 2.4ssw, + "Pisselberg" + ); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:pis + 1ssw, :hit - 1ssw]); + } + + with link = "point.de.Hitzacker" { + track(:second:station :pax, wb[:hit - 1ssw, :hit + 1ssw]); + marker(:de.hp :pax :right, wb[:hit]); + marker(:de.bk :pax :right, wb[:hit]); + with layer = -1 marker(:de.bf :removed, wb[:hit]); + slabel(:right :pax, wb[:hit - 0.6ssw] >> 1.6ssw, "Hitzacker"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:hit + 1ssw, :har - 1ssw]); + } + + with link = "point.de.Sarchern" { + track(:second:station, wb[:sar - 0.5ssw, :sar + 0.5ssw]); + with layer = -1 marker(:de.bk :removed, wb[:sar]); + } + + with link = "point.de.Harlingen" { + track(:second:station :pax, wb[:har - 1ssw, :har + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, wb[:har]); + slabel(:bottom :removed, wb[:har] << 1.2ssw, "Harlingen"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:har + 1ssw, :lei - 1ssw]); + } + + with link = "point.de.Leitstade" { + track(:second:station :pax, wb[:lei - 1ssw, :lei + 1ssw]); + marker(:de.hp :pax :right, wb[:lei]); + with layer = -1 marker(:de.bf :removed :right, wb[:lei]); + slabel(:top :pax, wb[:lei - 0.1ssw] >> 1.8ssw, "Leitstade"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:lei + 1ssw, :goh - 1ssw]); + } + + with link = "point.de.Göhrde" { + track(:second:station :pax, wb[:goh - 1ssw, :goh + 1ssw]); + marker(:de.hp :pax :left, wb[:goh]); + with layer = -1 marker(:de.bf :removed :left, wb[:goh]); + slabel(:bottom :pax, wb[:goh] << 1.6ssw, "Göhrde"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:goh + 1ssw, :old - 1ssw]); + } + + with link = "point.de.Oldendorf" { + track(:second:station :pax, wb[:old - 1ssw, :old + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, wb[:old]); + slabel(:top :pax :removed, wb[:old] >> 1.2ssw, "Oldendorf"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:old + 1ssw, :nee - 1ssw]); + } + + with link = "point.de.Süschendorf" { + track(:second:station, wb[:suc - 0.5ssw, :suc + 0.5ssw]); + with layer = -1 marker(:de.bk :removed :left, wb[:suc]); + } + + with link = "point.de.Neetzendorf" { + track(:second:station :pax, wb[:nee - 1ssw, :nee + 1ssw]); + marker(:de.hp :pax :left, wb[:nee]); + slabel(:left :pax, wb[:nee - 1ssw] << 1.1ssw, + hbox(:right:top, "Neetzendorf") + ); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:nee + 1ssw, :dah - 1ssw]); + with layer = 1 line_badge(:open :pax, wb[:nee + 1.6km], "1151"); + } + + with link = "point.de.Dahlenburg" { + track(:second:station :pax, wb[:dah - 1ssw, :dah + 1ssw]); + marker(:de.bf :pax :right, wb[:dah]); + slabel(:left :pax, wb[:dah - 1ssw] << 6pt, + span(:bold, "Dahlenburg") + ); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:dah + 1ssw, :dum - 1ssw]); + } + + with link = "point.de.Dumstorf" { + track(:second:station :pax, wb[:dum - 1ssw, :dum + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, wb[:dum]); + slabel(:left :removed, wb[:dum - 0.4ssw] << 2.4ssw, + "Dumstorf" + ); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:dum + 1ssw, :bav - 1ssw]); + } + + with link = "point.de.Bavendorf" { + track(:second:station :pax, wb[:bav - 1ssw, :bav + 1ssw]); + marker(:de.hp :pax :left, wb[:bav]); + with layer = -1 marker(:de.bf :removed :left, wb[:bav]); + slabel(:bottom :pax, wb[:bav] << 1.0ssw, "Bavendorf"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:bav + 1ssw, :roh - 1ssw]); + } + + with link = "point.de.Rohstorf" { + track(:second:station :pax, wb[:roh - 1ssw, :roh + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, wb[:roh]); + slabel(:left :removed, wb[:roh - 1.5ssw] << 2.6ssw, "Rohstorf"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:roh + 1ssw, :vas - 1ssw]); + } + + with link = "point.de.Vastorf" { + track(:second:station :pax, wb[:vas - 1ssw, :vas + 1ssw]); + marker(:de.hp :pax :left, wb[:vas]); + with layer = -1 marker(:de.bf :removed :left, wb[:vas]); + slabel(:left :pax, wb[:vas - 1.5ssw] << 2.4ssw, "Vastorf"); + } + + with link = "line.de.1151" { + track(:second :pax, wb[:vas + 1ssw, :wen - 1ssw]); + } + + with link = "point.de.Wendisch-Evern" { + track(:second:station :pax, wb[:wen - 1ssw, :wen + 1ssw]); + marker(:de.hp :pax :right, wb[:wen]); + with layer = -1 marker(:de.bf :removed :right, wb[:wen]); + slabel(:right :pax, wb[:wen + 1.5ssw] >> 1.2ssw, + "Wendisch Evern" + ); + } + + with link = "line.de.1151" { + with layer = 2 track(:second :pax, + wb[:wen + 1ssw, :wen + 800m] + .. wb[:lun.r - 0.1dl, :lun.r] << 0.5dt << 1.25ssw + ); + with layer = 1 casing(:second :pax, + wb[:wen + 1ssw, :wen + 800m] + .. wb[:lun.r - 0.1dl, :lun.r] << 0.5dt << 1.25ssw + ); + } + + # point.de.Lüneburg de.1720 + + with link = "line.de.1151" { + with layer = -1 track(:second:removed, + wb[:lkn + 1ssw, :ste - 1ssw] << 1.5dt + ); + } + + with link = "point.de.Sternkamp" { + track(:second:station :removed, + wb[:ste - 1ssw, :ste + 1ssw] << 1.5dt + ); + marker(:de.hp :removed :left, wb[:ste] << 1.5dt); + slabel(:left :removed, wb[:ste - 0.5ssw] << 1.5dt << 2.6ssw, + "Sternkamp" + ); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:ste + 1ssw, :och - 1ssw] << 1.5dt); + } + + with link = "point.de.Ochtmissen" { + track(:second:station :removed, + wb[:och - 1ssw, :och + 1ssw] << 1.5dt); + marker(:de.hp :removed :left, wb[:och] << 1.5dt); + slabel(:left :removed, wb[:och - 0.5ssw] << 1.5dt << 2.2ssw, + "Ochtmissen" + ); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:och + 1ssw, :vog - 1ssw] << 1.5dt); + } + + with link = "point.de.Vögelsen" { + track(:second:station :removed, + wb[:vog - 1ssw, :vog + 1ssw] << 1.5dt + ); + marker(:de.hp :removed :left, wb[:vog] << 1.5dt); + slabel(:left :removed, wb[:vog - 0.5ssw] << 1.5dt << 2.2ssw, + "Vögelsen" + ); + } + + with link = "line.de.1151" { + track(:second :removed, + wb[:vog + 1ssw, :vog + 1.1ssw] << 1.5dt + .. wb[:mec - 1.1ssw, :mec - 1ssw] + ); + } + + with link = "point.de.Mechtersen" { + track(:second:station :removed, wb[:mec - 1ssw, :mec + 1ssw]); + marker(:de.bf :removed :left, wb[:mec]); + with layer = -1 slabel(:left :removed, wb[:mec - 1ssw] << 2.4ssw, + "Mechtersen" + ); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:mec + 1ssw, :bah - 1ssw]); + with layer = 1 line_badge(:removed, wb[:mec + 4.2km], "1151"); + } + + with link = "point.de.Bahlburg" { + track(:second:station :removed, wb[:bah - 1ssw, :bah + 1ssw]); + marker(:de.hp :removed :left, wb[:bah]); + slabel(:right :removed, wb[:bah] >> 0.7dt, "Bahlburg"); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:bah + 1ssw, :wul - 1ssw]); + } + + with link = "point.de.Wulfsen-Lüneburg" { + track(:second:station :removed, wb[:wul - 1ssw, :wul + 1ssw]); + marker(:de.bf :removed :left, wb[:wul]); + label(wb[:wul + 0.5ssw] >> 1.5dt, + vbox(:right:bottom :small :removed, + span(:bold, "Wulfsen"), + span(:regular, "(b L.b.)") + ) + ); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:wul + 1ssw, :tan - 1ssw]); + } + + with link = "point.de.Tangendorf" { + track(:second:station :removed, wb[:tan - 1ssw, :tan + 1ssw]); + marker(:de.hp :removed :left, wb[:tan]); + with layer = -1 marker(:de.bf :gone :left, wb[:tan]); + slabel(:bottom :removed, wb[:tan] << 1.2ssw, "Tangendorf"); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:tan + 1ssw, :bra - 1ssw]); + } + + with link = "point.de.Brackel-Lüneburg" { + track(:second:station :removed, wb[:bra - 1ssw, :bra + 1ssw]); + marker(:de.hst :removed :left, wb[:bra]); + with layer = -1 marker(:de.bf :gone :left, wb[:bra]); + slabel(:left :removed, wb[:bra - 1ssw] << 1.2ssw, + vbox(:right:top, + span(:regular, "Brackel"), + span(:light, "(b Lüneburg)") + ) + ); + } + + with link = "line.de.1151" { + track(:second :removed, wb[:bra + 1ssw, :mar - 1ssw]); + } + + with link = "point.de.Marxen" { + track(:second:station :removed, wb[:mar - 1ssw, :mar + 1ssw]); + marker(:de.bf :removed :left, wb[:mar]); + slabel(:right :removed, wb[:mar - 0.5ssw] >> 1dt, "Marxen"); + } + + with link = "line.de.1151" { + with layer = -1 track(:second:station :removed, + wb[:mar + 1ssw, :mar + 1.1ssw] + .. wb[:jes.yl - 0.1dl, :jes.yl] << 0.5dt + ); + } +} diff --git a/rules/tmp-de/a/d3/11/1153.map b/rules/tmp-de/a/d3/11/1153.map new file mode 100644 index 00000000..fcb4d356 --- /dev/null +++ b/rules/tmp-de/a/d3/11/1153.map @@ -0,0 +1,60 @@ +# DE 1153. Lüneburg - Stelle +# +let lc = path("d4.de.a.1720"); + +with detail = 3 { + # point.de.Lüneburg-Nordkopf de.1720 + + with link = "line.de.1153" { + track(:first :cat:ac15 :pax, lc[:lun.f, :bah - 1ssw] << 1.5dt); + } + + with link = "point.de.Bardowick-Hp" { + track(:first:station :cat:ac15 :pax, + lc[:bah - 1ssw, :bah + 1ssw] << 1.5dt + ); + marker(:de.hp :cat:ac15 :pax :left, lc[:bah] << 1.5dt); + } + + with link = "line.de.1153" { + track(:first :cat:ac15 :pax, lc[:bah + 1ssw, :rad - 1ssw] << 1.5dt); + } + + # point.de.Radbruch de.1720 + + with link = "line.de.1153" { + track(:first :cat:ac15 :pax, lc[:rad + 1ssw, :win - 1ssw] << 1.5dt); + } + + # point.de.Winsen-Luhe de.1720 + + with link = "line.de.1153" { + track(:first :cat:ac15 :pax, lc[:win + 1ssw, :ash - 1ssw] << 1.5dt); + } + + with link = "point.de.Ashausen" { + track(:first:station :double :cat:ac15 :pax, + lc[:ash - 1ssw, :ash + 1ssw] + ); + track(:first:station :cat:ac15 :pax, + lc[:ash - 1ssw, :ash + 1ssw] << 1.5dt + ); + with layer = -1 track(:first:station :cat:ac15, + lc[:ash - 1.1dl, :ash - 1dl] >> 0.5dt + -- lc[:ash, :ash + 1ssw] >> 1.5dt + ); + with layer = -1 marker(:de.abzw :cat:ac15 :right, lc[:ash] >> 1.5dt); + marker(:de.hp :cat:ac15 :pax :left, lc[:ash] << 1.5dt); + with layer = -1 marker(:de.bf :removed :left, lc[:ash] << 1.5dt); + slabel(:left :cat:ac15 :pax, lc[:ash - 1ssw] << 1.5dt << 2.3ssw, + "Ashausen" + ); + } + + with link = "line.de.1153" { + track(:first :cat:ac15 :pax, lc[:ash + 1ssw, :ste - 1ssw] << 1.5dt); + } + + # point.de.Stelle de.1720 +} + diff --git a/rules/tmp-de/a/d3/12/1200.map b/rules/tmp-de/a/d3/12/1200.map new file mode 100644 index 00000000..ad88a901 --- /dev/null +++ b/rules/tmp-de/a/d3/12/1200.map @@ -0,0 +1,112 @@ +# DE 1200. Niebüll (ausschl.) - Westerland (Sylt) +# +let nw = path("d4.de.1200"); + +with detail = 3 { + # point.de.Niebüll de.1210 + + with link = "line.de.1200" { + track(:first :pax, + nw[:nie + 1ssw, :nie + 1.1ssw] << 0.5dt + .. nw[:nie.ff, :leh - 1ssw] + ); + } + + with link = "point.de.Lehnshallig" { + track(:first:station :pax, nw[:leh - 1ssw, :leh + 1ssw]); + with layer = -1 marker(:de.bbf :right, nw[:leh]); + slabel(:right, nw[:leh + 1ssw] >> 1.4ssw, + "Lehnshallig" + ); + } + + with link = "line.de.1200" { + track(:first :pax, nw[:leh + 1ssw, :emm - 1ssw]); + } + + with link = "point.de.Emmelsbüll" { + track(:first:station :pax, nw[:emm - 1ssw, :emm + 1ssw]); + with layer = -1 marker(:de.hst :removed :right, nw[:emm]); + with layer = -2 marker(:de.bf :gone :right, nw[:emm]); + slabel(:right :removed, nw[:emm - 0.6ssw] >> 1.3ssw, + "Emmelsbüll" + ); + } + + with link = "line.de.1200" { + track(:first :pax, nw[:emm + 1ssw, :kla - 1ssw]); + } + + with link = "point.de.Klanxbüll" { + track(:first:station :pax, nw[:kla - 1ssw, :kla + 1ssw]); + track(:first:station :pax, + nw[:kla - 0.5ssw - 1.1dl, :kla - 0.5ssw - 1.0dl] + -- nw[:kla - 0.5ssw, :kla + 1ssw] << 1dt + ); + + marker(:de.bf :pax :right, nw[:kla]); + slabel(:right :pax, nw[:kla - 0.6ssw] >> 1.3ssw, "Klanxbüll"); + } + + with link = "line.de.1200" { + track(:first:double :pax, nw[:kla + 1ssw, :mor - 1ssw] << 0.5dt); + with layer = 1 line_badge(:pax, nw[:hin - 2.0km] << 0.5dt, "1200"); + line_badge(:pax, nw[:hin - 2.0km] << 0.5dt << 6pt, "(VzG: 1210)"); + } + + with link = "point.de.Hindenburgdamm" { + with layer = -1 marker(:de.bk :removed :right, nw[:hin]); + } + + with link = "point.de.Morsum-Sylt" { + track(:first:station :pax, nw[:mor - 1ssw, :mor + 1ssw]); + track(:first:station :pax, + nw[:mor - 1ssw, :mor + 0.5ssw] << 1dt + .. nw[:mor + 0.5sw + 1dl, :mor + 0.5sw + 1.1dl] + ); + + marker(:de.bf :pax :left, nw[:mor] << 1dt); + slabel(:bottom :pax, nw[:mor] << 1dt << 1.2ssw, + hbox(:center:top, hbox(:center:base, + span(:regular, "Morsum "), + span(:light, "(Sylt)") + )) + ); + } + + with link = "line.de.1200" { + track(:first :pax, nw[:mor + 1ssw, :kei - 1ssw]); + } + + with link = "point.de.Keitum" { + track(:first:station :pax, nw[:kei - 1ssw, :kei + 1ssw]); + marker(:de.bf :pax :right, nw[:kei]); + slabel(:right :pax, nw[:kei + 1ssw] >> 1.2ssw, "Keitum"); + } + + with link = "line.de.1200" { + track(:first :pax, nw[:kei + 1ssw, :tin - 1ssw]); + } + + with link = "point.de.Tinnum" { + track(:first:station :pax, nw[:tin - 1ssw, :tin + 1ssw]); + with layer = -1 marker(:de.hp :removed, nw[:tin]); + slabel(:right :removed, nw[:tin + 1ssw] >> 1.2ssw, "Tinnum"); + } + + with link = "line.de.1200" { + track(:first :pax, nw[:tin + 1ssw, :wes - 0.5ssw]); + } + + with link = "point.de.Westerland-Sylt" { + track(:first :pax :station :open, nw[:wes - 0.5sw, :wes]); + marker(:de.bf :pax :top, nw[:wes]); + slabel(:left :pax, nw[:wes] - (2ssw, 0ssw), + hbox(:center:base, + span(:bold, "Westerland "), + span(:regular, "(Sylt)") + ) + ); + } +} + diff --git a/rules/tmp-de/a/d3/12/1201.map b/rules/tmp-de/a/d3/12/1201.map new file mode 100644 index 00000000..9236aa92 --- /dev/null +++ b/rules/tmp-de/a/d3/12/1201.map @@ -0,0 +1,80 @@ +# DE 1201. Niebüll - Süderlügum Grenze +# +let ns = path("d4.de.1201"); + +with detail = 3 { + with link = "line.de.1201" { + track(:second :pax, + ns[:nie + 1ssw, :nie + 1.1ssw] << 0.5dt + .. ns[:nie.gg + 500m, :uph - 1ssw] << 0.5dt + ); + track(:second:station :removed, + ns[:nie + 1ssw, :nie + 1.1ssw] >> 0.5dt + .. ns[:nie.gg + 500m, :uph - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Uphusum" { + track(:second:station :pax, ns[:uph - 1ssw, :uph + 1ssw] << 0.5dt); + with layer = -1 track(:second:station :removed, + ns[:uph - 1ssw, :uph + 1ssw] >> 0.5dt + ); + marker(:de.hp :pax :right, ns[:uph] >> 0.5dt); + with layer = -1 marker(:de.bf :removed :right, ns[:uph] >> 0.5dt); + slabel(:right :pax, ns[:uph - 0.5ssw] >> 0.5dt >> 2.0ssw, "Uphusum"); + } + + with link = "line.de.1201" { + track(:second :pax, ns[:uph + 1ssw, :sua - 1ssw] << 0.5dt); + track(:second:station :removed, ns[:uph + 1ssw, :sua - 1ssw] >> 0.5dt); + with layer = 1 line_badge(:pax, ns[:uph + 1.8km], "1201"); + } + + with link = "point.de.Süderlügum-Awanst" { + track(:second:station :pax, ns[:sua - 1ssw, :sua + 0.5ssw] << 0.5dt); + track(:second:station :removed, + ns[:sua - 1ssw, :sua + 0.5ssw] >> 0.5dt + ); + marker(:de.awanst :left, ns[:sua] << 0.5dt); + } + + with link = "point.de.Süderlügum" { + track(:second:station :pax, ns[:sua + 0.5ssw, :sua + 2.2ssw] << 0.5dt); + track(:second:station :removed, + ns[:sua + 0.5ssw, :sua + 2.2ssw] >> 0.5dt + ); + + with layer = -4 marker( + :de.bf :removed :right, ns[:sua + 0.7ssw] >> 0.5dt + ); + marker(:de.hp :pax :left, ns[:sua + 1.2ssw] << 0.5dt); + slabel(:left :pax, ns[:sua + 0.4ssw] << 0.5dt << 1.6ssw, "Süderlügum"); + } + + with link = "line.de.1201" { + track(:second :pax, ns[:sua + 2.2ssw, :sug - 0.5ssw] << 0.5dt); + track(:second:station :removed, + ns[:sua + 2.2ssw, :sug - 0.5ssw] >> 0.5dt + ); + } + + with link = "point.int.Süderlügum-Tønder" { + track(:second:station :pax, ns[:sug - 0.5ssw, :sug + 0.5ssw] << 0.5dt); + with layer = -1 track(:second:station :removed, + ns[:sug - 0.5ssw, :sug + 0.5ssw] >> 0.5dt + ); + + marker(:de.dirgr :right, ns[:sug] >> 0.5dt); + marker(:statdt :right, ns[:sug] << 0.5dt); + marker(:de.dirgr :left, ns[:sug] << 0.5dt); + + label(ns[:sug] << 5dt, + vbox(:right:middle, + span(:small, "DK"), + hbar(0.3), + span(:small, "DE") + ) + ); + } +} + diff --git a/rules/tmp-de/a/d3/12/1204.map b/rules/tmp-de/a/d3/12/1204.map new file mode 100644 index 00000000..12bd8cef --- /dev/null +++ b/rules/tmp-de/a/d3/12/1204.map @@ -0,0 +1,77 @@ +# DE 1204. Abzw Hörn - Tönning +# +let ht = path("d4.de.1204"); + +with detail = 3 { + with link = "line.de.1204" { + track(:second :pax, + path("d4.de.1210")[:hor - 0.49sw, :hor - 0.5sw] >> 0.5dt + .. ht[:pla - 0.51ssw, :pla - 0.5ssw] + ); + } + + with link = "point.de.Platenhörn" { + track(:second:station :pax, ht[:pla - 0.5ssw, :pla + 0.5ssw]); + with layer = -1 marker(:de.hp :removed :left, ht[:pla]); + slabel(:left :removed, + path("d4.de.a15")[:pla + 0.4ssw] >> 1.5dt, + "Platenhörn" + ); + } + + with link = "line.de.1204" { + track(:second :pax, ht[:pla + 0.5ssw, :but - 1ssw]); + } + + with link = "point.de.Büttel" { + track(:second:station :pax, ht[:but - 1ssw, :but + 1ssw]); + with layer = -1 marker(:de.hst :removed :left, ht[:but]); + with layer = -2 marker(:de.bf :gone :left, ht[:but]); + slabel(:left :removed, ht[:but + 0.4ssw] >> 1.0dt, "Büttel"); + } + + with link = "line.de.1204" { + track(:second :pax, ht[:but + 1ssw, :wit - 1ssw]); + } + + with link = "point.de.Witzwort" { + track(:second:station :pax, ht[:wit - 1ssw, :wit + 1ssw]); + marker(:de.hp :pax :left, ht[:wit]); + slabel(:left :pax, ht[:wit + 0.4ssw] >> 1.0dt, "Witzwort"); + } + + with link = "line.de.1204" { + track(:second :pax, ht[:wit + 1ssw, :har - 1ssw]); + with layer = 1 line_badge(:open :pax, ht[:wit + 1.8km], "1204"); + } + + with link = "point.de.Harblek" { + track(:second:station :pax, ht[:har - 1ssw, :har + 1ssw]); + marker(:de.hp :pax :right, ht[:har]); + with layer = -1 marker(:de.bf :removed :right, ht[:har]); + slabel(:left :pax, ht[:har + 0.4sw] >> 1.3ssw, "Harblek"); + } + + with link = "line.de.1204" { + track(:second :pax, ht[:har + 1ssw, :ton - 1ssw]); + } + + with link = "point.de.Tönning" { + track(:second:station :pax, ht[:ton - 1ssw, :ton + 1ssw]); + track(:second:station :pax, + path("d4.de.1205")[:ton + 1.5ssw, :ton + 1.49ssw] + .. ht[:ton - 0.5ssw, :ton - 0.49ssw] + ); + + marker(:de.bf :pax :left, ht[:ton]); + slabel(:left :pax, ht[:ton + 0.4ssw] >> 2.5dt, + span(:bold, "Tönning") + ); + } + + with link = "point.de.Tönning-Hafen" { + with layer = -1 track(:station :removed, ht[:ton + 1ssw, :f]); + } +} + + diff --git a/rules/tmp-de/a/d3/12/1205.map b/rules/tmp-de/a/d3/12/1205.map new file mode 100644 index 00000000..23809b17 --- /dev/null +++ b/rules/tmp-de/a/d3/12/1205.map @@ -0,0 +1,102 @@ +# DE 1205. Tönning - Bad St Peter-Ording +# +let tp = path("d4.de.1205"); + +with detail = 3 { + # point.de.Tönning de.1204 + + with link = "line.de.1205" { + track(:second :pax, tp[:ton + 1.5ssw, :kat - 1ssw]); + } + + with link = "point.de.Kating" { + track(:second:station :pax, tp[:kat - 1ssw, :kat + 1ssw]); + marker(:de.hp :pax :right, tp[:kat]); + slabel(:right :pax, tp[:kat + 1ssw] >> 1.5ssw, "Kating"); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:kat + 1ssw, :kah - 1ssw]); + } + + with link = "point.de.Katharinenheerd" { + track(:second:station :pax, tp[:kah - 1ssw, :kah + 1ssw]); + marker(:de.hp :pax :right, tp[:kah]); + with layer = -1 marker(:de.bf :removed :right, tp[:kah]); + slabel(:top :pax, tp[:kah] >> 1.3ssw, "Katharinenheerd"); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:kah + 1ssw, :gar - 1ssw]); + } + + with link = "point.de.Garding" { + track(:second:station :pax, tp[:gar - 1ssw, :gar + 1ssw]); + marker(:de.hp :pax :right, tp[:gar]); + with layer = -1 marker(:de.bf :removed :right, tp[:gar]); + slabel(:left :pax, tp[:gar - 1.5ssw] >> 1.5ssw, "Garding"); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:gar + 1ssw, :san - 1ssw]); + } + + with link = "point.de.Sandwehle" { + track(:second:station :pax, tp[:san - 1ssw, :san + 1ssw]); + marker(:de.hp :pax :right, tp[:san]); + slabel(:right :pax, tp[:san + 1.5ssw] << 0.5dt, + hbox(:left:top, "Sandwehle") + ); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:san + 1ssw, :hei - 1ssw]); + } + + with link = "point.de.Heisternest" { + track(:second:station :pax, tp[:hei - 1ssw, :hei + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, tp[:hei]); + slabel(:left :removed, tp[:hei - 1.5ssw] >> 1.2ssw, + vbox(:right:bottom, "Heister-", "nest") + ); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:hei + 1ssw, :tat - 1ssw]); + } + + with link = "point.de.Tating" { + track(:second:station :pax, tp[:tat - 1ssw, :tat + 1ssw]); + marker(:de.hp :pax :right, tp[:tat]); + with layer = -1 marker(:de.bf :removed :right, tp[:tat]); + slabel(:right :pax, tp[:tat + 1ssw] << 6pt, "Tating"); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:tat + 1ssw, :pes - 1ssw]); + with layer = 1 line_badge(:open :pax, tp[:tat + 2.0km], "1205"); + } + + with link = "point.de.Bad-St-Peter-Süd" { + track(:second:station :pax, tp[:pes - 1ssw, :pes + 1ssw]); + marker(:de.hp :pax :left, tp[:pes]); + with layer = -1 marker(:de.bf :removed :left, tp[:pes]); + slabel(:bottom :pax, tp[:pes] << 1.4ssw, + "Bad St Peter Süd" + ); + } + + with link = "line.de.1205" { + track(:second :pax, tp[:pes + 1ssw, :f - 1.6ssw]); + } + + with link = "point.de.Bad-St-Peter-Ording" { + track(:second:station :pax, tp[:f - 1.6ssw, :f]); + marker(:de.hp :pax :right, tp[:f - 0.6ssw]); + with layer = -1 marker(:de.bf :removed :right, tp[:f - 0.6ssw]); + slabel(:top :pax, tp[:f - 0.6sw] >> 1.8ssw, + span(:bold, "Bad St Peter-Ording") + ); + } +} + diff --git a/rules/tmp-de/a/d3/12/1206.map b/rules/tmp-de/a/d3/12/1206.map new file mode 100644 index 00000000..0efc76a5 --- /dev/null +++ b/rules/tmp-de/a/d3/12/1206.map @@ -0,0 +1,139 @@ +# DE 1206. Heide (Holst) - Büsum +# +let hb = path("d4.de.1206"); +let en = path("d4.de.1210"); + +with detail = 3 { + # point.de.Heide-Holst de.1210 + + with link = "line.de.1206" { + with layer = -2 track(:second :pax, + en[:hei + 1ssw, :weh.x - 800m] >> 1.5dt + .. en[:weh - 1.1ssw, :weh - 1ssw] << 1.5dt << 1ssw + ); + } + + with link = "point.de.Weddinghusen" { + track(:second:station :pax, + en[:weh - 1ssw, :weh + 0.5ssw] << 1.5dt << 1ssw + ); + with layer = -1 track(:second:station :removed, + en[:weh - 0.5ssw, :weh + 1ssw] << 1.5dt + ); + with layer = -1 marker(:de.bf :removed :left, en[:weh] << 1.5dt); + slabel(:right :removed, en[:weh - 0.6ssw] >> 1.0dt, + span(:bold, "Weddinghusen") + ); + } + + with link = "line.de.1206" { + track(:second :pax, + en[:weh + 0.5ssw, :weh + 0.51ssw] << 1.5dt << 1ssw + .. hb[:weh.ff + 1200m, :del - 1ssw] + ); + } + + with link = "point.de.Dellweg" { + track(:second:station :pax, hb[:del - 1ssw, :del + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, hb[:del]); + slabel(:top :removed, hb[:del] >> 1.4ssw, "Dellweg"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:del + 1ssw, :tie - 1ssw]); + } + + with link = "point.de.Tiebensee" { + track(:second:station :pax, hb[:tie - 1ssw, :tie + 1ssw]); + marker(:de.hp :pax :left, hb[:tie]); + with layer = -1 marker(:de.bf :removed :left, hb[:tie.bf]); + slabel(:right :pax, hb[:tie + 1.5ssw] << 2.6ssw, "Tiebensee"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:tie + 1ssw, :haf - 1ssw]); + } + + with link = "point.de.Haferwisch" { + track(:second:station :pax, hb[:haf - 1ssw, :haf + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, hb[:haf]); + with layer = -2 marker(:de.bf :gone :left, hb[:haf]); + slabel(:left :removed, hb[:haf - 1ssw] >> 1.0dt, "Haferwisch"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:haf + 1ssw, :jar - 1ssw]); + } + + with link = "point.de.Jarrenwisch" { + track(:second:station :pax, hb[:jar - 1ssw, :jar + 1ssw]); + marker(:de.hp :pax :left, hb[:jar]); + with layer = -1 marker(:de.bf :gone :left, hb[:jar]); + slabel(:right :pax, hb[:jar + 1.5ssw] << 2.4ssw, "Jarrenwisch"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:jar + 1ssw, :wes - 1ssw]); + } + + with link = "point.de.Wesselburen" { + track(:second:station :pax, hb[:wes - 1ssw, :wes + 1ssw]); + marker(:de.hp :pax :right, hb[:wes]); + with layer = -1 marker(:de.bf :removed :right, hb[:wes]); + slabel(:left :pax, hb[:wes - 1ssw] >> 1.4ssw, "Wesselburen"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:wes + 1ssw, :sde - 1ssw]); + } + + with link = "point.de.Süderdeich" { + track(:second:station :pax, hb[:sde - 1ssw, :sde + 1ssw]); + marker(:de.hp :pax :right, hb[:sde]); + with layer = -1 marker(:de.bf :gone :right, hb[:sde]); + slabel(:left :pax, hb[:sde + 0.3ssw] >> 1.4ssw, "Süderdeich"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:sde + 1ssw, :rei - 1ssw]); + } + + with link = "point.de.Reinsbüttel" { + track(:second:station :pax, hb[:rei - 1ssw, :rei + 1ssw]); + marker(:de.hp :pax :left, hb[:rei]); + with layer = -1 marker(:de.bf :removed :left, hb[:rei.bf]); + slabel(:right :pax, hb[:rei + 0.3ssw] << 2.0ssw, "Reinsbüttel"); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:rei + 1ssw, :oho - 1ssw]); + + guide(:linenum :pax, + hb[:rei + 1.2km] >> 0.5dt + -- hb[:rei + 1.2km] >> 3.0dt + ); + label(:linenum :pax, hb[:rei + 1.2km] >> 3.0dt, + hbox(:right:middle :badgesize, "1206 ") + ); + } + + with link = "point.de.Osterhof" { + track(:second:station :pax, hb[:oho - 1ssw, :oho + 1ssw]); + with layer = -1 marker(:de.hst :removed :left, hb[:oho]); + with layer = -2 marker(:de.bf :gone :left, hb[:oho]); + slabel(:right :removed, hb[:oho + 0.4ssw] << 1.6ssw, + "Osterhof" + ); + } + + with link = "line.de.1206" { + track(:second :pax, hb[:oho + 1ssw, :f - 1.6ssw]); + } + + with link = "point.de.Büsum" { + track(:second:station :pax, hb[:f - 1.6ssw, :f]); + marker(:de.bf :pax :right, hb[:f - 0.6ssw]); + slabel(:left :pax, hb[:f] >> 1.4ssw, span(:bold, "Büsum")); + } +} + diff --git a/rules/de/a/d3/12/1207.map b/rules/tmp-de/a/d3/12/1207.map similarity index 100% rename from rules/de/a/d3/12/1207.map rename to rules/tmp-de/a/d3/12/1207.map diff --git a/rules/de/a/d3/12/1210.map b/rules/tmp-de/a/d3/12/1210.map similarity index 96% rename from rules/de/a/d3/12/1210.map rename to rules/tmp-de/a/d3/12/1210.map index 8d61dd85..a3d5cceb 100644 --- a/rules/de/a/d3/12/1210.map +++ b/rules/tmp-de/a/d3/12/1210.map @@ -448,12 +448,19 @@ with detail = 3 { } with link = "line.de.1210" { - track(:first :double :pax, en[:hor + 0.5ssw, :hus - 1ssw]); + track(:first :double :pax, + en[:hor + 0.5ssw, :hus.aa] + .. en[:hus - 1.01sw, :hus - 1sw] + ); } with link = "point.de.Husum" { - track(:first:station :double :pax, en[:hus - 1ssw, :hus + 1ssw]); - marker(:de.bf :pax :right, en[:hus] >> 0.5dt); + track(:first:station :double :pax, en[:hus - 1sw, :hus + 1sw]); + track(:second:station :removed, + en[:hus - 1sw, :hus + 0.5sw] >> 1.5dt + -- en[:hus + 0.5sw + 1dl, :hus + 0.5sw + 1.1dl] >> 0.5dt + ); + marker(:de.bf :pax :right, en[:hus] >> 1.5dt); slabel(:left :pax, en[:hus] - (1100m, 0m), span(:bold, "Husum") ); @@ -520,7 +527,11 @@ with detail = 3 { en[:bre - 0.6ssw - 1.1dl, :bre - 0.6ssw - 1dl] >> 0.5dt -- en[:bre - 0.6ssw, :bre + 1ssw] << 0.5dt ); - track(:first :pax, en[:bre - 1ssw, :bre + 1ssw] >> 0.5dt); + track(:first:station :pax, en[:bre - 1ssw, :bre + 1ssw] >> 0.5dt); + track(:second:station :removed, + en[:bre.yl, :bre + 0.6sw] >> 1.5dt + -- en[:bre + 0.6sw + 1dl, :bre + 0.6sw + 1.1dl] >> 0.5dt + ); marker(:de.bf :pax :left, en[:bre] << 0.5dt); slabel(:left :pax, en[:bre - 0.35ssw] << 0.5dt << 2.0ssw, span(:bold, "Bredstedt") diff --git a/rules/de/a/d3/12/1214.map b/rules/tmp-de/a/d3/12/1214.map similarity index 100% rename from rules/de/a/d3/12/1214.map rename to rules/tmp-de/a/d3/12/1214.map diff --git a/rules/de/a/d3/12/1215.map b/rules/tmp-de/a/d3/12/1215.map similarity index 100% rename from rules/de/a/d3/12/1215.map rename to rules/tmp-de/a/d3/12/1215.map diff --git a/rules/de/a/d3/12/1216.map b/rules/tmp-de/a/d3/12/1216.map similarity index 100% rename from rules/de/a/d3/12/1216.map rename to rules/tmp-de/a/d3/12/1216.map diff --git a/rules/de/a/d3/12/1217.map b/rules/tmp-de/a/d3/12/1217.map similarity index 100% rename from rules/de/a/d3/12/1217.map rename to rules/tmp-de/a/d3/12/1217.map diff --git a/rules/de/a/d3/12/1218.map b/rules/tmp-de/a/d3/12/1218.map similarity index 100% rename from rules/de/a/d3/12/1218.map rename to rules/tmp-de/a/d3/12/1218.map diff --git a/rules/tmp-de/a/d3/12/1220.map b/rules/tmp-de/a/d3/12/1220.map new file mode 100644 index 00000000..c1afd033 --- /dev/null +++ b/rules/tmp-de/a/d3/12/1220.map @@ -0,0 +1,432 @@ +# DE 1220. Altona Palmaille - Kiel Altonaer Bf +# + +with detail = 3 { + let ak = path("d3.de.1220.hmb"); + + with link = "point.de.Hamburg-Altona" { + with layer = -2 track(:first:station :cat:ac15 :pax, + ak[:alt, :aham] >> 0.5dt + .. ak[:fham, :fham + 0.1dl] << 1.5dt + ); + + track(:first:station :double :cat:ac15 :pax, + ak[:alt, :aham] << 1dt + ); + + track(:first:station :cat:ac15 :pax, + ak[:alt, :aham] << 2.5dt + .. ak[:fham, :fham + 0.1dl] << 2.5dt + ); + + marker(:de.bf :cat:ac15 :pax :bottom, ak[:alt + 0.5ssw]); + marker(:de.bf :cat:ac15 :pax :bottom, ak[:alt + 0.5ssw] << 1dt); + marker(:de.bf :cat:ac15 :pax :bottom, ak[:alt + 0.5ssw] << 2dt); + } + + with link = "point.de.Hamburg-Altona-Gbf" { + track(:first:station :double :cat:ac15 :pax, + ak[:fham, :fham + 1ssw] + ); + track(:first:station :double :cat:ac15 :pax, + ak[:fham, :fham + 1ssw] << 2dt + ); + } + + with link = "line.de.1220" { + track(:first:station :cat:ac15 :pax :tight :flip, + ak[:fham + 1ssw, :alt.f] << 1.5dt + -- ak[:alt.f + 2dl, :ala - 1ssw] << 2.5dt + ); + + with layer = 2 track(:first:station :cat:ac15 :pax :tight, + ak[:fham + 1ssw, :alt.f] << 2.5dt + -- ak[:alt.f + 3dl, :ala - 1ssw] >> 0.5dt + ); + with layer = 1 casing(:first:station :cat:ac15 :pax :tight, + ak[:fham + 1ssw, :alt.f] << 2.5dt + -- ak[:alt.f + 3dl, :ala - 1ssw] >> 0.5dt + ); + } + + with link = "point.de.Hamburg-Langenfelde-Bbf" { + track(:first:station :cat:ac15 :pax, + ak[:ala - 1ssw, :ala + 1ssw] >> 0.5dt + ); + track(:first:station :cat:ac15 :pax, + ak[:ala - 1ssw, :ala + 1ssw] << 0.5dt + ); + track(:first:station :cat:ac15 :pax, + ak[:ala - 1ssw, :ala + 1ssw] << 1.5dt + ); + track(:first:station :cat:ac15 :pax, + ak[:ala - 1ssw, :ala + 1ssw] << 2.5dt + ); + with layer = -1 marker(:de.bbf :cat:ac15 :left, ak[:ala] << 2.5dt); + } + + with link = "line.de.1220" { + with layer = 2 track(:first:station :cat:ac15 :pax, + ak[:ala + 1ssw, :frot] >> 0.5dt + ); + with layer = 1 casing(:first:station :cat:ac15 :pax, + ak[:frot - 1ssw, :frot + 1ssw] >> 0.5dt + ); + track(:first:station :cat:ac15 :pax, + ak[:ala + 1ssw, :frot] << 2.5dt + ); + } + + with link = "point.de.Hamburg-Eidelstedt" { + with layer = 2 track(:first:station :cat:ac15 :pax, + ak[:frot, :eid + 6dl] >> 0.5dt + ); + + track(:first:station :cat:ac15 :pax, + ak[:frot, :eid + 2dl] << 0.5dt + -- ak[:eid + 3dl, :eid + 3.1dl] >> 0.5dt + ); + + track(:first:station :cat:ac15 :pax, + ak[:frot, :eid + 3dl] << 1.5dt + ); + + track(:first:station :cat:ac15 :pax, + ak[:frot, :eid + 2dl] << 2.5dt + -- ak[:eid + 4dl, :eid + 6dl] << 0.5dt + ); + + track(:first:station :cat:ac15 :pax, + path("d3.de.1234")[:aa + 0.1dl, :aa] + .. ak[:frot + 1ssw, :frot + 1.1ssw] << 0.5dt + ); + + with layer = -1 marker(:de.bbf :cat:ac15 :left, ak[:eid] << 2.5dt); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, + ak[:eid + 6dl, :pin - 2ssw] + ); + } + + with link = "point.de.Thesdorf-Bk" { + with layer = -1 marker(:de.bk :removed :left, ak[:the] << 0.5dt); + } + + with link = "point.de.Pinneberg" { + track(:first:station :double :cat:ac15 :pax, + ak[:pin - 2ssw, :pin + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, ak[:pin] >> 0.5dt); + slabel(:right :cat:ac15 :pax, ak[:pin] >> 0.5dt >> 1.6ssw, + span(:bold, "Pinneberg") + ); + } + +} + +with detail = 3 { + let ak = path("d4.de.1220"); + + with link = "line.de.1120" { + track(:first :double :cat:ac15 :pax, ak[:pin + 1ssw, :pri - 1ssw]); + } + + with link = "point.de.Prisdorf" { + track(:first:station :double :cat:ac15 :pax, + ak[:pri - 1ssw, :pri + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, ak[:pri] >> 0.5dt) + with layer = -1 marker(:de.bf :removed :right, ak[:pri] >> 0.5dt); + slabel(:right :cat:ac15 :pax, ak[:pri - 0.5ssw] >> 0.5dt >> 1.2ssw, + "Prisdorf" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:pri + 1ssw, :tor - 1ssw]); + } + + with link = "point.de.Tornesch" { + track(:first:station :double :cat:ac15 :pax, + ak[:tor - 1ssw, :tor + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, ak[:tor] << 0.5dt); + slabel(:right :cat:ac15 :pax, ak[:tor - 0.5ssw] >> 1.0dt, + span(:bold, "Tornesch") + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:tor + 1ssw, :els - 1ssw]); + } + + with link = "point.de.Himmel" { + with layer = -1 marker(:de.bk :removed :right, ak[:him] >> 0.5dt); + } + + with link = "point.de.Lieth" { + with layer = -1 marker(:de.bk :removed :right, ak[:lie] >> 0.5dt); + } + + with link = "point.de.Elmshorn-Els" { + track(:first:station :double :cat:ac15 :pax, ak[:els - 1ssw, :elm.r]); + with layer = -1 marker(:de.bft :removed :left, ak[:els] << 0.5dt); + } + + with link = "point.de.Elmshorn" { + track(:first:station :double :cat:ac15 :pax, ak[:elm.r, :elm.u]); + track(:first:station :double :cat:ac15 :pax, + ak[:elm.t - 0.1dl, :elm.t] + .. path("d4.de.1210")[:elw - 1.1ssw, :elw - 1ssw] + ); + with layer = -2 track(:third:station :pax, + ak[:elm + 0.5ssw, :elm.v] >> 1.5dt + .. path("d4.de.9120")[:lmo - 0.61ssw, :lmo - 0.6ssw] + ); + + marker(:de.bf :pax :right, ak[:elm] >> 0.5dt); + slabel(:right :pax, ak[:elm - 0.6ssw] >> 0.5dt >> 1.4ssw, + span(:bold, "Elmshorn") + ); + } + + with link = "point.de.Elmshorn-Nord" { + track(:first:station :double :cat:ac15 :pax, ak[:elm.u, :eln + 1ssw]); + marker(:de.bft :cat:ac15 :right, ak[:eln] >> 0.5dt); + with layer = -1 marker(:de.bft.casing :right, ak[:eln] >> 0.5dt); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:eln + 1ssw, :hot - 1ssw]); + } + + with link = "point.de.Horst-in-Holstein" { + track(:first:station :double :cat:ac15 :pax, + ak[:hot - 1ssw, :hot + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, ak[:hot] << 0.5dt); + slabel(:left :cat:ac15 :pax, ak[:hot - 0.1ssw] << 0.5dt << 1.8ssw, + "Horst in Holstein" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:hot + 1ssw, :hrt - 1ssw]); + } + + with link = "point.de.Horst-Holst" { + track(:first:station :double :cat:ac15 :pax, + ak[:hrt - 1ssw, :hrt + 1ssw] + ); + with layer = -1 marker(:de.bf :removed :left, ak[:hrt] << 0.5dt); + slabel(:left :removed, ak[:hrt - 0.4ssw] << 0.5dt << 1.6ssw, + hbox(:right:base, + span(:regular, "Horst "), + span(:light, "(Holst)") + ) + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:hrt + 1ssw, :dhf - 1ssw]); + with layer = 1 line_badge(:cat:ac15 :pax, ak[:dhf - 2.5km], "1220"); + } + + with link = "point.de.Dauenhof" { + track(:first:station :double :cat:ac15 :pax, + ak[:dhf - 1ssw, :dhf + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, ak[:dhf] << 0.5dt); + slabel(:left :cat:ac15 :pax, ak[:dhf - 0.9ssw] << 0.5dt << 1.6ssw, + "Dauenhof" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:dhf + 1ssw, :wri - 1ssw]); + } + + with link = "point.de.Siebenecksknöll" { + with layer = -1 marker(:de.bk :removed :left, ak[:sie] << 0.5dt); + } + + with link = "point.de.Wrist" { + track(:first:station :double :cat:ac15 :pax, + ak[:wri - 1ssw, :wri + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, ak[:wri] << 0.5dt); + slabel(:right :cat:ac15 :pax, ak[:wri - 0.2ssw] >> 2.5dt, + span(:bold, "Wrist") + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:wri + 1ssw, :brs - 1ssw]); + } + + with link = "point.de.Quarnstedt" { + with layer = -1 marker(:de.bk :removed :left, ak[:qua] << 0.5dt); + } + + with link = "point.de.Brokstedt" { + track(:first:station :double :cat:ac15 :pax, + ak[:brs - 1ssw, :brs + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, ak[:brs] << 0.5dt); + slabel(:left :cat:ac15 :pax, ak[:brs - 0.5ssw] << 0.5dt << 1.5ssw, + "Brokstedt" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:brs + 1ssw, :arp - 1ssw]); + with layer = 1 line_badge(:cat:ac15 :pax, ak[:brs + 2.5km], "1220"); + } + + with link = "point.de.Arpsdorf" { + track(:first:station :double :cat:ac15 :pax, + ak[:arp - 1ssw, :arp + 1ssw] + ); + with layer = -1 marker(:de.bk :removed :left, ak[:arp] << 0.5dt); + with layer = -2 marker(:de.bf :gone :left, ak[:arp] << 0.5dt); + slabel(:left :removed, ak[:arp - 0.6ssw] << 0.5dt << 1.4ssw, + "Arpsdorf" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:arp + 1ssw, :neu - 1ssw]); + } + + with link = "point.de.Padenstedt" { + with layer = -1 marker(:de.bk :removed :left, ak[:pad] << 0.5dt); + } + + with link = "point.de.Neumüster" { + # Str. 1220 + track(:first:station :double :cat:ac15 :pax, + ak[:neu - 1ssw, :neu.yf + 1ssw] + ); + + # Str. 1040 + track(:first:station :double :cat:ac15 :pax, + path("d4.de.1040")[:neu.yf, :neu.yf + 1ssw] + ); + + # Str. 1040 (alt) + track(:first:station :double :removed, + ak[:neu + 1ssw, :neu + 1.1ssw] + .. path("d4.de.1040.neu")[:neu.h, :neu.h + 0.1dl] + ); + + # Str. 1041 + track(:first:station :removed, + ak[:neu + 0.9ssw, :neu + 1ssw] >> 0.5dt + .. path("d4.de.1041")[:neu.hh, :neu.hh + 0.1dl] + ); + + # Str. 1042 + track(:second:station :pax, + ak[:neu + 0.9ssw, :neu + 1ssw] << 0.5dt + .. path("d4.de.1042")[:neu.kk, :neu.kk + 0.1dl] + ); + + # Str. 1043 + track(:first:station :pax, ak[:neu - 1ssw, :neu - 0.5ssw] >> 1.5dt); + + marker(:de.bf :cat:ac15 :pax :right, ak[:neu] >> 0.5dt); + slabel(:right :cat:ac15 :pax, ak[:neu - 0.4ssw] >> 0.5dt >> 2.0ssw, + span(:medium :bold, "Neumünster") + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:neu.yf + 1ssw, :ein - 1ssw]); + } + + with link = "point.de.Einfeld" { + track(:first:station :double :cat:ac15 :pax, + ak[:ein - 1ssw, :ein + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, ak[:ein] << .5dt); + with layer = -1 marker(:de.bf :gone :left, ak[:ein] << .5dt); + slabel(:left :cat:ac15 :pax, ak[:ein - .5ssw] << .5dt << 1.6ssw, + "Einfeld" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:ein + 1ssw, :bor - 1ssw]); + with layer = 1 line_badge(:cat:ac15 :pax, ak[:ein + 3.0km], "1220"); + } + + with link = "point.de.Bordesholm" { + track(:first:station :double :cat:ac15 :pax, + ak[:bor - 1ssw, :bor + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, ak[:bor] << .5dt); + slabel(:left :cat:ac15 :pax, ak[:bor - .5ssw] << .5dt << 1.4ssw, + "Bordesholm" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:bor + 1ssw, :fli - 1ssw]); + } + + with link = "point.de.Techelsdorf" { + with layer = -1 marker(:de.bk :removed, ak[:tec] >> 0.5dt); + } + + with link = "point.de.Flintbek" { + track(:first:station :double :cat:ac15 :pax, + ak[:fli - 1ssw, :fli + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, ak[:fli] << 0.5dt); + with layer = -1 marker(:de.bf :gone :left, ak[:fli] << 0.5dt); + slabel(:left :cat:ac15 :pax, ak[:fli - .6ssw] << .5dt << 1.5ssw, + "Flintbek" + ); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, ak[:fli + 1ssw, :mei - 1ssw]); + } + + with link = "point.de.Meimersdorf-Mf" { + track(:first:station :double :cat:ac15 :pax, + ak[:mei - 1ssw, :mei + 1ssw] + ); + + with layer = -2 track(:first:station :cat:ac15, + ak[:mei - 1ssw + 0.9dl, :mei - 1ssw + 1dl] << 0.5dt + -- ak[:mei - 1ssw + 2dl, :mei + 1ssw] << 1.5dt + ); + + with layer = -1 marker(:de.hp :closed, ak[:mei] >> 0.5dt); + } + + with link = "line.de.1220" { + track(:first :double :cat:ac15 :pax, + ak[:mei + 1ssw, :kie.aa - 100m - 2ssw] + ); + } + + with link = "point.de.Kiel-Hbf" { + track(:first:station :double :cat:ac15 :pax, + ak[:kie.aa - 200m - 2ssw, :kie] + ); + marker(:de.bf :cat:ac15 :pax :top, ak[:kie]); + label(:cat:ac15 :pax, ak[:kie] + (2.0dt, -1.2ssw), + hbox(:bottom:center, + vbox(:bottom:center, + span(:bold :medium, "Kiel"), + span(:bold :small, "Hbf") + ) + ) + ); + } +} + diff --git a/rules/de/a/d3/12/1221.map b/rules/tmp-de/a/d3/12/1221.map similarity index 100% rename from rules/de/a/d3/12/1221.map rename to rules/tmp-de/a/d3/12/1221.map diff --git a/rules/de/a/d3/12/1224.map b/rules/tmp-de/a/d3/12/1224.map similarity index 100% rename from rules/de/a/d3/12/1224.map rename to rules/tmp-de/a/d3/12/1224.map diff --git a/rules/de/a/d3/12/1225.map b/rules/tmp-de/a/d3/12/1225.map similarity index 100% rename from rules/de/a/d3/12/1225.map rename to rules/tmp-de/a/d3/12/1225.map diff --git a/rules/de/a/d3/12/1226.map b/rules/tmp-de/a/d3/12/1226.map similarity index 100% rename from rules/de/a/d3/12/1226.map rename to rules/tmp-de/a/d3/12/1226.map diff --git a/rules/de/a/d3/12/1230.map b/rules/tmp-de/a/d3/12/1230.map similarity index 100% rename from rules/de/a/d3/12/1230.map rename to rules/tmp-de/a/d3/12/1230.map diff --git a/rules/de/a/d3/12/1232.map b/rules/tmp-de/a/d3/12/1232.map similarity index 100% rename from rules/de/a/d3/12/1232.map rename to rules/tmp-de/a/d3/12/1232.map diff --git a/rules/de/a/d3/12/1234.map b/rules/tmp-de/a/d3/12/1234.map similarity index 100% rename from rules/de/a/d3/12/1234.map rename to rules/tmp-de/a/d3/12/1234.map diff --git a/rules/de/a/d3/12/1239.map b/rules/tmp-de/a/d3/12/1239.map similarity index 100% rename from rules/de/a/d3/12/1239.map rename to rules/tmp-de/a/d3/12/1239.map diff --git a/rules/de/a/d3/12/1240.map b/rules/tmp-de/a/d3/12/1240.map similarity index 100% rename from rules/de/a/d3/12/1240.map rename to rules/tmp-de/a/d3/12/1240.map diff --git a/rules/de/a/d3/12/1241.map b/rules/tmp-de/a/d3/12/1241.map similarity index 100% rename from rules/de/a/d3/12/1241.map rename to rules/tmp-de/a/d3/12/1241.map diff --git a/rules/de/a/d3/12/1243.map b/rules/tmp-de/a/d3/12/1243.map similarity index 100% rename from rules/de/a/d3/12/1243.map rename to rules/tmp-de/a/d3/12/1243.map diff --git a/rules/tmp-de/a/d3/12/1244.map b/rules/tmp-de/a/d3/12/1244.map new file mode 100644 index 00000000..6f18aa5f --- /dev/null +++ b/rules/tmp-de/a/d3/12/1244.map @@ -0,0 +1,106 @@ +# DE 1244. Hamburg Hbf - Aumühle +# + +with detail = 3 { + let ba = path("d3.de.6100.hmb"); + + with link = "line.de.1244" { + with layer = 2 track(:first:double :rail:rc12 :pax, + ba[:ham.aa, :ber.f] << 2dt + .. path("d4.de.a.6100")[:ber + 1ssw, :ber + 0.9ssw] << 2dt + ); + with layer = 1 casing(:first :double :rail:rc12, + ba[:ham.aa, :anc] << 2dt + ); + with layer = 1 casing(:first :double :rail:rc12, + ba[:ros, :tie] << 2dt + ); + } + + with link = "point.de.Hamburg-Rothenburgsort-S-Bahn" { + marker(:de.hp :rail:rc12 :pax :right, ba[:ros] >> 2.5dt); + } + + with link = "point.de.Hamburg-Tiefstack" { + marker(:de.hp :rail:rc12 :pax :right, ba[:tie] >> 2.5dt); + marker(:de.hp.casing :rail:rc12 :pax :right, ba[:tie] >> 2.5dt); + } + + with link = "point.de.Hamburg-Billwerder-Moorfleet" { + marker(:de.hp :rail:rc12 :pax :right, ba[:bim] >> 2.5dt); + } + + with link = "point.de.Hamburg-Mittlerer-Landweg" { + marker(:de.hp :rail:rc12 :pax :right, ba[:mit] >> 2.5dt); + } + + with link = "point.de.Hamburg-Allermöhe-S-Bahn" { + marker(:de.hp :rail:rc12 :pax :right, ba[:als] >> 2.5dt); + } + + with link = "point.de.Hamburg-Nettelnburg" { + marker(:de.hp :rail:rc12 :pax :right, ba[:net] >> 2.5dt); + } +} + +with detail = 3 { + let ba = path("d4.de.a.6100"); + + with link = "point.de.Hamburg-Bergedorf-S-Bahn" { + track(:first:station :double :rail:rc12 :pax, + ba[:ber + 1ssw, :ber - 1ssw] << 2dt + ); + marker(:de.bf :rail:rc12 :pax :right, ba[:ber] >> 2.5dt); + } + + with link = "line.de.1244" { + track(:first :double :rail:rc12 :pax, + ba[:ber - 1ssw, :rei + 1ssw] << 2dt + ); + } + + with link = "point.de.Reinbek" { + track(:first:station :double :rail:rc12 :pax, + ba[:rei + 1ssw, :rei - 1ssw] << 2dt + ); + marker(:de.hp :rail:rc12 :pax :right, ba[:rei] >> 2.5dt); + slabel(:left :rail:rc12 :pax, ba[:rei + 0.3ssw] >> 2.5dt >> 1.5ssw, + "Reinbek" + ); + } + + with link = "line.de.1244" { + track(:first :double :rail:rc12 :pax, + ba[:rei - 1ssw, :woh + 1ssw] << 2dt + ); + } + + with link = "point.de.Wohltorf" { + track(:first:station :rail:rc12 :pax, + ba[:woh + 1ssw, :woh - 1ssw] << 1.5dt + ); + track(:first:station :rail:rc12 :pax, + ba[:woh + 1ssw, :woh - 0.6ssw] << 2.5dt + -- ba[:woh - 0.6ssw - 1dl, :woh - 0.6ssw - 1.1dt] << 1.5dt + ); + marker(:de.bf :rail:rc12 :pax :right, ba[:woh] >> 2.5dt); + slabel(:left :rail:rc12 :pax, ba[:woh + 0.5ssw] >> 2.5dt >> 1.5ssw, + "Wohltorf" + ); + } + + with link = "line.de.1244" { + track(:first :rail:rc12 :pax, ba[:woh - 1ssw, :aum + 1ssw] << 1.5dt); + } + + with link = "point.de.Aumühle" { + track(:first:station :rail:rc12 :pax, + ba[:aum + 1ssw, :aum - 1ssw] << 1.5dt + ); + marker(:de.bf :rail:rc12 :pax :right, ba[:aum] >> 1.5dt); + slabel(:left :rail:rc12 :pax, ba[:aum - 1ssw] >> 1.5dt >> 1.5ssw, + span(:bold, "Aumühle") + ); + } +} + diff --git a/rules/de/a/d3/12/1245.map b/rules/tmp-de/a/d3/12/1245.map similarity index 100% rename from rules/de/a/d3/12/1245.map rename to rules/tmp-de/a/d3/12/1245.map diff --git a/rules/de/a/d3/12/1247.map b/rules/tmp-de/a/d3/12/1247.map similarity index 100% rename from rules/de/a/d3/12/1247.map rename to rules/tmp-de/a/d3/12/1247.map diff --git a/rules/de/a/d3/12/1248.map b/rules/tmp-de/a/d3/12/1248.map similarity index 100% rename from rules/de/a/d3/12/1248.map rename to rules/tmp-de/a/d3/12/1248.map diff --git a/rules/de/a/d3/12/1250.map b/rules/tmp-de/a/d3/12/1250.map similarity index 100% rename from rules/de/a/d3/12/1250.map rename to rules/tmp-de/a/d3/12/1250.map diff --git a/rules/de/a/d3/12/1251.map b/rules/tmp-de/a/d3/12/1251.map similarity index 100% rename from rules/de/a/d3/12/1251.map rename to rules/tmp-de/a/d3/12/1251.map diff --git a/rules/de/a/d3/12/1252.map b/rules/tmp-de/a/d3/12/1252.map similarity index 100% rename from rules/de/a/d3/12/1252.map rename to rules/tmp-de/a/d3/12/1252.map diff --git a/rules/de/a/d3/12/1253.map b/rules/tmp-de/a/d3/12/1253.map similarity index 100% rename from rules/de/a/d3/12/1253.map rename to rules/tmp-de/a/d3/12/1253.map diff --git a/rules/de/a/d3/12/1254.map b/rules/tmp-de/a/d3/12/1254.map similarity index 100% rename from rules/de/a/d3/12/1254.map rename to rules/tmp-de/a/d3/12/1254.map diff --git a/rules/de/a/d3/12/1255.map b/rules/tmp-de/a/d3/12/1255.map similarity index 100% rename from rules/de/a/d3/12/1255.map rename to rules/tmp-de/a/d3/12/1255.map diff --git a/rules/de/a/d3/12/1260.map b/rules/tmp-de/a/d3/12/1260.map similarity index 100% rename from rules/de/a/d3/12/1260.map rename to rules/tmp-de/a/d3/12/1260.map diff --git a/rules/de/a/d3/12/1262.map b/rules/tmp-de/a/d3/12/1262.map similarity index 100% rename from rules/de/a/d3/12/1262.map rename to rules/tmp-de/a/d3/12/1262.map diff --git a/rules/de/a/d3/12/1263.map b/rules/tmp-de/a/d3/12/1263.map similarity index 100% rename from rules/de/a/d3/12/1263.map rename to rules/tmp-de/a/d3/12/1263.map diff --git a/rules/de/a/d3/12/1264.map b/rules/tmp-de/a/d3/12/1264.map similarity index 100% rename from rules/de/a/d3/12/1264.map rename to rules/tmp-de/a/d3/12/1264.map diff --git a/rules/de/a/d3/12/1266.map b/rules/tmp-de/a/d3/12/1266.map similarity index 100% rename from rules/de/a/d3/12/1266.map rename to rules/tmp-de/a/d3/12/1266.map diff --git a/rules/de/a/d3/12/1267.map b/rules/tmp-de/a/d3/12/1267.map similarity index 100% rename from rules/de/a/d3/12/1267.map rename to rules/tmp-de/a/d3/12/1267.map diff --git a/rules/de/a/d3/12/1270.map b/rules/tmp-de/a/d3/12/1270.map similarity index 100% rename from rules/de/a/d3/12/1270.map rename to rules/tmp-de/a/d3/12/1270.map diff --git a/rules/de/a/d3/12/1271.map b/rules/tmp-de/a/d3/12/1271.map similarity index 100% rename from rules/de/a/d3/12/1271.map rename to rules/tmp-de/a/d3/12/1271.map diff --git a/rules/de/a/d3/12/1281.map b/rules/tmp-de/a/d3/12/1281.map similarity index 100% rename from rules/de/a/d3/12/1281.map rename to rules/tmp-de/a/d3/12/1281.map diff --git a/rules/de/a/d3/13/1300.map b/rules/tmp-de/a/d3/13/1300.map similarity index 100% rename from rules/de/a/d3/13/1300.map rename to rules/tmp-de/a/d3/13/1300.map diff --git a/rules/de/a/d3/13/1304.map b/rules/tmp-de/a/d3/13/1304.map similarity index 100% rename from rules/de/a/d3/13/1304.map rename to rules/tmp-de/a/d3/13/1304.map diff --git a/rules/de/a/d3/13/1310.map b/rules/tmp-de/a/d3/13/1310.map similarity index 100% rename from rules/de/a/d3/13/1310.map rename to rules/tmp-de/a/d3/13/1310.map diff --git a/rules/tmp-de/a/d3/17/1720.map b/rules/tmp-de/a/d3/17/1720.map new file mode 100644 index 00000000..06012bc7 --- /dev/null +++ b/rules/tmp-de/a/d3/17/1720.map @@ -0,0 +1,597 @@ +# DE 1720. Lehrte - Cuxhaven +# +let lc = path("d4.de.a.1720"); + +with detail = 3 { + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:emm + 1ssw, :bev - 1ssw]); + } + + with link = "point.de.Bad-Bevensen" { + track(:first:station :double :cat:ac15 :pax, + lc[:bev - 1ssw, :bev + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lc[:bev] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:bev - 0.6ssw] >> 0.5dt >> 1.6ssw, + "Bad Bevensen" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:bev + 1ssw, :bie - 1ssw]); + with layer = 1 line_badge(:cat:ac15 :pax, lc[:bev + 3.0km], "1720"); + } + + with link = "point.de.Bruchtorf" { + with layer = -1 marker(:de.bk :removed, lc[:bru] >> 0.5dt); + } + + with link = "point.de.Bienenbüttel" { + track(:first:station :double :cat:ac15 :pax, + lc[:bie - 1ssw, :bie + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lc[:bie] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:bie - 0.8ssw] >> 0.5dt >> 1.6ssw, + "Bienenbüttel" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:bie + 1ssw, :deu - 1ssw]); + } + + with link = "point.de.Hohenbostel" { + with layer = -1 marker(:de.bk :removed :right, lc[:hbo] >> 0.5dt); + slabel(:right :removed, lc[:hbo - 0.8ssw] >> 0.5dt >> 1.4ssw, + "Hohenbostel" + ); + } + + with link = "point.de.Deutsch-Evern" { + track(:first:station :double :cat:ac15 :pax, + lc[:deu - 1ssw, :deu + 1ssw] + ); + marker(:de.bbf :cat:ac15 :left, lc[:deu] << 0.5dt); + with layer = -1 marker(:de.bf :removed :left, lc[:deu] << 0.5dt); + slabel(:right :cat:ac15, lc[:deu - 0.8ssw] >> 1.5dt, "Deutsch Evern"); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:deu + 1ssw, :lun.a]); + } + + with link = "point.de.Lüneburg-Gbf" { + track(:first:station :double :cat:ac15 :pax, lc[:lun.a, :lun.r]); + with layer = 2 marker(:de.bft :cat:ac15 :left, lc[:lug] << 0.5dt); + } + + with link = "point.de.Lüneburg" { + # Str. 1720 + track(:first:station :double :cat:ac15 :pax, lc[:lun.r, :lun.xn]); + + # Str. 1151 + track(:second:station :pax, + lc[:fdan, :fdan + 100m] << 0.5dt << 1.25ssw + .. lc[:lun - 0.5ssw, :lun - 0.49ssw] << 0.5dt << 1ssw + ); + track(:second:station :cat:ac15 :pax, + lc[:lun - 0.5ssw, :lun + 0.5ssw] << 0.5dt << 1ssw + .. lc[:lkn - 0.51ssw, :lkn - 0.5ssw] << 1.5dt + ); + + # Str. 1150 + with layer = -1 track(:second:station :pax, + lc[:lun + 0.99ssw, :lun + 1ssw] >> 0.5dt + .. path("d4.de.1150")[:lun.kk - 0.1dl, :lun.kk] + ); + + marker(:de.bf :cat:ac15 :pax :left, lc[:lun] << 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:lun - 0.6ssw] >> 1.5dt, + span(:bold, "Lüneburg") + ); + } + + with link = "point.de.Lüneburg-Nordkopf" { + track(:first:station :double :cat:ac15 :pax, lc[:lun.xn, :lun.f]); + track(:first:station :cat:ac15 :pax, + lc[:lkn - 0.5ssw, :lun.f] << 1.5dt + ); + marker(:de.bft :cat:ac15 :right, lc[:lkn + 1dt] >> 0.5dt); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:lun.f, :bar - 1ssw]); + } + + with link = "point.de.Goseburg" { + with layer = -1 marker(:de.bk :removed :right, lc[:gos] >> 0.5dt); + } + + with link = "point.de.Bardowick" { + track(:first:station :double :cat:ac15 :pax, + lc[:bar - 1ssw, :bar + 1ssw]); + marker(:de.bf:cat:ac15 :pax :right, lc[:bar] >> 0.5dt); + slabel(:right:cat:ac15 :pax, lc[:bar - 0.5ssw] >> 0.5dt >> 1.2ssw, + "Bardowick" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:bar + 1ssw, :rad - 1ssw]); + } + + with link = "point.de.Radbruch" { + track(:first:station :double :cat:ac15 :pax, + lc[:rad - 1ssw, :rad + 1ssw] + ); + track(:first:station :cat:ac15 :pax, + lc[:rad - 1ssw, :rad + 1ssw] << 1.5dt + ); + + marker(:de.hp :cat:ac15 :pax :left, lc[:rad] << 1.5dt); + with layer = -1 marker(:de.bf :removed :left, lc[:rad] << 1.5dt); + slabel(:left :cat:ac15 :pax, lc[:rad - 1.5ssw] << 1.5dt << 2.2ssw, + "Radbruch" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:rad + 1ssw, :win - 1ssw]); + } + + with link = "point.de.Borstel" { + with layer = -1 marker(:de.bk :removed :right, lc[:bor] >> 0.5dt); + } + + with link = "point.de.Winsen-Luhe" { + track(:first:station :double :cat:ac15 :pax, + lc[:win - 1ssw, :win + 1ssw] + ); + track(:first:station :cat:ac15 :pax, + lc[:win - 1ssw, :win + 1ssw] << 1.5dt + ); + + marker(:de.bf :cat:ac15 :pax :right, lc[:win] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lc[:win + 0.3ssw] << 1.5dt << 6pt, + hbox(:center:base, + span(:bold, "Winsen "), + span(:regular, "(Luhe)") + ) + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:win + 1ssw, :ash - 1ssw]); + } + + # point.de.Ashausen-Abzw de.1153 + # point.de.Ashausen de.1153 + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:ash + 1ssw, :ste - 1ssw]); + } + + with link = "point.de.Stelle" { + track(:first :station :cat:ac15, + lc[:ste - 1ssw, :ste + 1ssw] >> 1.5dt + ); + track(:first :station :cat:ac15 :pax, + lc[:ste - 1ssw, :ste + 1ssw] >> 0.5dt + ); + track(:first :station :cat:ac15 :pax, + lc[:ste - 1ssw, :ste + 1ssw] << 0.5dt + ); + track(:first :station :cat:ac15 :pax, + lc[:ste - 1ssw, :ste + 1ssw] << 1.5dt + ); + marker(:de.bf :cat:ac15 :pax :left, lc[:ste] << 1.5dt); + slabel(:right :cat:ac15 :pax, lc[:ste] >> 2.5dt, + span(:bold, "Stelle") + ); + } +} + +with detail = 3 { + let lc = path("d3.de.1720.hmb"); + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:ste + 1ssw, :mas - 1ssw]); + } + + with link = "point.de.Maschen-Pbf" { + track(:first:station :double :cat:ac15 :pax, + lc[:mas - 1ssw, :mas + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lc[:mas] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:mas - 0.7ssw] >> 0.5dt >> 1.4ssw, + "Maschen Pbf" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:mas + 1ssw, :meh - 2ssw]); + } + + with link = "point.de.Meckelfeld-Abzw" { + track(:first:station :double :cat:ac15 :pax, + lc[:meh - 2ssw, :meh - 1ssw] + ); + marker(:de.bft :cat:ac15 :right, lc[:meh - 1.5ssw] >> 0.5dt); + } + + with link = "point.de.Meckelfeld-Hp" { + track(:first:station :double :cat:ac15 :pax, + lc[:meh - 1ssw, :meh + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, lc[:meh] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:meh - 0.7ssw] >> 0.5dt >> 1.4ssw, + "Meckelfeld" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, + lc[:meh + 1ssw, :har.a - 1200m] + ); + } + + # point.de.Hamburg-Harburg: de.2200 + + with link = "point.de.Hamburg-Unterelbe" { + track(:first:station :double :cat:ac15 :pax, lc[:unt, :unt + 2ssw]); + marker(:de.bbf :cat:ac15 :right, lc[:unt + 1ssw] >> 0.5dt); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:unt + 2ssw, :haa - 1ssw]); + } + + with link = "point.de.Hamburg-Hausbruch" { + track(:first:station :double :cat:ac15 :pax, + lc[:haa - 1ssw, :hbm + 1ssw] + ); + marker(:de.bbf :cat:ac15 :pax :left, lc[:haa] << 0.5dt); + with layer = -1 marker(:de.bf.casing :left, lc[:haa] << 0.5dt); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:hbm + 1ssw, :ngr - 1ssw]); + } + + with link = "point.de.Hamburg-Neugraben" { + track(:first:station :double :cat:ac15 :pax, + lc[:ngr - 1ssw, :ngr + 4dl] + ); + marker(:de.bf :cat:ac15 :pax :right, lc[:ngr] >> 0.5dt); + } +} + +with detail = 3 { + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, + path("d3.de.1720.hmb")[:ngr + 4dl, :ngr + 5dl] + .. lc[:fis - 1.1ssw, :fis - 1ssw] + ); + } + + with link = "point.de.Fischbek" { + track(:first:station :double :cat:ac15 :pax, + lc[:fis - 1ssw, :fis + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, lc[:fis] >> 0.5dt); + slabel(:top :cat:ac15 :pax, lc[:fis] >> 0.5dt >> 1.2ssw, "Fischbek"); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:fis + 1ssw, :nwu - 1ssw]); + } + + with link = "point.de.Neu-Wulmstorf" { + track(:first:station :double :cat:ac15 :pax, + lc[:nwu - 1ssw, :nwu + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, lc[:nwu] << 0.5dt); + with layer = -1 marker(:de.bf :removed :left, lc[:nwu] << 0.5dt); + slabel(:left :cat:ac15 :pax, lc[:nwu - 2ssw] << 0.5dt << 3.5ssw, + "Neu Wulmstorf" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:nwu + 1ssw, :bux - 1ssw]); + } + + with link = "point.de.Buxtehude" { + track(:first:station :double :cat:ac15 :pax, + lc[:bux - 1ssw, :bux + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lc[:bux] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:bux + 2ssw] >> 0.5dt >> 1.2ssw, + span(:bold, "Buxtehude") + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:bux + 1ssw, :nkl - 1ssw]); + } + + with link = "point.de.Neukloster-Stade" { + track(:first:station :double :cat:ac15 :pax, + lc[:nkl - 1ssw, :nkl + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, lc[:nkl] >> 0.5dt); + with layer = -1 marker(:de.bf :gone :right, lc[:nkl] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:nkl - 0.5ssw] >> 0.5dt >> 1.4ssw, + hbox(:left:base, + "Neukloster ", span(:light, "(Kr Stade)") + ) + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:nkl + 1ssw, :hor - 1ssw]); + with layer = 1 line_badge(:cat:ac15 :pax, lc[:nkl + 2.5km], "1720"); + } + + with link = "point.de.Horneburg" { + track(:first:station :double :cat:ac15 :pax, + lc[:hor - 1ssw, :hor + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :right, lc[:hor] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:hor - 0.8ssw] >> 0.5dt >> 1.5ssw, + "Horneburg" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:hor + 1ssw, :dol - 1ssw]); + } + + with link = "point.de.Dollern" { + track(:first:station :double :cat:ac15 :pax, + lc[:dol - 1ssw, :dol + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, lc[:dol] >> 0.5dt); + with layer = -1 marker(:de.bf :removed :right, lc[:dol] >> 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:dol - 0.5ssw] >> 0.5dt >> 1.5ssw, + "Dollern" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:dol + 1ssw, :aga - 1ssw]); + } + + with link = "point.de.Agathenburg" { + track(:first:station :double :cat:ac15 :pax, + lc[:aga - 1ssw, :aga + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, lc[:aga] << 0.5dt); + slabel(:right :cat:ac15 :pax, lc[:aga - 0.4ssw] >> 1.5dt, + "Agathenburg" + ); + } + + with link = "line.de.1720" { + track(:first :double :cat:ac15 :pax, lc[:aga + 1ssw, :sta.a]); + } + + with link = "point.de.Stade" { + track(:first:station :double :cat:ac15 :pax, lc[:sta.a, :sta + 1ssw]); + marker(:de.bf :cat:ac15 :pax :right, lc[:sta] >> 0.5dt); + slabel(:left :cat:ac15 :pax, lc[:sta] >> 0.5dt >> 1.6ssw, + span(:bold, "Stade") + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:sta + 1ssw, :ham - 1ssw]); + with layer = 1 line_badge(:pax, lc[:ham - 2.0km], "1720"); + } + + with link = "point.de.Hahle" { + with layer = -1 marker(:de.bk :removed :left, lc[:hah] << 0.5dt); + slabel(:bottom :removed, lc[:hah] << 0.5dt << 1.2ssw, "Hahle"); + } + + with link = "point.de.Hammah" { + track(:first:station :double :pax, lc[:ham - 1ssw, :ham + 1ssw]); + marker(:de.hp :pax :left, lc[:ham] << 0.5dt); + with layer = -1 marker(:de.bf :removed :left, lc[:ham] << 0.5dt); + slabel(:left :pax, lc[:ham - 2ssw] << 0.5dt << 2.4ssw, "Hammah"); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:ham + 1ssw, :him - 1ssw]); + } + + with link = "point.de.Himmelpforten" { + track(:first:station :pax, + lc[:him - 1ssw, :him + 0.5ssw] >> 0.5dt + -- lc[:him + 0.5ssw + 1dl, :him + 0.5ssw + 1.1dl] << 0.5dt + ); + with layer = -1 track(:first:station :removed, + lc[:him + 0.5ssw, :him + 1.5ssw] >> 0.5dt + ); + track(:first:station :pax, lc[:him - 1ssw, :him + 1.5ssw] << 0.5dt); + + marker(:de.hp :pax :left, lc[:him] << 0.5dt); + marker(:de.uest :pax :left, lc[:him] << 0.5dt); + with layer = -1 marker(:de.bf :gone :left, lc[:him] << 0.5dt); + slabel(:left :pax, lc[:him - 2ssw] << 0.5dt << 2.2ssw, + "Himmelpforten" + ); + } + + with link = "line.de.1720" { + with layer = -1 track(:first :removed, + lc[:him.f, :ost - 250m] >> 0.5dt + ); + with layer = -1 track(:first:removed, + lc[:ost + 500m, :hec - 1ssw] >> 0.5dt + ); + track(:first :pax, + lc[:him.f, :ost - 250m - 1dl] << 0.5dt + -- lc[:ost - 250m, :ost + 500m] >> 0.5dt + -- lc[:ost + 500m + 1dl, :hec - 1ssw] << 0.5dt + ); + with layer = -1 track(:first:removed, + lc[:ost - 250m - 1dl, :ost + 500m + 1dl] << 0.5dt + ); + } + + with link = "point.de.Ostebrücke" { + with layer = -1 marker(:de.bk :removed :right, lc[:ost] >> 0.5dt); + slabel(:right:removed, lc[:ost + 1ssw] >> 0.5dt >> 1.2ssw, + "Ostebrücke" + ); + } + + with link = "point.de.Hechthausen" { + with layer = -1 track(:first:station :removed, + lc[:hec - 1ssw, :hec + 0.5ssw + 1dl] >> 0.5dt + ); + track(:first:station :pax, + lc[:hec + 0.49ssw, :hec + 0.5ssw] << 0.5dt + -- lc[:hec + 0.5ssw + 1dl, :hec + 1.5ssw] >> 0.5dt + ); + track(:first:station :pax, + lc[:hec - 1ssw, :hec + 1.5ssw] << 0.5dt + ); + marker(:de.hp :pax :right, lc[:hec] >> 0.5dt); + marker(:de.uest :pax :right, lc[:hec] >> 0.5dt); + with layer = -1 marker(:de.bf :gone :right, lc[:hec] >> 0.5dt); + slabel(:left :pax, lc[:hec - 0.4ssw] << 0.5dt << 1.5ssw, + "Hechthausen" + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:hec + 1.5ssw, :hem - 1ssw]); + with layer = 1 line_badge(:pax, lc[:hec + 4.0km], "1720"); + } + + with link = "point.de.Hemmoor" { + track(:first:station :double :pax, lc[:hem - 1ssw, :hem + 1ssw]); + marker(:de.hp :pax :right, lc[:hem] >> 0.5dt); + with layer = -1 marker(:de.bf :removed :right, lc[:hem] >> 0.5dt); + slabel(:right :pax, lc[:hem - 1.0ssw] >> 0.5dt >> 1.2ssw, + vbox(:left:bottom, + span(:removed, "Basbeck-Osten"), + "Hemmoor" + ) + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:hem + 1ssw, :war - 1ssw]); + } + + with link = "point.de.Warstade" { + track(:first:station :double :pax, lc[:war - 1ssw, :war + 1ssw]); + with layer = -1 marker(:de.bf :removed :left, lc[:war] << 0.5dt); + slabel(:left :pax :removed, lc[:war] << 0.5dt << 2.2ssw, + "Warstade-Hemmoor" + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:war + 1ssw, :wig - 1ssw]); + } + + with link = "point.de.Wingst" { + track(:first:station :double :pax, lc[:wig - 1ssw, :wig + 1ssw]); + marker(:de.hp :pax :right, lc[:wig] >> 0.5dt); + with layer = -1 marker(:de.bf :gone :right, lc[:wig] >> 0.5dt); + slabel(:right :pax, lc[:wig - 1.0ssw] >> 0.5dt >> 1.4ssw, + vbox(:left:bottom, + span(:removed, "Höftgrube"), + "Wingst" + ) + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:wig + 1ssw, :cad - 1ssw]); + } + + with link = "point.de.Cadenberge" { + track(:first:station :double :pax, lc[:cad - 1ssw, :cad + 1ssw]); + marker(:de.bf :pax :right, lc[:cad] >> 0.5dt); + slabel(:right :pax, lc[:cad - 0.5ssw] >> 0.5dt >> 1.4ssw, + "Cadenberge" + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:cad + 1ssw, :nha - 1ssw]); + } + + with link = "point.de.Neuhaus-Oste" { + track(:first:station :double :pax, lc[:nha - 1ssw, :nha + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, lc[:nha] >> 0.5dt); + slabel(:right :removed, lc[:nha - 0.5ssw] >> 0.5dt >> 1.4ssw, + hbox(:left:base, "Neuhaus ", span(:light, "(Oste)")) + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:nha + 1ssw, :ott - 1ssw]); + } + + with link = "point.de.Otterndorf-Osterende" { + with layer = -1 marker(:de.bk :removed :right, lc[:ose] >> 0.5dt); + } + + with link = "point.de.Otterndorf" { + track(:first:station :double :pax, lc[:ott - 1ssw, :ott + 1ssw]); + marker(:de.hp :pax :right, lc[:ott] >> 0.5dt); + with layer = -1 marker(:de.bf :removed :right, lc[:ott] >> 0.5dt); + slabel(:top :pax, lc[:ott] >> 0.5dt >> 1.3ssw, + "Otterndorf" + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:ott + 1ssw, :abr - 1ssw]); + with layer = 1 line_badge(:pax, lc[:abr - 2.5km], "1720"); + } + + with link = "point.de.Otterndorf-Westerende" { + with layer = -1 marker(:de.bk :right :gone, lc[:wee] >> 0.5dt); + } + + with link = "point.de.Altenbruch" { + track(:first:station :double :pax, lc[:abr - 1ssw, :abr + 1ssw]); + with layer = -2 marker(:de.bf :removed :left, lc[:abr] << 0.5dt); + slabel(:left :removed, lc[:abr - 0.5ssw] << 0.5dt << 2.8ssw, + "Altenbruch" + ); + } + + with link = "line.de.1720" { + track(:first :double :pax, lc[:abr + 1ssw, :gro - 1ssw]); + } + + with link = "point.de.Cuxhaven-Groden" { + track(:first:station :double :pax, lc[:gro - 1ssw, :gro + 1ssw]); + } + + with link = "point.de.Cuxhaven-CF" { + track(:first:station :double :pax, lc[:gro + 1ssw, :cuf + 1ssw]); + track(:second:station :pax, + path("d4.de.a.1310")[:cux.b, :cux.b + 0.1dl] + .. lc[:cuf - 0.5ssw, :cuf - 0.49ssw] << 0.5dt + ); + with layer = -1 marker(:de.bft :left, lc[:cuf] << 0.5dt); + } + + with link = "point.de.Cuxhaven" { + track(:first:station :double :pax, lc[:cuf + 1ssw, :cux]); + marker(:de.bf :pax :top, lc[:cux]); + slabel(:left :pax, lc[:cux] - (1.8ssw, 0.2ssw), + span(:bold, "Cuxhaven") + ); + } +} + diff --git a/rules/de/a/d3/19/1963.map b/rules/tmp-de/a/d3/19/1963.map similarity index 100% rename from rules/de/a/d3/19/1963.map rename to rules/tmp-de/a/d3/19/1963.map diff --git a/rules/de/a/d3/22/2200.map b/rules/tmp-de/a/d3/22/2200.map similarity index 100% rename from rules/de/a/d3/22/2200.map rename to rules/tmp-de/a/d3/22/2200.map diff --git a/rules/tmp-de/a/d3/61/6100.map b/rules/tmp-de/a/d3/61/6100.map new file mode 100644 index 00000000..5f25b74a --- /dev/null +++ b/rules/tmp-de/a/d3/61/6100.map @@ -0,0 +1,241 @@ +# DE 6100. Berlin-Spandau - Hamburg-Altona +# +let ba = path("d4.de.a.6100"); + +with detail = 3 { + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, + ba[:gsah + 0.5ssw, :buc - 1ssw] + ); + } + + with link = "point.de.Büchen" { + with layer = 2 track(:first:station :double :cat:ac15 :pax, + ba[:buc - 1ssw, :buc.r] + ); + with layer = -1 track(:first:station :pax, + ba[:buc - 0.5ssw, :buc + 0.5ssw] << 0.5dt << 1ssw + ); + + marker(:de.bf :cat:ac15 :pax :left, ba[:buc] << 0.5dt); + slabel(:left :cat:ac15 :pax, ba[:buc - 0.3ssw] << 0.5dt << 2.2ssw, + span(:bold, "Büchen") + ); + } + + with link = "point.de.Büchen-Bbf" { + track(:first:station :double :cat:ac15 :pax, ba[:buc.r, :bcb + 1ssw]); + with layer = -1 marker(:de.bft :cat:ac15 :left, ba[:bcb] << 0.5dt); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, + ba[:bcb + 0.5ssw, :stt - 0.5ssw] + ); + } + + with link = "point.de.Büchen-Steinautal" { + track(:first:station :double :cat:ac15 :pax, + ba[:stt - 0.5ssw, :stt + 0.5ssw] + ); + with layer = -1 marker(:de.uest :cat:ac15 :right, ba[:stt] >> 0.5dt); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:stt + 0.5ssw, :mus - 1ssw]); + } + + with link = "point.de.Müssen" { + track(:first:station :double :cat:ac15 :pax, + ba[:mus - 1ssw, :mus + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :left, ba[:mus] << 0.5dt); + with layer = -1 marker(:de.bf :gone :left, ba[:mus] << 0.5dt); + slabel(:left :cat:ac15 :pax, ba[:mus - 1ssw] << 0.5dt << 2.4ssw, + "Müssen" + ); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:mus + 1ssw, :swa - 1ssw]); + } + + with link = "point.de.Schwarzenbek" { + track(:first:station :double :cat:ac15 :pax, + ba[:swa - 1ssw, :swa + 1ssw] + ); + marker(:de.bf :cat:ac15 :pax :left, ba[:swa] << 0.5dt); + slabel(:left :cat:ac15 :pax, ba[:swa - 1ssw] << 0.5dt << 2.4ssw, + span(:bold, "Schwarzenbek") + ); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:swa + 1ssw, :frr - 1ssw]); + } + + with link = "point.de.Radekamp" { + with layer = -1 marker(:de.bk :removed :right, ba[:rap] >> 0.5dt); + } + + with link = "point.de.Sachsenwald" { + with layer = -1 marker(:de.bk :removed :right, ba[:sad] >> 0.5dt); + } + + with link = "point.de.Friedrichsruh" { + track(:first:station :double :cat:ac15 :pax, + ba[:frr - 1ssw, :frr + 1ssw] + ); + marker(:de.hp :cat:ac15 :pax :right, ba[:frr] >> 0.5dt); + with layer = -1 marker(:de.bf :gone :right, ba[:frr] >> 0.5dt); + slabel(:right :cat:ac15 :pax, ba[:frr + 1ssw] >> 0.5dt >> 1.4ssw, + "Friedrichsruh" + ); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:frr + 1ssw, :aua - 1ssw]); + } + + with link = "point.de.Aumühle-Abzw" { + track(:first:station :double :cat:ac15 :pax, + ba[:aua - 1ssw, :aua + 1ssw] + ); + marker(:de.bft.first :cat:ac15 :left, ba[:aua] << 0.5dt); + marker(:de.abzw.second :cat:ac15 :left, ba[:aua] << 0.5dt); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:ber.a, :aua + 1ssw]); + } +} + + +let ba = path("d3.de.6100.hmb"); + +with detail = 3 { + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:ber.a, :ber - 1ssw]); + } + + with link = "point.de.Hamburg-Bergedorf" { + track(:first:station :double :cat:ac15 :pax, + ba[:ber - 1ssw, :ber.f] + ); + marker(:de.bf :cat:ac15 :pax :left, ba[:ber] << 0.5dt); + slabel(:right :cat:ac15 :pax, + ba[:ber] << 0.5dt + (2ssw, 0.7ssw), + span(:bold, "H.-Bergedorf") + ); + } + + with link = "point.de.Hamburg-Bergedorf-Gbf" { + track(:first:station :double :cat:ac15 :pax, ba[:ber.f, :net + 1ssw]); + with layer = -1 marker(:de.bft :cat:ac15 :left, ba[:net] << 0.5dt); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:net + 1ssw, :all - 1ssw]); + } + + with link = "point.de.Hamburg-Allermöhe" { + track(:first:station :double :cat:ac15 :pax, + ba[:all - 1ssw, :all + 1ssw] + ); + track(:first:station :cat:ac15 :pax, + ba[:all - 1.1dl, :all - 1dl] << 0.5dt + -- ba[:all, :all + 1ssw] << 1.5dt + ); + with layer = -1 marker(:de.abzw :cat:ac15 :left, ba[:all] << 1.5dt); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:all + 1ssw, :rtk - 1ssw]); + } + + # point.de.Hamburg-Rothenburgsort-Tk: de.1280 + + with link = "line.de.6100" { + with layer = 2 track(:first :double :cat:ac15 :pax, + ba[:rtk + 1ssw, :ahar - 1ssw] + ); + with layer = 1 casing(:first :double :cat:ac15 :pax, + ba[:rtk + 1ssw, :ahar - 1ssw] + ); + } + + with link = "point.de.Hamburg-Rothenburgsort-Rop" { + track(:first:station :double :cat:ac15 :pax, ba[:ahar - 1ssw, :ahar]); + } + + with link = "line.de.6100" { + track(:first :cat:ac15 :pax, ba[:ahar, :anc - 1ssw] >> 0.5dt); + } + + with link = "point.de.Hamburg-Anckelmannsplatz" { + track(:first:station :cat:ac15 :pax, + ba[:anc - 1ssw, :anc + 1ssw] >> 0.5dt + ); + track(:first:station :cat:ac15 :pax, + ba[:anc - 1.1dl, :anc - 1dl] >> 0.5dt + -- ba[:anc, :anc + 1ssw] << 0.5dt + ); + } + + with link = "line.de.6100" { + track(:first:station :double :cat:ac15 :pax, + ba[:anc + 1ssw, :ham - 1ssw] + ); + } + + with link = "point.de.Hamburg-Hbf" { + let wanham = path("d3.de.2200.hmb"); + + track(:first:station :double :cat:ac15 :pax, + ba[:ham - 1ssw, :ham + 0.5ssw + 3dl] + ); + with layer = -1 casing(:first:station :double :cat:ac15 :pax, + ba[:ham, :ham + 0.5ssw + 3dl] + ); + + track(:first:station :cat:ac15 :pax, + wanham[:ham - 1ssw, :ham + 0.5ssw + 1dl] << 1.5dt + ); + with layer = -1 casing(:first:station :cat:ac15 :pax, + ba[:ham, :ham + 0.5ssw + 1dl] << 1.5dt + ); + + track(:first:station :cat:ac15 :pax, + wanham[:ham - 1ssw, :ham + 0.5ssw] << 2.5dt + -- ba[:ham + 0.5ssw + 2dl, :ham + 0.5ssw + 2.1dl] << 0.5dt + ); + with layer = -1 casing(:first:station :cat:ac15 :pax, + ba[:ham, :ham + 0.5ssw] << 2.5dt + -- ba[:ham + 0.5ssw + 2dl, :ham + 0.5ssw + 2.1dl] << 0.5dt + ); + + marker(:de.bf :cat:ac15 :pax :left, ba[:ham] << 2.5dt); + } + + with link = "line.de.6100" { + track(:first :double :cat:ac15 :pax, ba[:ham + 0.5ssw + 3dl, :rai]); + } + + with link = "point.de.Hamburg-Dammtor" { + marker(:de.hp :cat:ac15 :pax :left, ba[:dam] << 0.5dt); + } + + with link = "line.de.6100" { + let ak = path("d3.de.1220.hmb"); + + track(:first:station :double :cat:ac15 :pax, + ba[:rai - 0.1dl, :rai] + .. ak[:aham, :aham - 0.1dl] >> 1dt + ); + with layer = -1 casing(:first:station :double :cat:ac15 :pax, + ba[:rai - 0.1dl, :rai] + .. ak[:aham, :aham - 0.1dl] >> 1dt + ); + } +} + diff --git a/rules/de/a/d3/69/6905.map b/rules/tmp-de/a/d3/69/6905.map similarity index 100% rename from rules/de/a/d3/69/6905.map rename to rules/tmp-de/a/d3/69/6905.map diff --git a/rules/tmp-de/a/d3/69/6928.map b/rules/tmp-de/a/d3/69/6928.map new file mode 100644 index 00000000..93e292bc --- /dev/null +++ b/rules/tmp-de/a/d3/69/6928.map @@ -0,0 +1,223 @@ +# DE 6928. Hagenow Land - Bad Oldesloe +# +let ho = path("d4.de.a.6928"); + +with detail = 3 { + with link = "line.de.6928" { + track(:second :removed, ho[:gzar + 0.5ssw, :kze - 1ssw]); + } + + with link = "point.de.Klein-Zecher" { + track(:second:station :removed, ho[:kze - 1ssw, :kze + 1ssw]); + marker(:de.hp :removed :right, ho[:kze]); + slabel(:left :removed, ho[:kze - 0.2ssw] << 2dt, + "Klein Zecher" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:kze + 1ssw, :hak - 1ssw]); + } + + with link = "point.de.Hakendorf" { + track(:second:station :removed, ho[:hak - 1ssw, :hak + 1ssw]); + marker(:de.hp :removed :left, ho[:hak]); + slabel(:right :removed, ho[:hak - 0.4ssw] >> 0.5dt, + "Hakendorf" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:hak + 1ssw, :hol - 1ssw]); + } + + + with link = "point.de.Hollenbek" { + track(:second:station :closed, ho[:hol - 1ssw, :hol + 1ssw]); + marker(:de.bf :removed :left, ho[:hol]); + slabel(:right :removed, ho[:hol - 0.4sw] >> 1.0dt, + span(:bold, "Hollenbek") + ); + } + + with link = "line.de.6928" { + track(:second :closed, ho[:hol + 1ssw, :ste - 1ssw]); + } + + with link = "point.de.Sterley" { + track(:second:station :closed, ho[:ste - 1ssw, :ste + 1ssw]); + with layer = -1 marker(:de.hp :removed :right, ho[:ste]); + slabel(:right :removed, ho[:ste - 0.5ssw] >> 1.4ssw, + "Sterley" + ); + } + + with link = "line.de.6928" { + track(:second :closed, ho[:ste + 1ssw, :aho - 1ssw]); + } + + with link = "point.de.Alt-Horst" { + track(:second:station :closed, ho[:aho - 1ssw, :aho + 1ssw]); + with layer = -1 marker(:de.hp :removed :left, ho[:aho]); + slabel(:right :removed, ho[:aho - 0.4ssw] >> 1.0dt, + "Alt Horst" + ); + } + + with link = "line.de.6928" { + track(:second :closed, ho[:aho + 1ssw, :smi - 1ssw]); + } + + with link = "point.de.Schmilau" { + track(:second:station :closed, ho[:smi - 1ssw, :smi + 1ssw]); + with layer = -1 marker(:de.bf :removed :right, ho[:smi]); + slabel(:right :removed, ho[:smi - 1.0ssw] >> 1.0ssw, "Schmilau"); + } + + with link = "line.de.6928" { + with layer = -1 track(:second :closed, ho[:smi + 1ssw, :rat.yh]); + } + + # point.de.Ratzeburg de.1121 + + with link = "line.de.6928" { + with layer = -1 track(:second :removed, + path("d4.de.1121")[:rat - 1ssw, :rat - 1.1ssw] + .. ho[:rat.x + 300m, :kul - 1ssw] + ); + } + + with link = "point.de.Kulpin" { + track(:second:station :removed, ho[:kul - 1ssw, :kul + 1ssw]); + marker(:de.hp :removed :right, ho[:kul]); + slabel(:left :removed, ho[:kul - 0.4ssw] << 5pt, "Kulpin"); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:kul + 1ssw, :ber - 1ssw]); + with layer = 1 line_badge(:closed, ho[:kul + 2.5km], "6928"); + } + + with link = "point.de.Berkenthin" { + track(:second:station :removed, ho[:ber - 1ssw, :ber + 1ssw]); + marker(:de.hst :removed :left, ho[:ber]); + with layer = -1 marker(:de.bf :gone :left, ho[:ber]); + slabel(:bottom :removed, ho[:ber] << 1.2ssw, "Berkenthin"); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:ber + 1ssw, :sie - 1ssw]); + } + + with link = "point.de.Sierksrade" { + track(:second:station :removed, ho[:sie - 1ssw, :sie + 1ssw]); + marker(:de.bf :removed :left, ho[:sie]); + slabel(:left :removed, ho[:sie - 0.5ssw] << 2.4ssw, + "Sierksrade" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:sie + 1ssw, :kao - 1ssw]); + } + + with link = "point.de.Kastorf-Ost" { + track(:second:station :removed, ho[:kao - 1ssw, :kao + 1ssw]); + marker(:de.hp :removed :right, ho[:kao]); + slabel(:right :removed, ho[:kao + 1ssw] >> 1.4ssw, + "Kastorf Ost" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:kao + 1ssw, :kas - 1ssw]); + } + + with link = "point.de.Kastorf" { + track(:second:station :removed, ho[:kas - 1ssw, :kas + 1ssw]); + marker(:de.bf :removed :right, ho[:kas]); + slabel(:left :removed, ho[:kas] << 6pt, "Kastorf"); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:kas + 1ssw, :sib - 1ssw]); + } + + with link = "point.de.Siebenbäumen" { + track(:second:station :removed, ho[:sib - 1ssw, :sib + 1ssw]); + marker(:de.hp :removed :right, ho[:sib]); + slabel(:right :removed, ho[:sib + 1ssw] >> 1.4ssw, + "Siebenbäumen" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:sib + 1ssw, :ahr - 1ssw]); + } + + with link = "point.de.Ahrensfelde-Stormarn" { + track(:second:station :removed, ho[:ahr - 1ssw, :ahr + 1ssw]); + marker(:de.hp :removed :right, ho[:ahr]); + slabel(:left :removed, ho[:ahr - 2ssw] << 6pt, + "Ahrensfelde" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:ahr + 1ssw, :sur - 1ssw]); + } + + + with link = "point.de.Schürensölen" { + track(:second:station :removed, ho[:sur - 1ssw, :sur + 1ssw]); + marker(:de.hp :removed :right, ho[:sur]); + slabel(:right :removed, ho[:sur + 1ssw] >> 1.4ssw, + "Schürensölen" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:sur + 1ssw, :kbo - 1ssw]); + } + + with link = "point.de.Klein-Boden" { + track(:second:station :removed, ho[:kbo - 1ssw, :kbo + 1ssw]); + marker(:de.hp :removed :right, ho[:kbo]); + slabel(:left :removed, ho[:kbo - 1ssw] << 6pt, + "Klein Boden" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:kbo + 1ssw, :tre - 1ssw]); + } + + with link = "point.de.Treuholz" { + track(:second:station :removed, ho[:tre - 1ssw, :tre + 1ssw]); + marker(:de.bf :removed :right, ho[:tre]); + slabel(:right :removed, ho[:tre + 1ssw] >> 1.4ssw, + "Treuholz" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:tre + 1ssw, :ret - 1ssw]); + } + + with link = "point.de.Retwisch" { + track(:second:station :removed, ho[:ret - 1ssw, :ret + 1ssw]); + marker(:de.hp :removed :right, ho[:ret]); + slabel(:right :removed, ho[:ret + 1ssw] >> 1.4ssw, + "Retwisch" + ); + } + + with link = "line.de.6928" { + track(:second :removed, ho[:ret + 1ssw, :old.gg]); + with layer = -6 track(:second:station :removed, + ho[:old.gg, :old.gg + 0.1dl] + .. path("d4.de.1120")[:old.yr + 500m, :old.yr + 499m] << 1.5dt + ); + } +} + diff --git a/rules/tmp-de/a/d3/91/9103.map b/rules/tmp-de/a/d3/91/9103.map new file mode 100644 index 00000000..990fb5bb --- /dev/null +++ b/rules/tmp-de/a/d3/91/9103.map @@ -0,0 +1,25 @@ +# DE 9103. Schleswig-Friedrichsberg Kreisb - Friedrichstadt Kreisbf +# +let sf = path("d4.de.9103"); + +with detail = 3 { + + + with link = "line.de.9103" { + track(:third :removed, sf[:noh + 1sw, :nor - 1sw]); + } + + with link = "point.de.Norderstapel-Kreisb" { + track(:third:station :removed, sf[:nor - 1sw, :nor + 1sw]); + track(:station :removed, + sf[:nor - 1.11sw, :nor - 1.1sw] + -- sf[:nor - 1.1sw + 1dl, :nor] >> 1dt + ); + marker(:left :de.bf :removed, sf[:nor - 0.6sw]); + } + + with link = "line.de.9103" { + track(:third :removed, sf[:nor + 1sw, :sud - 1sw]); + } +} + diff --git a/rules/tmp-de/a/d3/91/9104.map b/rules/tmp-de/a/d3/91/9104.map new file mode 100644 index 00000000..59b77fef --- /dev/null +++ b/rules/tmp-de/a/d3/91/9104.map @@ -0,0 +1,15 @@ +# DE 9104. Neuwittenbek - Kiel-Schusterkrug +# +let ns = path("d4.de.9104"); + +with detail = 3 { + # point.de.Neuwittenbek: de.1020 + + with link = "line.de.9104" { + track(:second, + ns[:nwi.f, :nwi.ys] >> 1dt + .. ns[:nwi.yys + 1dl, :rat - 1sw] + ); + } +} + diff --git a/rules/tmp-de/a/d3/91/9105.map b/rules/tmp-de/a/d3/91/9105.map new file mode 100644 index 00000000..fbd95722 --- /dev/null +++ b/rules/tmp-de/a/d3/91/9105.map @@ -0,0 +1,28 @@ +# DE 9105. Suchsdorf - Kiel-Scheerhafen +# +let sw = path("d4.de.9105"); + +with detail = 3 { + with link = "point.de.Suchsdorf-NE" { + track(:third:station, + sw[:suc - 0.5sw - 1.1dl, :suc - 0.5sw - 1dl] + -- sw[:suc - 0.5sw, :suc.yw] >> 1dt + ); + } + + with link = "line.de.9105" { + track(:third, + sw[:suc.yw - 0.1dl, :suc.yw] >> 1dt + -- sw[:suc.yw + 1100m, :wik.xa] + ); + + guide(:linenum, + sw[:suc.yw + 1.1km] >> 0.8dt + -- sw[:suc.yw + 1.1km] >> 3.0dt + ); + label(:linenum, sw[:suc.yw + 1.1km] >> 3.5dt, + hbox(:left:middle, "9105") + ); + } +} + diff --git a/rules/de/a/d3/91/9120.map b/rules/tmp-de/a/d3/91/9120.map similarity index 100% rename from rules/de/a/d3/91/9120.map rename to rules/tmp-de/a/d3/91/9120.map diff --git a/rules/de/a/d3/91/9121.map b/rules/tmp-de/a/d3/91/9121.map similarity index 100% rename from rules/de/a/d3/91/9121.map rename to rules/tmp-de/a/d3/91/9121.map diff --git a/rules/de/a/d3/91/9122.map b/rules/tmp-de/a/d3/91/9122.map similarity index 100% rename from rules/de/a/d3/91/9122.map rename to rules/tmp-de/a/d3/91/9122.map diff --git a/rules/de/a/d3/91/9123.map b/rules/tmp-de/a/d3/91/9123.map similarity index 100% rename from rules/de/a/d3/91/9123.map rename to rules/tmp-de/a/d3/91/9123.map diff --git a/rules/de/a/d3/a/a00.map b/rules/tmp-de/a/d3/a/a00.map similarity index 100% rename from rules/de/a/d3/a/a00.map rename to rules/tmp-de/a/d3/a/a00.map diff --git a/rules/tmp-de/a/d3/a/a05.map b/rules/tmp-de/a/d3/a/a05.map new file mode 100644 index 00000000..dc923d7b --- /dev/null +++ b/rules/tmp-de/a/d3/a/a05.map @@ -0,0 +1,132 @@ +# DE A05. Husum - Flensburg Weiche +# +let hf = path("d4.de.a05"); + +with detail = 3 { + # point.de.Husum de.1210 + + with link = "line.de.A05" { + track(:second :removed, + path("d4.de.1210")[:hus - 1sw, :hus - 1.01sw] << 1.5dt + .. hf[:hus.aa, :hus.yf] << 1dt + .. hf[:hus.yyf + 0.5dt, :swe - 1sw] + ); + } + + with link = "point.de.Schwesing-Nord" { + track(:second:station :removed, hf[:swe - 1sw, :swe + 1sw]); + marker(:right :de.hp :removed, hf[:swe]); + slabel(:left :removed, hf[:swe - 1.5sw] << 0.5dt, + vbox(:right:bottom, "Schwesing", "Nord") + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:swe + 1sw, :imm - 1sw]); + } + + with link = "point.de.Immenstedt-Schlesw" { + track(:second:station :removed, hf[:imm - 1sw, :imm + 1sw]); + marker(:right :de.hp :removed, hf[:imm]); + slabel(:right :removed, hf[:imm - 0.8sw] >> 2.0sh, + vbox(:left:middle, "Immenstedt", span(:light, " (Schlesw)")) + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:imm + 1sw, :vio - 1sw]); + line_label(:left:e :removed, hf[:imm + 1.7km], "A05"); + } + + with link = "point.de.Viöl" { + track(:second:station :removed, hf[:vio - 1sw, :vio + 1sw]); + marker(:right :de.hp :removed, hf[:vio]); + slabel(:right :removed, hf[:vio - 0.4sw] >> 1.7sh, "Viöl"); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:vio + 1sw, :has - 1sw]); + } + + with link = "point.de.Haselund" { + track(:second:station :removed, hf[:has - 1sw, :has + 1sw]); + marker(:right :de.hp :removed, hf[:has]); + slabel(:right :removed, hf[:has - 0.5sw] >> 1.5sh, "Haselund"); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:has + 1sw, :low - 1sw]); + } + + with link = "point.de.Löwenstedt" { + track(:second:station :removed, hf[:low - 1sw, :low.yb]); + track(:second:station :removed, + hf[:low - 0.5sw - 1.1dl, :low - 0.5sw - 1dl] + .. hf[:low - 0.5sw, :low.yb] << 1dt + ); + marker(:left :de.hp :removed, hf[:low] << 1dt); + slabel(:right :removed :bold, hf[:low - 0.7sw] >> 1.3dt, + "Löwenstedt" + ); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:low.yb, :jol - 1sw]); + line_label(:right:w :removed, hf[:jol - 1.5km], "A05"); + } + + with link = "point.de.Joldelund" { + track(:second:station :removed, hf[:jol - 1sw, :jol + 1sw]); + marker(:left :de.hp :removed, hf[:jol]); + slabel(:left :removed, hf[:jol - 0.5sw] << 1.5sh, "Joldelund"); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:jol + 1sw, :sil - 1sw]); + } + + with link = "point.de.Sillerup" { + track(:second:station :removed, hf[:sil - 1sw, :sil + 1sw]); + marker(:left :de.hp :removed, hf[:sil]); + slabel(:left :removed, hf[:sil - 0.7sw] << 1.2sh, "Sillerup"); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:sil + 1sw, :gwi - 1sw]); + } + + with link = "point.de.Großenwiehe" { + track(:second:station :removed, hf[:gwi - 1sw, :gwi + 1sw]); + marker(:left :de.hp :removed, hf[:gwi]); + slabel(:top :removed, hf[:gwi] << 1.0sh, "Großenwiehe"); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:gwi + 1sw, :wan - 1sw]); + } + + with link = "point.de.Wanderup" { + track(:second:station :removed, hf[:wan - 1sw, :wan + 1sw]); + marker(:right :de.hp :removed, hf[:wan]); + slabel(:bottom :removed, hf[:wan] >> 1.3sh, "Wanderup"); + } + + with link = "line.de.A05" { + track(:second :removed, hf[:wan + 1sw, :hau - 1sw]); + } + + with link = "point.de.Haurup" { + track(:second:station :removed, hf[:hau - 1sw, :hau + 1sw]); + marker(:right :de.hp :removed, hf[:hau]); + slabel(:left :removed, hf[:hau - 0.7sw] << 1.3dt, "Haurup"); + } + + with link = "line.de.A05" { + track(:second :removed, + hf[:hau + 1sw, :flw.aal - 1.5sw] + .. hf[:flw.aal + 749m, :flw.aal + 750m] << 1.5dt + ); + line_label(:left:e :removed, hf[:hau + 1.3km], "A05"); + } +} + diff --git a/rules/tmp-de/a/d3/a/a06.map b/rules/tmp-de/a/d3/a/a06.map new file mode 100644 index 00000000..2310e02a --- /dev/null +++ b/rules/tmp-de/a/d3/a/a06.map @@ -0,0 +1,50 @@ +# DE A06. Bredstedt - Löwenstedt +# +let bl = path("d4.de.a06"); + +with detail = 3 { + # point.de.Bredstedt de.1210 + + with link = "line.de.A06" { + track(:second :removed, + bl[:bre.yl - 0.1dl, :bre.yl] << 1.5dt + .. bl[:bre.bb + 2dt, :dre - 1sw] + ); + } + + with link = "point.de.Drelsdorf" { + track(:second:station :removed, bl[:dre - 1sw, :dre + 1sw]); + marker(:right :de.hp :removed, bl[:dre]); + slabel(:bottom :removed, bl[:dre] >> 1.2sh, "Drelsdorf"); + } + + with link = "line.de.A06" { + track(:second :removed, bl[:dre + 1sw, :kol - 1sw]); + line_label(:left:s :removed, bl[:dre + 2.0km], "A06"); + } + + with link = "point.de.Kolkerheide" { + track(:second:station :removed, bl[:kol - 1sw, :kol + 1sw]); + marker(:right :de.hp :removed, bl[:kol]); + slabel(:bottom :removed, bl[:kol] >> 1.3sh + (1sw, 0dt), "Kolkerheide"); + } + + with link = "line.de.A06" { + track(:second :removed, bl[:kol + 1sw, :kod - 1sw]); + } + + with link = "point.de.Kolkerheide" { + track(:second:station :removed, bl[:kod - 1sw, :kod + 1sw]); + marker(:left :de.hp :removed, bl[:kod]); + slabel(:left :removed, bl[:kod + 1sw] << 1.2sh, "Kolkerheide Dorf"); + } + + with link = "line.de.A06" { + track(:second :removed, + bl[:kod + 1sw, :low.yyb - 2dt] + .. bl[:low.yb, :low.yb + 0.1dl] >> 1dt + ); + } + + # point.de.Löwenstedt de.A05 +} diff --git a/rules/tmp-de/a/d3/a/a12.map b/rules/tmp-de/a/d3/a/a12.map new file mode 100644 index 00000000..a39f489e --- /dev/null +++ b/rules/tmp-de/a/d3/a/a12.map @@ -0,0 +1,24 @@ +# DE A12. Eggebek Gabelung - Sollbrück Gabelung +# +let as = path("d2.de.a12"); + +with detail = 3 { + with link = "line.de.A12" { + track(:first :gone, + as[:egg.yo - 0.1dl, :egg.yo] >> 0.5dt + .. as[:egg.yyo + 2dt, :sol - 1sw] + ); + line_label(:right:e :gone, as[:egg.yyo + 5km], "A12"); + } + + with link = "point.de.Sollerup" { + track(:first:station :gone, as[:sol - 1sw, :sol + 1sw]); + marker(:left :de.bf :gone, as[:sol] << 0.2dt); + slabel(:left :gone, as[:sol + 0.5sw] >> 1.5dt, "Sollerup"); + } + + with link = "line.de.A12" { + track(:first :gone, as[:sol + 1sw, :sog.ye]); + } +} + diff --git a/rules/tmp-de/a/d3/a/af1.map b/rules/tmp-de/a/d3/a/af1.map new file mode 100644 index 00000000..4d642228 --- /dev/null +++ b/rules/tmp-de/a/d3/a/af1.map @@ -0,0 +1,178 @@ +# DE AF1. Flensburg Kreisb - Kappeln (Schlei) +# +let fk = path("d4.de.af1"); + +with detail = 3 { + with link = "point.de.Flensburg-Kreisb" { + track(:third:station :narrow:g1000 :removed, + fk[:fkr - 0.5sw, :fkr.f] >> 1dt + ); + marker(:right :de.bf :removed, fk[:fkr + 0.2sw] >> 0.8dt); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, + fk[:fkr.f, :xgl - 1dt] >> 1dt + .. fk[:eng - 1.1sw, :run.ys] + ); + line_label(:right:w :removed, fk[:wee + 0.8km], "AF1"); + } + + with link = "point.de.Engelsby" { + marker(:right :de.khp :removed, fk[:eng]); + slabel(:right :removed :xsmall, fk[:eng + 0.2sw] >> 1.5sh, + "Engelsby" + ); + } + + with link = "point.de.Kauslund" { + marker(:right :de.khp :removed, fk[:kau]); + slabel(:left :removed :xsmall, fk[:kau + 0.5sw] << 1.0dt, + "Kauslund" + ); + } + + with link = "point.de.Wees" { + marker(:right :de.kbf :removed, fk[:wee]); + slabel(:right :removed :xsmall, fk[:wee] + (0.8sw, 0dt), + hbox(:left:top, "Wees") + ); + } + + with link = "point.de.Rothenhaus" { + marker(:right :de.kbf :removed, fk[:rot]); + slabel(:left :removed :xsmall, fk[:rot] + (-0.3sw, -0.7sh), + "Rothenhaus" + ); + } + + with link = "point.de.Glücksburg" { + marker(:right :de.kbf :removed, fk[:glu + 0.8sw]); + slabel(:right :removed :xsmall, fk[:glu + 1.4sw] << 0.8dt, + hbox(:left:base, "Glücksburg", span(:light, " (Kr Flensburg)")) + ); + } + + with link = "point.de.Rüde" { + marker(:left :de.khp :removed, fk[:rud]); + slabel(:right :removed :xsmall, fk[:rud + 0.7sw] << 1.0sw, "Rüde"); + } + + with link = "point.de.Ringsberg" { + marker(:left :de.kbf :removed, fk[:rin + 0.2sw]); + slabel(:right :removed :xsmall, fk[:rin] + (0.2sw, -1.2sw), + "Ringsberg" + ); + } + + with link = "line.de.AF1" { + line_label(:right:n :removed, fk[:rin + 1.0km], "AF1"); + } + + with link = "point.de.Langballig" { + marker(:left :de.kbf :removed, fk[:lan]); + slabel(:right :removed :xsmall, fk[:lan - 1.0sw] << 1.3sw, + "Langballig" + ); + } + + with link = "point.de.Streichmühle" { + marker(:left :de.kbf :removed, fk[:str]); + slabel(:right :removed :xsmall, fk[:str] + (-0.8sw, -1.4sw), + "Streichmühle" + ); + } + + with link = "point.de.Dollerup" { + marker(:left :de.kbf :removed, fk[:dol - 0.34sw]); + slabel(:left :removed :xsmall, fk[:dol] + (-0.8sw, 0.2sw), "Dollerup"); + } + + with link = "point.de.Nübelfeld" { + marker(:right :de.kbf :removed, fk[:nub + 0.1sw]); + slabel(:right :removed :xsmall, fk[:nub - 0.5sw] << 0.5sh, "Nübelfeld"); + } + + with link = "point.de.Steinbergkirche" { + marker(:right :de.kbf :removed, fk[:stk]); + slabel(:left :removed :xsmall, fk[:stk + 0.8sw] >> 0.8sh, + hbox(:right:top, "Steinbergkirche") + ); + } + + with link = "point.de.Steinberg-Flensburg" { + marker(:left :de.kbf :removed, fk[:ste]); + slabel(:right :removed :xsmall, fk[:ste] + (-1.2sw, -1.0sw), + vbox(:left:bottom, "Steinberg", span(:light, " (Kr Flensburg)")) + ); + } + + with link = "point.de.Niesgrau" { + marker(:left :de.kbf :removed, fk[:nie]); + slabel(:right :removed :xsmall, fk[:nie] + (-1.2sw, -1.4sw), + "Niesgrau" + ); + } + + with link = "point.de.Stausmark" { + marker(:left :de.kbf :removed, fk[:sta]); + slabel(:left :removed :xsmall, fk[:sta - 0.5sw] >> 0.1sw, + hbox(:right:top, "Stausmark") + ); + } + + with link = "line.de.AF1" { + line_label(:right:ne :removed, fk[:sta + 0.9km], "AF1"); + } + + with link = "point.de.Rundhof" { + track(:third:station :narrow:g1000 :removed, + fk[:run.ys, :run + 1sw] + ); + marker(:right :de.bf :removed, fk[:run]); + slabel(:right :removed, fk[:run] + (-0.5sw, 1.2sw), + hbox(:left:top :bold, "Rundhof") + ); + } + + with link = "line.de.AF1" { + track(:third :narrow:g1000 :removed, fk[:run + 1sw, :kap.a]); + line_label(:left:se :removed, fk[:run + 1.9km], "AF1"); + line_label(:right:ne :removed, fk[:swa + 1.1km], "AF1"); + } + + with link = "point.de.Lehbek" { + marker(:right :de.kbf :removed, fk[:leh + 0.25sw]); + slabel(:right :removed :xsmall, fk[:leh] + (-0.2sw, 1.0sw), + hbox(:left:top, "Lehbek") + ); + } + + with link = "point.de.Gelting" { + marker(:left :de.kbf :removed, fk[:gel]); + slabel(:top :removed :xsmall, fk[:gel] << 0.9sh, "Gelting"); + } + + with link = "point.de.Stenderup" { + marker(:right :de.kbf :removed, fk[:stp] >> 0.2dt); + slabel(:right :removed :xsmall, fk[:stp + 0.4sw] << 0.4sh, "Stenderup"); + } + + with link = "point.de.Schwackendorf" { + marker(:left :de.kbf :removed, fk[:swa] @ 5 << 0.2dt); + slabel(:right :removed :xsmall, fk[:swa + 0.5sw] << 1.3sh, + "Schwackendorf" + ); + } + + with link = "point.de.Rabel" { + marker(:left :de.kbf :removed, fk[:rab]); + slabel(:right :removed :xsmall, fk[:rab + 0.5sw] << 1.3sh, "Rabel"); + } + + with link = "point.de.Grimsnis" { + marker(:right :de.khp :removed, fk[:gri]); + slabel(:left :removed :xsmall, fk[:gri] + (-1.5sw, 0.5sw), "Grimsnis"); + } +} + diff --git a/rules/de/a/d3/a/af2.map b/rules/tmp-de/a/d3/a/af2.map similarity index 100% rename from rules/de/a/d3/a/af2.map rename to rules/tmp-de/a/d3/a/af2.map diff --git a/rules/tmp-de/a/d3/a/ax1.map b/rules/tmp-de/a/d3/a/ax1.map new file mode 100644 index 00000000..bc77a64b --- /dev/null +++ b/rules/tmp-de/a/d3/a/ax1.map @@ -0,0 +1,14 @@ +# DE AX1. Norderstapel Kreisb - Norderstapel +# +let bh = path("d4.de.1012"); +let sf = path("d4.de.9103"); + +with detail = 3 { + with link = "line.de.AX1" { + track(:station :removed, + sf[:nor - 0.1dl, :nor] >> 1dt + .. bh[:nor + 0.4sw, :nor + 0.41sw] >> 1dt + ); + } +} +