diff --git a/paths/nl/d4.osm b/paths/nl/d4.osm index 74205bfc..242b4f2b 100644 --- a/paths/nl/d4.osm +++ b/paths/nl/d4.osm @@ -1,6938 +1,7277 @@ - - - - - + + + + + - - - - - - - - + + + + + + + + - + - - - - - - + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - + - - - - - + + + + + - + - + - - - - + + + + - + - + - - + + - + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - + - - - + + + - + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - + - - - + + + - + - + - - - + + + - + - + - + - + - + - - - + + + - + - + - + - + - - - - - + + + + + - + - + - + - - - - - + + + + + - + - - - - + + + + - - - - - + + + + + - - + + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - - + + + + - - - - + + + + - + - + - + - - - + + + - + - + - + - + - + - - + + - + - + - + - + - + - + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + - - - - - - - - + + + + + + + + - + - + - + - + - + - + - + - - + + - - - - - - - - - - + + + + + + + + + + - + - + - + - + - + - - - - - - - + + + + + + + - - + + - - - - + + + + - + - + - + - - - + + + - + - - - + + + - + - - - + + + - - - - - + + + + + - - - - - + + + + + - + - - - + + + - + - + - - - + + + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - - + + - + - - - - + + + + - + - + - + - - - - + + + + - - - + + + - + - + - - - + + + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - - - + + + - - + + - + - + - - - + + + - - - + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - - + + + + + - + - + - + - - - + + + - + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - - + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - + - + - + - + - - + + - + - + - + - - - - - - - - + + + + + + + + - + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - - - + + + - + - - - + + + - + - + - + - + - - - - - - - + + + + + + + - + - + - - - - + + + + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + - + - + - + - - - + + + - - - - - - - - - + + + + + + + + + - - + + - + - - + + - - - - + + + + - + - - - - + + + + - + - - + + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - - + + - + - - + + - - - + + + - - - - + + + + - + - + - + - + - + - + - - + + - - + + - - + + - + - - + + - - - - + + + + - + - + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - + - + - + - - + + - + - + - - - + + + - + - + - + - - + + - - + + - + - + - - - + + + - + - - - + + + - - + + - - - + + + - + - + - + - + - + - + - + - - - + + + - - - + + + - - + + - + - - - + + + - + - + - + - - - - + + + + - + - + - + - - - - + + + + - - + + - + - - + + - - - + + + - + - - - + + + - + - + - - - + + + - + - - - - - + + + + + - + - + - - - + + + - - - + + + - - + + - + - - - - + + + + - + - + - + - + - + - + - - - + + + - + - + - - + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - - + + - + - - + + - - - + + + - + - + - - - - - - - - - - + + + + + + + + + + - + - + - + - + - + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + - - + + - + - + - - + + - + - + - + - + - - - - - - - + + + + + + + - + - + - + - - - + + + - + - + - + - - + + - - + + - + - + - + - - - - - - + + + + + + - - - - - + + + + + - + - + - + - - - - - - + + + + + - - - + + + - + - + - - + + - + - + - - - - + + + + - - - - - - - - - + + + + + + + + + - + - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - - + + + + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + - - - + + + - - - - + + + + + + + + + - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + + - - - + + + + + + + + - - - + + + + + - - - + + + + - - - + + + + - - - + + + + + + + + - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - + + + + + + + + - - - - + + + - - - - - - - - - + + + + - - - + + + - - - + + + - - - - + + + + + + + + + + - - - + + + - - - - + + + + + - - - + + + - - - + + + + + + + - - - - + + + + + + + + + + + + + + - - - - - + + + - - - + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + - - - + + + + + - - - + + + + - - - + + + - - - - + + + - - - + + + + - - - + + + - - - + + + + + + + + - - - - - + + + - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + - - - + + + + + + + + + + + + + + - - - + + + + + + + + + - - - + + + + - - - - + + + + + + + + - - - + + + + - - - + + + - - - + + + + + + + + - - - + + + + + + + + + - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/rules/nl/d3/a/az.map b/rules/nl/d3/a/az.map index 213f2e3b..5e15e170 100644 --- a/rules/nl/d3/a/az.map +++ b/rules/nl/d3/a/az.map @@ -153,7 +153,7 @@ with detail = 3 { } with link = "line.nl.AZ" { - track(:first :double :cat:dc15 :pax, az[:ndb + 1sw, :bsmz - 1sw]); + track(:first :double :cat:dc15 :pax, az[:ndb + 1sw, :craw - 2sw]); } with link = "point.nl.Bussum-Zuid" { @@ -260,7 +260,7 @@ with detail = 3 { with link = "line.nl.AZ" { track(:first :double :cat:dc15 :pax, az[:gmw + 2km, :brna + 1sw]); line_badge(:cat:dc15 :pax, az[:gmw + 2.0km], "AZ"); - track(:first :double :cat:dc15 :pax, az[:gmw + 2km, :amf.a]); + track(:first :double :cat:dc15 :pax, az[:gmw + 2km, :amf.ah]); } with link = "point.nl.Groote-Melmweg" { diff --git a/rules/nl/d3/b/bz.map b/rules/nl/d3/b/bz.map new file mode 100644 index 00000000..1c10c159 --- /dev/null +++ b/rules/nl/d3/b/bz.map @@ -0,0 +1,54 @@ +# NL BZ. Bilthoven - Zeist +# +let bz = path("d4.nl.bz"); + +with detail = 3 { + # point.nl.Bilthoven: nl.UZ + + with link = "line.nl.BZ" { + track(:first :double :removed, + bz[:bhv.yz - 0.1dl, :bhv.yz] >> 0.5dt + .. bz[:bhv.yyz, :bed - 1sw] + ); + } + + with link = "point.nl.Bosch-en-Duin" { + track(:first:station :double :removed, bz[:bed - 1sw, :bed + 1sw]); + marker(:left :de.hp :removed, bz[:bed] << 0.5dt); + slabel(:left :removed, bz[:bed] >> 1.0dt, + vbox(:right:top, "Bosch", "en Duin") + ); + } + + with link = "line.nl.BZ" { + track(:first :double :removed, bz[:bed + 1sw, :hth - 1sw]); + } + + with link = "point.nl.Huis-ter-Heide" { + track(:first:station :double :removed, bz[:hth - 1sw, :hth + 1sw]); + marker(:left :de.bf :removed, bz[:hth] << 0.5dt); + slabel(:right :removed, bz[:hth + 0.4sw] << 0.5dt << 1.4sh, + "Huis ter Heide" + ); + } + + with link = "line.nl.BZ" { + track(:first :double :removed, bz[:hth + 1sw, :zt - 1sw]); + guide(:linenum :removed, + bz[:hth + 0.9km] << 1.2dt + -- bz[:hth + 0.9km] << 3.5dt + ); + label(:linenum :removed, bz[:hth + 0.9km] << 4.0dt, + hbox(:left:middle, "BZ") + ); + } + + with link = "point.nl.Zeist" { + track(:first:station :double :removed, bz[:zt - 1sw, :zt + 1sw]); + marker(:left :de.bf :removed, bz[:zt] << 0.5dt); + slabel(:right :removed, bz[:zt + 0.4sw] << 0.5dt << 1.5sh, + span(:bold, "Zeist") + ); + } +} + diff --git a/rules/nl/d3/d/db.map b/rules/nl/d3/d/db.map new file mode 100644 index 00000000..2d27bd69 --- /dev/null +++ b/rules/nl/d3/d/db.map @@ -0,0 +1,70 @@ +# NL DB. Den Dolder - Baarn +# +let db = path("d4.nl.db"); + +with detail = 3 { + # point.nl.Den-Dolder: nl.UZ + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, + db[:dld + 0.5sw + 4dl, :dld.yb] << 1dt + .. db[:pz + 1.9dt, :pz + 2dt] + ); + } + + with link = "point.nl.De-Paltz" { + track(:first:station :cat:dc15 :pax, db[:pz + 2dt, :pz + 1sw + 2dt]); + marker(:left :de.hp :removed, db[:pz + 2dt + 0.5sw]); + slabel(:left :removed, db[:pz + 2dt] << 1.4sh, "De Paltz"); + } + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, db[:pz + 1sw + 2dt, :stz - 1sw]); + + guide(:linenum :cat:dc15 :pax, + db[:pz + 1.7km] >> 0.8dt + -- db[:pz + 1.7km] >> 3.0dt + ); + label(:linenum :cat:dc15 :pax, db[:pz + 1.7km] >> 3.0dt, + hbox(:left:middle, " DB") + ); + } + + with link = "point.nl.Soest-Zuid" { + track(:first:station :cat:dc15 :pax, db[:stz - 1sw, :stz + 1sw]); + marker(:right :de.hp :cat:dc15 :pax, db[:stz]); + slabel(:left :cat:dc15 :pax, db[:stz - 0.8sw] << 1.0dt, + "Soest Zuid" + ); + } + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, db[:stz + 1sw, :st - 1sw]); + } + + with link = "point.nl.Soest-Zuid" { + track(:first:station :cat:dc15 :pax, db[:st - 1sw, :st + 1sw]); + marker(:right :de.bf :cat:dc15 :pax, db[:st]); + slabel(:left :cat:dc15 :pax, db[:st] + (-1.8dt, 0.5sw), "Soest"); + } + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, db[:st + 1sw, :sd - 1sw]); + } + + with link = "point.nl.Soestdijk" { + track(:first:station :cat:dc15 :pax, db[:sd - 1sw, :sd + 0.5sw]); + marker(:left :de.hp :cat:dc15 :pax, db[:sd]); + slabel(:left :cat:dc15 :pax, db[:sd - 0.2sw] << 1.6sh, + "Soestdijk" + ); + } + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, + db[:sd + 0.5sw, :brna.yyd - 3dt] + .. path("d4.nl.az")[:brna.yd, :brna + 1sw] << 1.5dt + ); + } +} + diff --git a/rules/nl/d3/u/uz.map b/rules/nl/d3/u/uz.map index 4c461cb4..18f2b967 100644 --- a/rules/nl/d3/u/uz.map +++ b/rules/nl/d3/u/uz.map @@ -88,6 +88,9 @@ with detail = 3 { ); marker(:left :de.bf :cat:dc15 :pax, uz[:bhv] << 1dt); + slabel(:top :cat:dc15 :pax, uz[:bhv] << 1dt << 1.2sh, + vbox(:center:bottom :bold, " Bilt-", "hoven") + ); } with link = "line.nl.UZ" { @@ -132,6 +135,7 @@ with detail = 3 { uz[:dld + 0.5sw + 4dl, :dld + 0.5sw + 4.1dl] >> 0.5dt .. uz[:dld.yb + 1km, :amfva - 0.5sw] ); + line_badge(:cat:dc15 :pax, uz[:dld.yb + 2.5km], "UZ"); } with link = "point.nl.Amersfoort-Vlasakkers" { diff --git a/rules/nl/d4/a/az.map b/rules/nl/d4/a/az.map index de95b828..5caf0897 100644 --- a/rules/nl/d4/a/az.map +++ b/rules/nl/d4/a/az.map @@ -1396,8 +1396,8 @@ with detail = [4, 5] { with link = "line.nl.AZ" { - track(:first :double :cat:dc15 :pax, az[:brna.f, :amf.a]); - line_badge(:cat:dc15 :pax, az[:amf.a - 2.1km], "AZ"); + track(:first :double :cat:dc15 :pax, az[:brna.f, :amf.ah]); + line_badge(:cat:dc15 :pax, az[:amf.ah - 2.1km], "AZ"); } @@ -1407,5 +1407,154 @@ with detail = [4, 5] { "Groote Melmweg", "38,30" ); } + + + with link = "point.nl.Amersfoort" { + let uz = path("d4.nl.uz"); + let amf = path("d4.nl.az.amf"); + let bkd = path("d4.nl.az.bkd"); + + # Sp. 21 - 1 + track(:first:station :cat:dc15 :pax, + az[:amf.xv - 201m, :amf.xv - 200m] >> 0.5dt + .. az[:amf.xv - 100m, :amf.xv] >> 1.5dt + .. az[:amf.yu, :amf.xp] >> 4.5dt + .. az[:amf.xo - 135m + 0.7dl] >> 3.19dt + -- az[:amf.xo - 130m + 0.7dl] >> 3.17dt + .. az[:amf.xo + 30m + 0.7dl, :amf.f] >> 1.5dt + ); + + # Sp. 24 - 2 + track(:first:station :cat:dc15 :pax, + uz[:amfva + 550m, :amfva + 551m] >> 0.5dt + .. amf[:amf.yu - 100m, :amf.xp] >> 3.5dt + .. az[:amf.xo - 135m] >> 2.19dt + -- az[:amf.xo - 130m] >> 2.17dt + .. az[:amf.xo + 30m, :amf.f] >> 0.5dt + ); + track(:station :cat:dc15, + amf[:amf.yu - 101m + 0.7dl, :amf.yu - 100m + 0.7dl] >> 3.5dt + -- amf[:amf.yu + 300m + 0.7dl, :amf.yu + 301m + 0.7dl] << 4.5dt + ); + + # Sp. 25 - 3 + track(:first:station :cat:dc15 :pax, + uz[:amfva + 550m, :amfva + 551m] << 0.5dt + .. amf[:amf.yu - 100m, :amf.xp] >> 2.5dt + .. az[:amf.xo - 71m, :amf.xo - 70m] >> 1.0dt + .. az[:amf.xo + 30m, :amf.f] >> 0.5dt + ); + + # Sp. 4 - 103 + track(:first:station :cat:dc15 :pax, + az[:amf.yu - 41m + 0.7dl, :amf.yu - 40m + 0.7dl] << 0.5dt + -- az[:amf.yu + 80m + 0.7dl, :amf.xp] >> 1.5dt + .. az[:amf.xo - 71m, :amf.xo - 70m] + -- az[:amf.xo + 30m, :amf.f] << 0.5dt + ); + track(:first:station :cat:dc15 :pax, + az[:amf.xo - 71m, :amf.xo - 70m] + -- az[:amf.xo + 30m, :amf.xo + 31m] >> 0.5dt + ); + + # Sp. 26 - 5 + track(:first:station :cat:dc15 :pax, + az[:amf.ah, :amf.xp] >> 0.5dt + .. az[:amf.xo - 71m, :amf.xo - 70m] << 1.0dt + -- az[:amf.xo + 30m, :amf.xo + 31m] << 1.5dt + ); + track(:first:station :cat:dc15 :pax, + az[:amf.xo - 71m, :amf.xo - 70m] << 1.0dt + -- az[:amf.xo + 30m, :amf.xo + 31m] << 0.5dt + ); + + # Sp. 6 - 104 + track(:first:station :cat:dc15 :pax, + az[:amf.ah, :amf.xp] << 0.5dt + .. az[:amf.xo - 71m, :amf.xo - 70m] << 2.0dt + -- az[:amf.xo + 30m, :amf.f] << 1.5dt + ); + + # Sp. 7 + track(:station :cat:dc15 :pax, + az[:amf.xp - 400m, :amf.xp] << 1.5dt + ); + + # Sp. 8 + track(:station :cat:dc15, + az[:amf.xp - 400m, :amf.xp - 0.3dl] << 2.5dt + ); + + # Sp. 9 + track(:station :cat:dc15, + az[:amf.xp - 400m, :amf.xp - 0.7dl] << 3.5dt + ); + + # Sp. 10 + track(:station :cat:dc15, + az[:amf.xp - 400m, :amf.xp - 1.4dl] << 4.5dt + ); + + # Sp. 11/12 + track(:station :cat:dc15, + amf[:amf.yu - 101m, :amf.yu - 100m] >> 2.5dt + -- amf[:amf.yu + 300m, :amf + 100m] << 5.5dt + ); + + # Sp. 201/202/203 + track(:station :cat:dc15, + bkd[:amf.xv - 670m, :amf.xv - 400m] >> 1.5dt + -- bkd[:amf.xv - 250m, :amf.xv - 249m] >> 4.5dt + ); + + # Sp. 204/205/206 - 220/221/222 + track(:station :cat:dc15, + bkd[:amf.xv - 670m, :amf.xv + 120m] >> 2.5dt + ); + + # Sp. 207/208/209 + track(:station :cat:dc15, + bkd[:amf.xv - 670m, :amf.xv - 200m + 0.7dl] >> 3.5dt + -- bkd[:amf.xv + 19m, :amf.xv + 20m] >> 4.5dt + .. amf[:amf.yu - 100m, :amf.yu - 50m] >> 1.5dt + ); + + # Sp. 210/211/212 + track(:station :cat:dc15, + bkd[:amf.xv - 650m, :amf.xv - 200m] >> 4.5dt + .. bkd[:amf.xv + 19m, :amf.xv + 20m] >> 5.5dt + .. amf[:amf.yu - 100m, :amf.yu - 99m] >> 2.5dt + ); + + # Sp. 213/214/215 + track(:station :cat:dc15, + az[:amf.xv - 650m, :amf.xv - 400m] >> 5.5dt + -- bkd[:amf.xv - 250m, :amf.xv - 249m] >> 2.5dt + ); + + # Sp. 223/224/225 + track(:station :cat:dc15, + bkd[:amf.xv - 51m, :amf.xv - 50m] >> 2.5dt + -- bkd[:amf.xv, :amf.xv + 120m] >> 3.5dt + ); + + # Perron 1/2 + platform(:cat:dc15 :pax, + amf[:amf - 250m, :amf.xp] >> 4.5dt + -- amf[:amf.xp, :amf - 250m] << 3.5dt + ); + + # Perron 4/5 + platform(:cat:dc15 :pax, + amf[:amf - 250m, :amf.xp] >> 1.5dt + -- amf[:amf.xp, :amf - 250m] << 0.5dt + ); + + # Perron 6/7 + platform(:cat:dc15 :pax, + amf[:amf - 160m, :amf.xp] << 0.5dt + -- amf[:amf.xp, :amf - 160m] >> 1.5dt + ); + } } diff --git a/rules/nl/d4/b/bz.map b/rules/nl/d4/b/bz.map new file mode 100644 index 00000000..37fe6d19 --- /dev/null +++ b/rules/nl/d4/b/bz.map @@ -0,0 +1,55 @@ +# NL BZ. Bilthoven - Zeist +# +let bz = path("d4.nl.bz"); + +with detail = [4, 5] { + # point.nl.Bilthoven: nl.UZ + + + with link = "line.nl.BZ" { + track(:first :double :removed, + bz[:bhv.yz - 0.1dl, :bhv.yz] >> 0.5dt + .. bz[:bhv.yyz, :bed - 1sw] + ); + line_badge(:removed, bz[:bed - 1.3km], "BZ"); + } + + + with link = "point.nl.Bosch-en-Duin" { + track(:first:station :double :removed, bz[:bed - 1sw, :bed + 1sw]); + marker(:left :de.hp :removed, bz[:bed] << 0.5dt); + station(:top :removed, bz[:bed + 0.1sw] << 0.5dt << 1.4sh, + "Bosch en Duin", "2,9" + ); + } + + + with link = "line.nl.BZ" { + track(:first :double :removed, bz[:bed + 1sw, :hth - 1sw]); + } + + + with link = "point.nl.Huis-ter-Heide" { + track(:first:station :double :removed, bz[:hth - 1sw, :hth + 1sw]); + marker(:left :de.bf :removed, bz[:hth] << 0.5dt); + station(:right :removed, bz[:hth + 0.4sw] << 0.5dt << 1.4sh, + "Huis ter Heide", "4,2" + ); + } + + + with link = "line.nl.BZ" { + track(:first :double :removed, bz[:hth + 1sw, :zt - 1sw]); + line_badge(:removed, bz[:hth + 1.3km], "BZ"); + } + + + with link = "point.nl.Zeist" { + track(:first:station :double :removed, bz[:zt - 1sw, :zt + 1sw]); + marker(:left :de.bf :removed, bz[:zt] << 0.5dt); + station(:right :removed, bz[:zt + 0.4sw] << 0.5dt << 1.5sh, + span(:bold, "Zeist"), "BZ: 7,0" + ); + } +} + diff --git a/rules/nl/d4/d/db.map b/rules/nl/d4/d/db.map new file mode 100644 index 00000000..82a103fb --- /dev/null +++ b/rules/nl/d4/d/db.map @@ -0,0 +1,105 @@ +# NL DB. Den Dolder - Baarn +# +let db = path("d4.nl.db"); + +with detail = [4, 5] { + # point.nl.Den-Dolder: nl.UZ + + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, + db[:dld.f, :dld.yb] << 1dt + .. db[:dld.yb + 200m + 7dt, :pz - 1sw] + ); + } + + + with link = "point.nl.De-Paltz" { + track(:first:station :cat:dc15 :pax, db[:pz - 1sw, :pz + 1sw]); + marker(:left :de.hp :removed, db[:pz]); + station(:left :removed, db[:pz - 0.4sw] << 1.4sh, + "De Paltz", "2,4" + ); + } + + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax :flip, db[:pz + 1.3km, :pz + 1sw]); + line_badge(:cat:dc15 :pax, db[:pz + 1.3km] << 0.15dt, "DB"); + track(:first :cat:dc15 :pax, db[:pz + 1.3km, :stz - 100m]); + } + + + with link = "point.nl.Soest-Zuid" { + track(:first:station :cat:dc15 :pax, db[:stz - 100m, :stz + 180m]); + platform(:cat:dc15 :pax, + db[:stz - 50m, :stz + 130m] + -- db[:stz + 130m, :stz - 50m] << 0.7dt + ); + marker(:right :de.hp :cat:dc15 :pax, db[:stz] >> 0.5dt); + station(:right :cat:dc15 :pax, db[:stz + 0.4sw] >> 0.5dt >> 1.2sh, + vbox(:left:top, + span(:removed, "Nieuwe Weg"), + "Soest Zuid" + ), + "5,14" + ); + } + + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, db[:stz + 180m, :st.a]); + } + + + with link = "point.nl.Soest" { + # Sp. 1 + track(:first:station :cat:dc15 :pax, db[:st.a, :st.f]); + + # Sp. 2 + track(:station :cat:dc15 :pax, + db[:st - 201m, :st - 200m] + -- db[:st - 120m, :st + 120m] << 1dt + -- db[:st + 200m, :st + 201m] + ); + + platform(:cat:dc15 :pax, + db[:st - 80m, :st + 85m] + -- db[:st + 85m, :st - 80m] >> 1dt + ); + + marker(:right :de.bf :cat:dc15 :pax, db[:st]); + station(:left :cat:dc15 :pax, db[:st - 0.4sw] << 2.5dt, + "Soest", "6,20" + ); + } + + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax, db[:st.f, :sd - 150m]); + } + + + with link = "point.nl.Soestdijk" { + track(:first:station :cat:dc15 :pax, db[:sd - 150m, :sd + 115m]); + platform(:cat:dc15 :pax, + db[:sd - 100m, :sd + 65m] + -- db[:sd + 65m, :sd - 100m] >> 0.7dt + ); + marker(:left :de.hp :cat:dc15 :pax, db[:sd] << 0.5dt); + station(:left :cat:dc15 :pax, db[:sd - 0.15sw] << 0.5dt << 1.6sh, + "Soestdijk", "7,50" + ); + } + + + with link = "line.nl.DB" { + track(:first :cat:dc15 :pax :flip, db[:sd + 0.8km, :sd + 115m]); + line_badge(:cat:dc15 :pax, db[:sd + 0.8km] << 0.1dt, "DB"); + track(:first :cat:dc15 :pax, + db[:sd + 0.8km, :brna.yyd - 5dt] + .. path("d4.nl.az")[:brna.yd, :brna.f] << 2.5dt + ); + } +} + diff --git a/rules/nl/d4/u/uz.map b/rules/nl/d4/u/uz.map index 70277bd5..0c972ab1 100644 --- a/rules/nl/d4/u/uz.map +++ b/rules/nl/d4/u/uz.map @@ -228,9 +228,9 @@ with detail = [4, 5] { span(:removed, "De Bilt"), "Bilthoven" ), hbox(:center:top, - vbox(:right:top, "UZ: ", "BZ: "), - vbox(:right:top, "8,", "0,"), - vbox(:left:top, "93", "00") + vbox(:right:top, "UZ: ", span(:removed, "BZ: ")), + vbox(:right:top, "8,", span(:removed, "0,")), + vbox(:left:top, "93", span(:removed, "00")) ) ); } @@ -290,7 +290,7 @@ with detail = [4, 5] { station(:top :cat:dc15 :pax, uz[:dld] << 1dt << 1.5sh, span(:bold, "Den Dolder"), hbox(:center:top, - vbox(:right:top, "DB: ", "UZ: "), + vbox(:right:top, "UZ: ", "DB: "), vbox(:right:top, "11,", "0,"), vbox(:left:top, "83", "16") ) @@ -370,7 +370,7 @@ with detail = [4, 5] { # Sp. 24 track(:first:station :cat:dc15 :pax, - uz[:amfva - 300m, :amfva + 750m] >> 0.5dt + uz[:amfva - 300m, :amfva + 550m] >> 0.5dt ); track(:station :cat:dc15, uz[:amfva + 60m] >> 0.5dt @@ -379,7 +379,7 @@ with detail = [4, 5] { # Sp. 25 track(:first:station :cat:dc15 :pax, - uz[:amfva - 300m, :amfva + 750m] << 0.5dt + uz[:amfva - 300m, :amfva + 550m] << 0.5dt ); marker(:left :de.abzw :cat:dc15, uz[:amfva] << 0.5dt);