diff --git a/CMakeLists.txt b/CMakeLists.txt
index 008bd55..9239071 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,21 +17,10 @@ enable_testing()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build")
 
-
-find_package(OpenMP)
-if (OPENMP_FOUND)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
-
 # set compiler flags, see http://stackoverflow.com/questions/7724569/debug-vs-release-in-cmake
-if(OPENMP_FOUND)
-	set(CMAKE_CXX_FLAGS            "-fopenmp -Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -pedantic")
-else()
-	message(WARNING "Configuring without OpenMP!")
-	set(CMAKE_CXX_FLAGS            "-Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -pedantic")
-endif()
+set(CMAKE_CXX_FLAGS                "-Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -pedantic")
+set(CMAKE_CXX_FLAGS_SANITIZE       "-Og -g -fsanitize=address -fsanitize=leak -fsanitize=undefined -DLOGLEVEL=3 -DPFAEDLE_DBG=1")
+set(CMAKE_CXX_FLAGS_PROFILE        "-g -pg -DLOGLEVEL=3 -DPFAEDLE_DBG=1")
 set(CMAKE_CXX_FLAGS_DEBUG          "-Og -g -DLOGLEVEL=3 -DPFAEDLE_DBG=1")
 set(CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS} -DLOGLEVEL=2")
 set(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS} -DLOGLEVEL=2")
@@ -81,14 +70,7 @@ add_subdirectory(src)
 # tests
 
 add_test("utilTest" utilTest)
-
-# custom eval target
-
-add_custom_target(
-	eval
-	COMMAND make
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}//eval
-)
+add_test("pfaedleTest" pfaedleTest)
 
 # handles install target
 install(
@@ -99,3 +81,8 @@ install(
 	FILES build/pfaedle DESTINATION bin
 	PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE COMPONENT binaries
 )
+
+install(
+	FILES build/shapevl DESTINATION bin
+	PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE COMPONENT binaries
+)
diff --git a/README.md b/README.md
index 2694004..6666430 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ Status](https://travis-ci.org/ad-freiburg/pfaedle.svg?branch=master)](https://tr
 # pfaedle
 
 Precise OpenStreetMap (OSM) map-matching for public transit schedules ([GTFS](https://developers.google.com/transit/gtfs/reference/) data).
-Implementation and evaluation code for our paper [Sparse Map-Matching in Public Transit Networks with Turn Restrictions](http://ad-publications.informatik.uni-freiburg.de/SIGSPATIAL_Sparse%20map%20matching%202018.pdf).
 
 ## Requirements
 
@@ -96,48 +95,8 @@ The following flags may be useful for debugging:
  * `-T <GTFS TRIP ID>` only calculate shape for a single trip (specified via its GTFS trip id) and output it as GeoJSON to
    `<dbg-path>/path.json`
  * `--write-graph` write the graph used for routing as GeoJSON to
-   `<dbg-path>/graph.json`
- * `--write-cgraph` if `-T` is set, write the combination graph used for
-   routing as GeoJSON to `<dbg-path>/combgraph.json`
  * `--write-trgraph` write the complete network graph to `<dbg-path>/trgraph.json`
 
 # Configuration
 
 A default configuration file `pfaedle.cfg` can be found in this repo and will be installed with `make install`. Custom configuration files can be specified with the `-c` flag. If no `-c` flag is set, `pfaedle` will parse and merge the following cfg files in the given order (if present): `<install prefix>/etc/pfaedle/pfaedle.cfg`, `$HOME/.config/pfaedle/pfaedle.cfg`, `<CWD>/pfaedle.cfg`. Values given in later files will overwrite earlier defined values.
-
-# Evaluation
-
-You may run an entire evaluation of our testing datasets Vitoria-Gasteiz, Paris, Switzerland and
-Stuttgart with
-
-```
-mkdir build && cd build
-cmake ..
-make -j
-make eval
-```
-
-*Notes:*
- * this will download, and filter, the entire OSM files for Spain and the
-Stuttgart region. Make sure you have enough space left on your hard drive.
- * in evaluation mode, pfaedle needs significantly more time, because the
-   calculation of the similarity measurements between shapes are expensive
- * if you are only interested in the end results of a single dataset, run
-   `make <dataset>.lighteval` in `/eval`. For example, `make paris.lighteval`
-   generates a shaped version of the paris dataset, without doing extensive
-   comparisons to the ground truth.
- * similarily, if you want to run the extensive evaluation for a single dataset,
-   run `make <dataset>.eval` in `/eval`.
-
-
-## Evaluation requirements
-
- * zlib
-
-On Debianesque systems, type
-
-```
-sudo apt-get install zlib1g-dev
-```
-
-to install the dependencies.
diff --git a/eval/Makefile b/eval/Makefile
deleted file mode 100644
index 1cae7a8..0000000
--- a/eval/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-EVAL_DF_BINS=10,20,30,40,50,60,70,80,90,100
-
-all: eval lighteval
-
-lighteval: vitoria.lighteval stuttgart.lighteval paris.lighteval switzerland.lighteval
-
-eval: vitoria.eval stuttgart.eval paris.eval switzerland.eval
-
-clean:
-	@rm -f *.eval
-	@rm -rf gtfs
-	@rm -rf osm
-	@rm -rf evalout
-
-osmconvert:
-	@echo `date +"[%F %T.%3N]"` "EVAL : Fetching osmconvert..."
-	@curl http://m.m.i24.cc/osmconvert.c | cc -x c - -lz -O3 -o osmconvert
-
-%.lighteval: osm/%.osm gtfs/%/stops.txt gtfs/%/stop_times.txt gtfs/%/trips.txt gtfs/%/routes.txt eval.cfg
-	@echo `date +"[%F %T.%3N]"` "EVAL : Running light (without stats) evaluation for '"$*"'..."
-	@mkdir -p gtfs/$*/shaped
-	@rm -f gtfs/$*/shaped/*
-	@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg -o gtfs/$*/shaped -D -m all 2>&1 | tee $@
-
-%.eval: osm/%.osm gtfs/%/stops.txt gtfs/%/stop_times.txt gtfs/%/trips.txt gtfs/%/routes.txt eval.cfg eval-wo-osm-line-rels.cfg
-	@echo `date +"[%F %T.%3N]"` "EVAL : Running evaluation for '"$*"'..."
-	@mkdir -p gtfs/$*/shaped
-	@rm -f gtfs/$*/shaped/*
-	@mkdir -p evalout/
-	@mkdir -p evalout/$*/
-	@mkdir -p evalout/$*/hmm+osm
-	@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --eval-path evalout/$*/hmm+osm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
-	@find evalout/$*/hmm+osm/ -name "*.json" -print0 | xargs -0 rm
-
-	@mkdir -p evalout/$*/greedy
-	@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --method greedy --eval-path evalout/$*/greedy -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
-	@find evalout/$*/greedy/ -name "*.json" -print0 | xargs -0 rm
-
-	@mkdir -p evalout/$*/greedy2
-	@../build/pfaedle -x $< -i gtfs/$* -c eval.cfg --method greedy2 --eval-path evalout/$*/greedy2 -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
-	@find evalout/$*/greedy2/ -name "*.json" -print0 | xargs -0 rm
-
-	@mkdir -p evalout/$*/hmm
-	@../build/pfaedle -x $< -i gtfs/$* -c eval-wo-osm-line-rels.cfg --eval-path evalout/$*/hmm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
-	@find evalout/$*/hmm/ -name "*.json" -print0 | xargs -0 rm
-
-osm/spain-latest.osm.pbf:
-	@mkdir -p osm
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for Spain..."
-	@curl --progress-bar http://download.geofabrik.de/europe/spain-latest.osm.pbf > $@
-
-osm/spain-latest.osm: osm/spain-latest.osm.pbf osmconvert
-	@# pre-filter to vitoria gasteiz
-	@echo `date +"[%F %T.%3N]"` "EVAL : Pre-filtering OSM data to Vitoria-Gasteiz..."
-	@osmconvert -b=-2.8661,42.7480,-2.4788,43.0237 $< > $@
-
-osm/baden-wuerttemberg-latest.osm.pbf:
-	@mkdir -p osm
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for Baden-Württemberg..."
-	@curl --progress-bar http://download.geofabrik.de/europe/germany/baden-wuerttemberg-latest.osm.pbf > $@
-
-osm/baden-wuerttemberg-latest.osm: osm/baden-wuerttemberg-latest.osm.pbf osmconvert
-	@echo `date +"[%F %T.%3N]"` "EVAL : Extracting OSM data..."
-	@osmconvert $< > $@
-
-osm/france-latest.osm.pbf:
-	@mkdir -p osm
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for France..."
-	@curl --progress-bar http://download.geofabrik.de/europe/france-latest.osm.pbf > $@
-
-osm/paris-latest.osm: osm/france-latest.osm.pbf osmconvert
-	@# pre-filter to greater ile de france
-	@echo `date +"[%F %T.%3N]"` "EVAL : Pre-filtering OSM data to Île-de-France..."
-	@osmconvert -b=0.374,47.651,4.241,50.261 $< > $@
-
-osm/europe-latest.osm.pbf:
-	@mkdir -p osm
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading OSM data for Europe..."
-	@curl --progress-bar http://download.geofabrik.de/europe-latest.osm.pbf > $@
-
-osm/switzerland-latest.osm: osm/europe-latest.osm.pbf osmconvert
-	@# pre-filter to greater switzerland
-	@echo `date +"[%F %T.%3N]"` "EVAL : Pre-filtering OSM data to Switzerland..."
-	@osmconvert -b=3.757,44.245,15.579,52.670 $< > $@
-
-gtfs/vitoria/%.txt:
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Vitoria-Gasteiz..."
-	@mkdir -p gtfs
-	@mkdir -p gtfs/vitoria
-	@curl --progress-bar https://transitfeeds.com/p/tuvisa-euskotran/239/latest/download > gtfs/vitoria/gtfs.zip
-	@cd gtfs/vitoria && unzip -qq -o gtfs.zip
-	@rm gtfs/vitoria/gtfs.zip
-
-gtfs/stuttgart/%.txt:
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Stuttgart..."
-	@mkdir -p gtfs
-	@mkdir -p gtfs/stuttgart
-	@echo "******************************************************************"
-	@echo "* A password is required to access the VVS dataset. Send a mail  *"
-	@echo "* to brosi@cs.informatik.uni-freiburg.de to receive the password. "
-	@echo "******************************************************************"
-	@curl --progress-bar http://www.vvs.de/download/opendata/VVS_GTFS.zip -su vvsopendata01 > gtfs/stuttgart/gtfs.zip
-	@cd gtfs/stuttgart && unzip -qq -o gtfs.zip
-	@rm gtfs/stuttgart/gtfs.zip
-
-gtfs/paris/%.txt:
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Paris..."
-	@mkdir -p gtfs
-	@mkdir -p gtfs/paris
-	@curl --progress-bar https://transitfeeds.com/p/stif/822/latest/download > gtfs/paris/gtfs.zip
-	@cd gtfs/paris && unzip -qq -o gtfs.zip
-	@rm gtfs/paris/gtfs.zip
-
-gtfs/switzerland/%.txt:
-	@echo `date +"[%F %T.%3N]"` "EVAL : Downloading GTFS data for Switzerland..."
-	@mkdir -p gtfs
-	@mkdir -p gtfs/switzerland
-	@curl --progress-bar http://gtfs.geops.ch/dl/gtfs_complete.zip > gtfs/switzerland/gtfs.zip
-	@cd gtfs/switzerland && unzip -qq -o gtfs.zip
-	@rm gtfs/switzerland/gtfs.zip
-
-
-osm/vitoria.osm: osm/spain-latest.osm gtfs/vitoria/stops.txt gtfs/vitoria/trips.txt gtfs/vitoria/routes.txt gtfs/vitoria/stop_times.txt eval.cfg
-	@../build/pfaedle -x $< -i gtfs/vitoria/ -c eval.cfg -m all -X $@
-
-osm/stuttgart.osm: osm/baden-wuerttemberg-latest.osm gtfs/stuttgart/stops.txt gtfs/stuttgart/trips.txt gtfs/stuttgart/routes.txt gtfs/stuttgart/stop_times.txt eval.cfg
-	@../build/pfaedle -x $< -i gtfs/stuttgart/ -c eval.cfg -m all -X $@
-
-osm/paris.osm: osm/paris-latest.osm gtfs/paris/stops.txt gtfs/paris/trips.txt gtfs/paris/routes.txt gtfs/paris/stop_times.txt eval.cfg
-	@../build/pfaedle -x $< -i gtfs/paris/ -c eval.cfg -m all -X $@
-
-osm/switzerland.osm: osm/switzerland-latest.osm gtfs/switzerland/stops.txt eval.cfg
-	@../build/pfaedle -x $< -i gtfs/switzerland/ -c eval.cfg -m all -X $@
diff --git a/eval/eval-wo-osm-line-rels.cfg b/eval/eval-wo-osm-line-rels.cfg
deleted file mode 100644
index e37f2b8..0000000
--- a/eval/eval-wo-osm-line-rels.cfg
+++ /dev/null
@@ -1,987 +0,0 @@
-# Copyright 2018, University of Freiburg
-# Chair of Algorithms and Datastructures
-# Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-[rail]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	railway=rail
-	railway=light_rail
-	railway=narrow_gauge
-	route=rail
-	route=train
-	public_transport=stop_area|rel_flat
-
-osm_filter_lvl1:
-	usage=branch
-
-osm_filter_lvl2:
-
-osm_filter_lvl3:
-	service=crossover
-	service=siding
-	# we cannot completely drop service=yard, because it is often used
-	# incorrectly for crossovers
-	service=yard
-
-osm_filter_lvl4:
-
-osm_filter_lvl5:
-	usage=industrial
-	usage=military
-	usage=test
-	service=spur
-	railway:traffic_mode=freight
-
-# OSM entities to drop, as k=v. Applies to nodes, edges and
-# relations.
-# Nodes included in non-dropped ways are kept regardless of
-# a matching drop filter.
-# Ways included in non-dropped relations are kept regardless of
-# a matching drop filter.
-
-osm_filter_drop:
-	railway=abandoned
-	railway=construction
-	railway=disused
-	railway=miniature
-	railway=signal
-	railway=razed
-	railway=proposed
-	metro=yes
-	area=yes
-	# access=no
-	type=multipolygon
-	railway=platform
-	public_transport=platform
-	building=yes
-	building=train_station
-	amenity=shelter
-	amenity=bus_station
-	building=roof
-
-# Nodes that should act as "no-hup" nodes. These are nodes
-# that are contained in multiple ways, but cannot be used
-# to switch from one way to another (for example, a
-# track crossing in rail networks)
-
-osm_filter_nohup:
-	railway:switch=no
-	railway=railway_crossing
-
-# Edges that should act as one-way nodes.
-
-osm_filter_oneway:
-	oneway=yes
-	railway:preferred_direction=forward
-
-osm_filter_oneway_reverse:
-	railway:preferred_direction=backward
-
-# Edges that may explicitely be used in
-# both directions. May be used to set exception
-# to "osm_filter_oneway"
-
-osm_filter_undirected:
-	oneway=false
-	oneway=no
-	oneway=-1
-	railway:preferred_direction=both
-	railway:bidirectional=regular
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	railway=stop
-	railway=halt
-	railway=station
-	#railway=tram_stop
-	railway=subway_stop
-	tram_stop=*
-	stop=*
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	[public_transport=stop_area]uic_ref=500
-	[public_transport=stop_area]wikidata=500
-	name=100
-	[public_transport=stop_area]name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 100, 200
-
-# max edge level to which station will be snapped
-osm_max_snap_level: 2
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	[public_transport=stop_area]name
-	uic_name
-
-# the track number tag in edges, first match is taken
-osm_edge_track_number_tags:
-	railway:track_ref
-	local_ref
-	ref
-
-# the track number tag in stop nodes, first match is taken,
-# overwrites osm_edge_track_number_tags
-osm_track_number_tags:
-	local_ref
-	ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.25
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	2
-routing_lvl4_fac:	2.5
-routing_lvl5_fac:	3.5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	7
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			3000
-
-routing_station_distance_punish_fac: 3.14
-
-routing_non_osm_station_punish:		100
-
-routing_platform_unmatched_punish:	2000
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			100
-
-# Max angle in a route from a station to an already reachable neighbar
-routing_snap_full_turn_angle:	100
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  1
-
-# special line normalization for trains
-line_normalize_chain:
-	, -> ' ';
-	- -> ' ';
-	_ -> ' ';
-	" -> '';
-	' -> '';
-	` -> '';
-	/ -> ' ';
-	< -> ' ';
-	> -> ' ';
-	& -> '+';
-	ä -> ae;
-	ö -> oe;
-	ü -> ue;
-	ß -> ss;
-	è -> e;
-	é -> e;
-	á -> a;
-	à -> a;
-	ó -> o;
-	ò -> o;
-	í -> i;
-	ú -> u;
-	ù -> u;
-	ë -> e;
-	ç -> c;
-	å -> ae;
-	â -> a;
-	ê -> e;
-	ï -> i;
-	œ -> oe;
-	ø -> oe;
-	^line -> '';
-	^linie -> '';
-	^metro -> '';
-	^tram -> '';
-	^strassenbahn -> '';
-	^bus -> '';
-
-	# delete everything in brackets
-	\(.+\) -> ' ';
-	\[.+\] -> ' ';
-
-	# whitespace
-	\s+ -> ' ';
-	^\s -> '';
-	\s$ -> '';
-
-	# line/number combs ALWAYS with whitespace (ICE101 -> ICE 101)
-	^([a-zA-Z]+)([0-9]+)$ -> \1 \2;
-
-	# if a character line number is present, delete the numeric part
-	^([a-zA-Z]+) [0-9]+$ -> \1;
-
-[bus]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	# highways
-	highway=motorway
-	highway=trunk
-	highway=primary
-	highway=secondary
-	highway=tertiary
-	highway=residential
-	highway=living_street
-	highway=unclassified
-
-	# highway links
-	highway=motorway_link
-	highway=trunk_link
-	highway=primary_link
-	highway=secondary_link
-	highway=tertiary_link
-	highway=residential_link
-
-	way=primary
-	way=seconday
-	way=bus_guideway
-	highway=bus_guideway
-	busway=*
-	psv=yes
-	psv=designated
-
-	trolley_wire=yes
-	trolleywire=yes
-	trolleybus=yes
-	trolley_bus=yes
-
-	route=bus
-	route=trolleybus
-	bus=yes
-	bus=designated
-	minibus=designated
-	minibus=yes
-
-	public_transport=stop_position
-	bus_stop=*
-	stop=*
-	highway=bus_stop
-	amenity=bus_station|no_match_ways|no_match_rels
-
-	# relations for the restriction system
-	type=restriction
-	type=restriction:bus
-	type=restriction:motorcar
-
-osm_filter_lvl1:
-	highway=secondary
-	highway=secondary_link
-	bus=yes
-	bus=designated
-	minibus=yes
-	minibus=designated
-	psv=designated
-	psv=yes
-	access=psv
-	access=bus
-	trolley_wire=yes
-	trolleywire=yes
-	trolleybus=yes
-	trolley_bus=yes
-	psv=designated
-
-osm_filter_lvl2:
-	highway=tertiary
-	highway=tertiary_link
-
-osm_filter_lvl3:
-	highway=unclassified
-	highway=residential
-	highway=road
-
-osm_filter_lvl4:
-	highway=living_street
-	highway=pedestrian
-	highway=service
-	psv=no
-
-osm_filter_lvl5:
-	bus=no
-	service=siding
-	access=permissive
-	access=private
-	access=no
-	service=parking_aisle
-	highway=footway
-
-# OSM entities to drop, as k=v. Applies to nodes, edges and
-# relations.
-# Nodes included in non-dropped ways are kept regardless of
-# a matching drop filter.
-# Ways included in non-dropped relations are kept regardless of
-# a matching drop filter.
-
-osm_filter_drop:
-	area=yes
-	train=yes|no_match_ways
-	# access=no
-	public_transport=stop_area|no_match_nds|no_match_rels
-	type=multipolygon
-	railway=platform
-	railway=station
-	# service=parking_aisle
-	highway=proposed
-	highway=footway
-	highway=construction
-	building=yes
-	building=train_station
-	leisure=garden
-	leisure=park
-
-# Nodes that should act as "no-hup" nodes. These are nodes
-# that are contained in multiple ways, but cannot be used
-# to switch from one way to another (for example, a
-# track crossing in rail networks)
-
-osm_filter_nohup:
-
-# Configuration of the OSM road restriction system
-# We only support restriction with a single via node
-# atm
-
-osm_node_negative_restriction:
-	restriction=no_right_turn
-	restriction=no_left_turn
-	restriction=no_u_turn
-	restriction=no_straight_on
-	restriction:bus=no_right_turn
-	restriction:bus=no_left_turn
-	restriction:bus=no_u_turn
-	restriction:bus=no_straight_on
-
-osm_node_positive_restriction:
-	restriction=only_left_turn
-	restriction=only_straight_on
-	restriction=only_right_turn
-	restriction:bus=only_left_turn
-	restriction:bus=only_straight_on
-	restriction:bus=only_right_turn
-
-osm_filter_no_restriction:
-	except=psv|mult_val_match
-	except=bus|mult_val_match
-
-# Edges that should act as one-way nodes.
-
-osm_filter_oneway:
-	junction=roundabout		# oneway=yes is implied
-	highway=motorway		# oneway=yes is implied
-	oneway=yes
-	oneway=1
-	oneway=true
-	oneway:bus=yes
-	oneway:bus=1
-	oneway:bus=true
-	oneway:psv=yes
-	oneway:psv=1
-	oneway:psv=true
-
-osm_filter_oneway_reverse:
-	oneway=-1
-
-# Edges that may explicitely be used in
-# both directions. May be used to set exception
-# to "osm_filter_oneway"
-
-osm_filter_undirected:
-	oneway=false
-	oneway=0
-	oneway=alternating
-	oneway=reversible
-	oneway=no
-	oneway:bus=no
-	oneway:bus=0
-	oneway:bus=false
-	oneway:psv=no
-	oneway:psv=0
-	oneway:psv=false
-	busway=opposite_lane
-	busway=opposite
-	busway:left=opposite_lane
-	busway:right=opposite_lane
-	psv=opposite_lane
-	psv=opposite
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	bus_stop=*
-	stop=*
-	highway=bus_stop
-	amenity=bus_station
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10 , 50, 100
-
-osm_max_snap_level: 5
-
-osm_max_osm_station_distance: 7.5
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	uic_name
-
-# the track number tag in stop nodes, first one is taken
-osm_track_number_tags:	local_ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.25
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	1.75
-routing_lvl4_fac:	2.25
-routing_lvl5_fac:	3
-routing_lvl6_fac:	4
-routing_lvl7_fac:	5
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			500
-
-routing_station_distance_punish_fac: 2.5
-
-routing_non_osm_station_punish:		500
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			20
-
-# Max angle in a route from a station to an already reachable neighbor
-routing_snap_full_turn_angle:	110
-
-osm_max_node_block_distance:	10
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   0
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:	4
-
-routing_one_way_edge_punish:	5000
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-# routing_line_unmatched_punish_fac:  1.75
-
-[tram, subway, funicular]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	route=tram
-	railway=subway
-	railway=light_rail
-	railway=tram
-	railway=funicular
-	railway=station
-	railway=halt
-	railway=tram_stop
-	route=subway
-	route=light_rail
-	subway=yes
-	tram=yes
-
-osm_filter_lv2:
-	service=siding
-
-osm_filter_lvl5:
-	service=crossover
-	service=yard
-
-# OSM entities to drop, as k=v. Applies to nodes, edges and
-# relations.
-# Nodes included in non-dropped ways are kept regardless of
-# a matching drop filter.
-# Ways included in non-dropped relations are kept regardless of
-# a matching drop filter.
-
-osm_filter_drop:
-	area=yes
-	public_transport=stop_area
-	type=multipolygon
-	railway=platform
-	public_transport=platform
-	service=alley
-
-# Nodes that should act as "no-hup" nodes. These are nodes
-# that are contained in multiple ways, but cannot be used
-# to switch from one way to another (for example, a
-# track crossing in rail networks)
-
-osm_filter_nohup:
-	railway:switch=no
-	railway=railway_crossing
-
-# Edges that should act as one-way nodes.
-
-osm_filter_oneway:
-	oneway=yes
-
-# Edges that may explicitely be used in
-# both directions. May be used to set exception
-# to "osm_filter_oneway"
-
-osm_filter_undirected:
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	station=subway
-	station=tram
-	railway=stop
-	railway=halt
-	railway=station
-	railway=tram_stop
-	railway=subway_stop
-	tram_stop=*
-	stop=*
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 50, 100
-
-osm_max_snap_level: 4
-
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	uic_name
-
-# the track number tag in stop nodes, first one is taken
-osm_track_number_tags:	local_ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			2000
-
-routing_station_distance_punish_fac: 3.14
-
-routing_non_osm_station_punish:	235
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			80
-
-# Max angle in a route from a station to an already reachable neighbar
-routing_snap_full_turn_angle:	80
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-[ferry]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	route=ferry
-	waterway=river
-	motorboat=yes
-	ferry=yes
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	station=ferry
-	railway=stop
-	railway=halt
-	railway=station
-	stop=*
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 100, 200
-
-osm_max_snap_level: 4
-
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	uic_name
-
-# the track number tag in stop nodes, first one is taken
-osm_track_number_tags:	local_ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			100
-
-routing_station_distance_punish_fac: 3.14
-
-routing_non_osm_station_punish:	50
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			45
-
-# Max angle in a route from a station to an already reachable neighbar
-routing_snap_full_turn_angle:	0
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   0
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-[tram, bus, subway, rail, gondola, funicular, ferry]
-# Regular expressions and station comparision is
-# always case insensitive!
-station_normalize_chain:
-	, -> ' ';
-	- -> ' ';
-	— -> ' ';
-	_ -> ' ';
-	" -> '';
-	' -> '';
-	` -> '';
-	\( -> ' ';
-	\) -> ' ';
-	\[ -> ' ';
-	\] -> ' ';
-	/ -> ' ';
-	'\\' -> ' ';
-	< -> ' ';
-	> -> ' ';
-	& -> '+';
-	ä -> ae;
-	ö -> oe;
-	ü -> ue;
-	ß -> ss;
-	è -> e;
-	é -> e;
-	á -> a;
-	à -> a;
-	ó -> o;
-	ò -> o;
-	ô -> o;
-	ç -> c;
-	í -> i;
-	ú -> u;
-	ù -> u;
-	ë -> e;
-	å -> ae;
-	â -> a;
-	ê -> e;
-	ï -> i;
-	œ -> oe;
-	ø -> oe;
-	str\. -> strasse;
-	av\. -> avenue;
-
-	# always separate 'street', 'strasse'
-	'([a-zA-Z])strasse($| )' -> '\1 strasse\2';
-	'([a-zA-Z])street($| )' -> '\1 street\2';
-
-	# always use "street"
-	'(^| )strasse($| )' -> '\1street\2';
-
-	# always use "avenue"
-	'(^| )avenida($| )' -> '\1avenue\2';
-	'(^| )avenu($| )' -> '\1avenue\2';
-
-	# normalize every possible abbr. of german "Bahnhof", "Hauptbahnhof", "Busbahnhof"
-	'(^| )hauptbf\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hauptbf($| )' -> '\1hauptbahnhof\2';
-	'(^| )hauptbhf\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hauptbhf($| )' -> '\1hauptbahnhof\2';
-	'(^| )zentraler busbahnhof($| )$' -> \1busbahnhof\2;
-	'(^| )zentraler omnibusbahnhof($| )$' -> \1busbahnhof\2;
-	'(^| )omnibusbahnhof($| )' -> '\1busbahnhof\2';
-	'(^| )omnibusbhf($| )' -> '\1busbahnhof\2';
-	'(^| )busbf\.($| )' -> '\1busbahnhof\2';
-	'(^| )busbf($| )' -> '\1busbahnhof\2';
-	'(^| )bus bf\.($| )' -> '\1busbahnhof\2';
-	'(^| )bus bf($| )' -> '\1busbahnhof\2';
-	'(^| )busbhf\.($| )' -> '\1busbahnhof\2';
-	'(^| )busbhf($| )' -> '\1busbahnhof\2';
-	'(^| )bus bhf\.($| )' -> '\1busbahnhof\2';
-	'(^| )bus bhf($| )' -> '\1busbahnhof\2';
-	'(^| )zob($| )' -> '\1busbahnhof\2';
-	'(^| )hbf\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hbf($| )' -> '\1hauptbahnhof\2';
-	'(^| )hb\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hb($| )' -> '\1hauptbahnhof\2';
-	'(^| )bf\.($| )' -> '\1bahnhof\2';
-	'(^| )bf($| )' -> '\1bahnhof\2';
-	'(^| )bhf\.($| )' -> '\1bahnhof\2';
-	'(^| )bhf($| )' -> '\1bahnhof\2';
-	'(^| )bhfeingang($| )' -> '\1bahnhofeingang\2';
-	'(^| )gare de($| )' -> '\1gare\2';
-
-
-	# if a stations starts with  single station identifier
-	# always put it at the end (for example, "hauptbahnhof freiburg" becomes "freiburg hauptbahnhof")
-	'^hauptbahnhof (.+)$' -> \1 hauptbahnhof;
-	'^bahnhof (.+)$' -> \1 bahnhof;
-	'^busbahnhof (.+)$' -> \1 busbahnhof;
-	'^gare (.+)$' -> \1 gare;
-	'^station (.+)$' -> \1 station;
-
-	'(^| )busbahnhof($| )' -> '\1bbahnhof\2';
-
-	# normalize line types in station names
-	'(^| )u bahn\.($| )' -> '\1ubahn\2';
-	'(^| )metro\.($| )' -> '\1ubahn\2';
-	'(^| )subway\.($| )' -> '\1ubahn\2';
-	'(^| )underground\.($| )' -> '\1ubahn\2';
-	'(^| )ubahn($| )' -> '\1u\2';
-	'(^| )s bahn\.($| )' -> '\1sbahn\2';
-	'(^| )sbahn($| )' -> '\1s\2';
-	'(^| )tramway($| )' -> '\1tram\2';
-	'(^| )stadtbahn($| )' -> '\1tram\2';
-	'(^| )strassenbahn($| )' -> '\1tram\2';
-	'(^| )streetcar($| )' -> '\1tram\2';
-	'(^| )tram($| )' -> '\1t\2';
-
-	# delete track information from name
-	'(^| )kante [a-zA-Z0-9]{1,2}($| )' -> ' ';
-	'(^| )gleis [a-zA-Z0-9]{1,2}($| )' -> ' ';
-	'(^| )track [a-zA-Z0-9]{1,2}($| )' -> ' ';
-	'(^| )voie [a-zA-Z0-9]{1,2}($| )' -> ' ';
-
-	# abbrv
-	'(^| )und($| )' -> '\1+\2';
-	'(^| )and($| )' -> '\1+\2';
-	'(^| )et($| )' -> '\1+\2';
-
-	# noise
-	'\sde\s' -> ' ';
-	'\sda\s' -> ' ';
-	'\sdi\s' -> ' ';
-	'\sdel\s' -> ' ';
-	'\sdal\s' -> ' ';
-
-	# abbrv in most western languages
-	'(^| )saint ' -> '\1st. ';
-	'(^| )sankt ' -> '\1st. ';
-	'(^| )sanct ' -> '\1st. ';
-
-	\. -> ' ';
-
-	# whitespace
-	\s+ -> ' ';
-	^\s -> '';
-	\s$ -> '';
-
-line_normalize_chain:
-	, -> ' ';
-	- -> ' ';
-	_ -> ' ';
-	" -> '';
-	' -> '';
-	` -> '';
-	/ -> ' ';
-	< -> ' ';
-	> -> ' ';
-	& -> '+';
-	ä -> ae;
-	ö -> oe;
-	ü -> ue;
-	ß -> ss;
-	è -> e;
-	é -> e;
-	á -> a;
-	à -> a;
-	ó -> o;
-	ò -> o;
-	í -> i;
-	ú -> u;
-	ù -> u;
-	ë -> e;
-	å -> ae;
-	ç -> c;
-	â -> a;
-	ê -> e;
-	ï -> i;
-	œ -> oe;
-	ø -> oe;
-	^line -> '';
-	^linie -> '';
-	^metro -> '';
-	^tram -> '';
-	^strassenbahn -> '';
-	^bus -> '';
-
-	# delete everything in brackets
-	\(.+\) -> ' ';
-	\[.+\] -> ' ';
-
-	# whitespace
-	\s+ -> ' ';
-	^\s -> '';
-	\s$ -> '';
-
-	# line/number combs ALWAYS without whitespace (T 2 -> T2)
-	^([a-zA-Z]+) ([0-9]+)$ -> \1\2;
-
-track_normalize_chain:
-	'(^| )gleis($| )' -> '';
-	'(^| )gl\.($| )' -> '';
-	'(^| )platform($| )' -> '';
-	'(^| )track($| )' -> '';
-	'(^| )rail($| )' -> '';
-	# line/number combs ALWAYS without whitespace (1 A -> 1A)
-	^([a-zA-Z]+) ([0-9]+)$ -> \1\2;
-	^([0-9]+) ([a-zA-Z]+)$ -> \1\2;
-
-	# delete track numbers greater than 999
-	^[0-9]{4,}$ -> '';
diff --git a/eval/eval.cfg b/eval/eval.cfg
deleted file mode 100644
index ab4189c..0000000
--- a/eval/eval.cfg
+++ /dev/null
@@ -1,1002 +0,0 @@
-# Copyright 2018, University of Freiburg
-# Chair of Algorithms and Datastructures
-# Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-[rail]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	railway=rail
-	railway=light_rail
-	railway=narrow_gauge
-	route=rail
-	route=train
-	public_transport=stop_area|rel_flat
-
-osm_filter_lvl1:
-	usage=branch
-
-osm_filter_lvl2:
-
-osm_filter_lvl3:
-	service=crossover
-	service=siding
-	# we cannot completely drop service=yard, because it is often used
-	# incorrectly for crossovers
-	service=yard
-
-osm_filter_lvl4:
-
-osm_filter_lvl5:
-	usage=industrial
-	usage=military
-	usage=test
-	service=spur
-	railway:traffic_mode=freight
-
-# OSM entities to drop, as k=v. Applies to nodes, edges and
-# relations.
-# Nodes included in non-dropped ways are kept regardless of
-# a matching drop filter.
-# Ways included in non-dropped relations are kept regardless of
-# a matching drop filter.
-
-osm_filter_drop:
-	railway=abandoned
-	railway=construction
-	railway=disused
-	railway=miniature
-	railway=signal
-	railway=razed
-	railway=proposed
-	metro=yes
-	area=yes
-	# access=no
-	type=multipolygon
-	railway=platform
-	public_transport=platform
-	building=yes
-	building=train_station
-	amenity=shelter
-	amenity=bus_station
-	building=roof
-
-# Nodes that should act as "no-hup" nodes. These are nodes
-# that are contained in multiple ways, but cannot be used
-# to switch from one way to another (for example, a
-# track crossing in rail networks)
-
-osm_filter_nohup:
-	railway:switch=no
-	railway=railway_crossing
-
-# Edges that should act as one-way nodes.
-
-osm_filter_oneway:
-	oneway=yes
-	railway:preferred_direction=forward
-
-osm_filter_oneway_reverse:
-	railway:preferred_direction=backward
-
-# Edges that may explicitely be used in
-# both directions. May be used to set exception
-# to "osm_filter_oneway"
-
-osm_filter_undirected:
-	oneway=false
-	oneway=no
-	oneway=-1
-	railway:preferred_direction=both
-	railway:bidirectional=regular
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	railway=stop
-	railway=halt
-	railway=station
-	#railway=tram_stop
-	railway=subway_stop
-	tram_stop=*
-	stop=*
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-	line_name=ref,name   # careful, no space after/before comma allowed!
-	from_name=from
-	to_name=to
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	[public_transport=stop_area]uic_ref=500
-	[public_transport=stop_area]wikidata=500
-	name=100
-	[public_transport=stop_area]name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 100, 200
-
-# max edge level to which station will be snapped
-osm_max_snap_level: 2
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	[public_transport=stop_area]name
-	uic_name
-
-# the track number tag in edges, first match is taken
-osm_edge_track_number_tags:
-	railway:track_ref
-	local_ref
-	ref
-
-# the track number tag in stop nodes, first match is taken,
-# overwrites osm_edge_track_number_tags
-osm_track_number_tags:
-	local_ref
-	ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.25
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	2
-routing_lvl4_fac:	2.5
-routing_lvl5_fac:	3.5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	7
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			3000
-
-routing_station_distance_punish_fac: 3.14
-
-routing_non_osm_station_punish:		100
-
-routing_platform_unmatched_punish:	2000
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			100
-
-# Max angle in a route from a station to an already reachable neighbar
-routing_snap_full_turn_angle:	100
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  1
-
-# special line normalization for trains
-line_normalize_chain:
-	, -> ' ';
-	- -> ' ';
-	_ -> ' ';
-	" -> '';
-	' -> '';
-	` -> '';
-	/ -> ' ';
-	< -> ' ';
-	> -> ' ';
-	& -> '+';
-	ä -> ae;
-	ö -> oe;
-	ü -> ue;
-	ß -> ss;
-	è -> e;
-	é -> e;
-	á -> a;
-	à -> a;
-	ó -> o;
-	ò -> o;
-	í -> i;
-	ú -> u;
-	ù -> u;
-	ë -> e;
-	ç -> c;
-	å -> ae;
-	â -> a;
-	ê -> e;
-	ï -> i;
-	œ -> oe;
-	ø -> oe;
-	^line -> '';
-	^linie -> '';
-	^metro -> '';
-	^tram -> '';
-	^strassenbahn -> '';
-	^bus -> '';
-
-	# delete everything in brackets
-	\(.+\) -> ' ';
-	\[.+\] -> ' ';
-
-	# whitespace
-	\s+ -> ' ';
-	^\s -> '';
-	\s$ -> '';
-
-	# line/number combs ALWAYS with whitespace (ICE101 -> ICE 101)
-	^([a-zA-Z]+)([0-9]+)$ -> \1 \2;
-
-	# if a character line number is present, delete the numeric part
-	^([a-zA-Z]+) [0-9]+$ -> \1;
-
-[bus]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	# highways
-	highway=motorway
-	highway=trunk
-	highway=primary
-	highway=secondary
-	highway=tertiary
-	highway=residential
-	highway=living_street
-	highway=unclassified
-
-	# highway links
-	highway=motorway_link
-	highway=trunk_link
-	highway=primary_link
-	highway=secondary_link
-	highway=tertiary_link
-	highway=residential_link
-
-	way=primary
-	way=seconday
-	way=bus_guideway
-	highway=bus_guideway
-	busway=*
-	psv=yes
-	psv=designated
-
-	trolley_wire=yes
-	trolleywire=yes
-	trolleybus=yes
-	trolley_bus=yes
-
-	route=bus
-	route=trolleybus
-	bus=yes
-	bus=designated
-	minibus=designated
-	minibus=yes
-
-	public_transport=stop_position
-	bus_stop=*
-	stop=*
-	highway=bus_stop
-	amenity=bus_station|no_match_ways|no_match_rels
-
-	# relations for the restriction system
-	type=restriction
-	type=restriction:bus
-	type=restriction:motorcar
-
-osm_filter_lvl1:
-	highway=secondary
-	highway=secondary_link
-	bus=yes
-	bus=designated
-	minibus=yes
-	minibus=designated
-	psv=designated
-	psv=yes
-	access=psv
-	access=bus
-	trolley_wire=yes
-	trolleywire=yes
-	trolleybus=yes
-	trolley_bus=yes
-	psv=designated
-
-osm_filter_lvl2:
-	highway=tertiary
-	highway=tertiary_link
-
-osm_filter_lvl3:
-	highway=unclassified
-	highway=residential
-	highway=road
-
-osm_filter_lvl4:
-	highway=living_street
-	highway=pedestrian
-	highway=service
-	psv=no
-
-osm_filter_lvl5:
-	bus=no
-	service=siding
-	access=permissive
-	access=private
-	access=no
-	service=parking_aisle
-	highway=footway
-
-# OSM entities to drop, as k=v. Applies to nodes, edges and
-# relations.
-# Nodes included in non-dropped ways are kept regardless of
-# a matching drop filter.
-# Ways included in non-dropped relations are kept regardless of
-# a matching drop filter.
-
-osm_filter_drop:
-	area=yes
-	train=yes|no_match_ways
-	# access=no
-	public_transport=stop_area|no_match_nds|no_match_rels
-	type=multipolygon
-	railway=platform
-	railway=station
-	# service=parking_aisle
-	highway=proposed
-	highway=footway
-	highway=construction
-	building=yes
-	building=train_station
-	leisure=garden
-	leisure=park
-
-# Nodes that should act as "no-hup" nodes. These are nodes
-# that are contained in multiple ways, but cannot be used
-# to switch from one way to another (for example, a
-# track crossing in rail networks)
-
-osm_filter_nohup:
-
-# Configuration of the OSM road restriction system
-# We only support restriction with a single via node
-# atm
-
-osm_node_negative_restriction:
-	restriction=no_right_turn
-	restriction=no_left_turn
-	restriction=no_u_turn
-	restriction=no_straight_on
-	restriction:bus=no_right_turn
-	restriction:bus=no_left_turn
-	restriction:bus=no_u_turn
-	restriction:bus=no_straight_on
-
-osm_node_positive_restriction:
-	restriction=only_left_turn
-	restriction=only_straight_on
-	restriction=only_right_turn
-	restriction:bus=only_left_turn
-	restriction:bus=only_straight_on
-	restriction:bus=only_right_turn
-
-osm_filter_no_restriction:
-	except=psv|mult_val_match
-	except=bus|mult_val_match
-
-# Edges that should act as one-way nodes.
-
-osm_filter_oneway:
-	junction=roundabout		# oneway=yes is implied
-	highway=motorway		# oneway=yes is implied
-	oneway=yes
-	oneway=1
-	oneway=true
-	oneway:bus=yes
-	oneway:bus=1
-	oneway:bus=true
-	oneway:psv=yes
-	oneway:psv=1
-	oneway:psv=true
-
-osm_filter_oneway_reverse:
-	oneway=-1
-
-# Edges that may explicitely be used in
-# both directions. May be used to set exception
-# to "osm_filter_oneway"
-
-osm_filter_undirected:
-	oneway=false
-	oneway=0
-	oneway=alternating
-	oneway=reversible
-	oneway=no
-	oneway:bus=no
-	oneway:bus=0
-	oneway:bus=false
-	oneway:psv=no
-	oneway:psv=0
-	oneway:psv=false
-	busway=opposite_lane
-	busway=opposite
-	busway:left=opposite_lane
-	busway:right=opposite_lane
-	psv=opposite_lane
-	psv=opposite
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	bus_stop=*
-	stop=*
-	highway=bus_stop
-	amenity=bus_station
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-	line_name=ref,name   # careful, no space after/before comma allowed!
-	from_name=from
-	to_name=to
-
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10 , 50, 100
-
-osm_max_snap_level: 5
-
-osm_max_osm_station_distance: 7.5
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	uic_name
-
-# the track number tag in stop nodes, first one is taken
-osm_track_number_tags:	local_ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.25
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	1.75
-routing_lvl4_fac:	2.25
-routing_lvl5_fac:	3
-routing_lvl6_fac:	4
-routing_lvl7_fac:	5
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			500
-
-routing_station_distance_punish_fac: 2.5
-
-routing_non_osm_station_punish:		500
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			20
-
-# Max angle in a route from a station to an already reachable neighbor
-routing_snap_full_turn_angle:	110
-
-osm_max_node_block_distance:	10
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   0
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:	4
-
-routing_one_way_edge_punish:	5000
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-# routing_line_unmatched_punish_fac:  1.75
-
-[tram, subway, funicular]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	route=tram
-	railway=subway
-	railway=light_rail
-	railway=tram
-	railway=funicular
-	railway=station
-	railway=halt
-	railway=tram_stop
-	route=subway
-	route=light_rail
-	subway=yes
-	tram=yes
-
-osm_filter_lv2:
-	service=siding
-
-osm_filter_lvl5:
-	service=crossover
-	service=yard
-
-# OSM entities to drop, as k=v. Applies to nodes, edges and
-# relations.
-# Nodes included in non-dropped ways are kept regardless of
-# a matching drop filter.
-# Ways included in non-dropped relations are kept regardless of
-# a matching drop filter.
-
-osm_filter_drop:
-	area=yes
-	public_transport=stop_area
-	type=multipolygon
-	railway=platform
-	public_transport=platform
-	service=alley
-
-# Nodes that should act as "no-hup" nodes. These are nodes
-# that are contained in multiple ways, but cannot be used
-# to switch from one way to another (for example, a
-# track crossing in rail networks)
-
-osm_filter_nohup:
-	railway:switch=no
-	railway=railway_crossing
-
-# Edges that should act as one-way nodes.
-
-osm_filter_oneway:
-	oneway=yes
-
-# Edges that may explicitely be used in
-# both directions. May be used to set exception
-# to "osm_filter_oneway"
-
-osm_filter_undirected:
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	station=subway
-	station=tram
-	railway=stop
-	railway=halt
-	railway=station
-	railway=tram_stop
-	railway=subway_stop
-	tram_stop=*
-	stop=*
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-	line_name=ref,name   # careful, no space after/before comma allowed!
-	from_name=from
-	to_name=to
-
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 50, 100
-
-osm_max_snap_level: 4
-
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	uic_name
-
-# the track number tag in stop nodes, first one is taken
-osm_track_number_tags:	local_ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			2000
-
-routing_station_distance_punish_fac: 3.14
-
-routing_non_osm_station_punish:	235
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			80
-
-# Max angle in a route from a station to an already reachable neighbar
-routing_snap_full_turn_angle:	80
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-[ferry]
-
-# OSM entities to keep on different levels, as k=v. Applies
-# to nodes, edges and relations.
-# Nodes included in kept ways are always kept.
-# Ways included in kept relations are always kept.
-
-osm_filter_keep:
-	route=ferry
-	waterway=river
-	motorboat=yes
-	ferry=yes
-
-# Nodes that are stations.
-# Only nodes that have been kept during the filtering above will be
-# checked.
-osm_filter_station:
-	public_transport=stop_position
-	station=ferry
-	railway=stop
-	railway=halt
-	railway=station
-	stop=*
-
-# Relation fields that should be used for catching the lines that
-# occur on an edge. Only relations that have been kept during the
-# filtering above will be checked. The 'linename' will be normalized
-# according to the rules in line_normalization_chain.
-# The 'from_name' and 'to_name' will be normalized according to the
-# rules in station_normalization_chain.
-# The relations tags are given in the order of their relevance -
-# the first normalized tag-value that is not null/empty will be
-# taken.
-osm_line_relation_tags:
-	line_name=ref,name   # careful, no space after/before comma allowed!
-	from_name=from
-	to_name=to
-
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 100, 200
-
-osm_max_snap_level: 4
-
-
-# sorted by priority, first found attr will be taken
-osm_station_name_attrs:
-	name
-	uic_name
-
-# the track number tag in stop nodes, first one is taken
-osm_track_number_tags:	local_ref
-
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle performans a full turn
-routing_full_turn_punish:			100
-
-routing_station_distance_punish_fac: 3.14
-
-routing_non_osm_station_punish:	50
-
-# Max angle that should be counted as a full turn
-routing_full_turn_angle:			45
-
-# Max angle in a route from a station to an already reachable neighbar
-routing_snap_full_turn_angle:	0
-
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   0
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-[tram, bus, subway, rail, gondola, funicular, ferry]
-# Regular expressions and station comparision is
-# always case insensitive!
-station_normalize_chain:
-	, -> ' ';
-	- -> ' ';
-	— -> ' ';
-	_ -> ' ';
-	" -> '';
-	' -> '';
-	` -> '';
-	\( -> ' ';
-	\) -> ' ';
-	\[ -> ' ';
-	\] -> ' ';
-	/ -> ' ';
-	'\\' -> ' ';
-	< -> ' ';
-	> -> ' ';
-	& -> '+';
-	ä -> ae;
-	ö -> oe;
-	ü -> ue;
-	ß -> ss;
-	è -> e;
-	é -> e;
-	á -> a;
-	à -> a;
-	ó -> o;
-	ò -> o;
-	ô -> o;
-	ç -> c;
-	í -> i;
-	ú -> u;
-	ù -> u;
-	ë -> e;
-	å -> ae;
-	â -> a;
-	ê -> e;
-	ï -> i;
-	œ -> oe;
-	ø -> oe;
-	str\. -> strasse;
-	av\. -> avenue;
-
-	# always separate 'street', 'strasse'
-	'([a-zA-Z])strasse($| )' -> '\1 strasse\2';
-	'([a-zA-Z])street($| )' -> '\1 street\2';
-
-	# always use "street"
-	'(^| )strasse($| )' -> '\1street\2';
-
-	# always use "avenue"
-	'(^| )avenida($| )' -> '\1avenue\2';
-	'(^| )avenu($| )' -> '\1avenue\2';
-
-	# normalize every possible abbr. of german "Bahnhof", "Hauptbahnhof", "Busbahnhof"
-	'(^| )hauptbf\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hauptbf($| )' -> '\1hauptbahnhof\2';
-	'(^| )hauptbhf\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hauptbhf($| )' -> '\1hauptbahnhof\2';
-	'(^| )zentraler busbahnhof($| )$' -> \1busbahnhof\2;
-	'(^| )zentraler omnibusbahnhof($| )$' -> \1busbahnhof\2;
-	'(^| )omnibusbahnhof($| )' -> '\1busbahnhof\2';
-	'(^| )omnibusbhf($| )' -> '\1busbahnhof\2';
-	'(^| )busbf\.($| )' -> '\1busbahnhof\2';
-	'(^| )busbf($| )' -> '\1busbahnhof\2';
-	'(^| )bus bf\.($| )' -> '\1busbahnhof\2';
-	'(^| )bus bf($| )' -> '\1busbahnhof\2';
-	'(^| )busbhf\.($| )' -> '\1busbahnhof\2';
-	'(^| )busbhf($| )' -> '\1busbahnhof\2';
-	'(^| )bus bhf\.($| )' -> '\1busbahnhof\2';
-	'(^| )bus bhf($| )' -> '\1busbahnhof\2';
-	'(^| )zob($| )' -> '\1busbahnhof\2';
-	'(^| )hbf\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hbf($| )' -> '\1hauptbahnhof\2';
-	'(^| )hb\.($| )' -> '\1hauptbahnhof\2';
-	'(^| )hb($| )' -> '\1hauptbahnhof\2';
-	'(^| )bf\.($| )' -> '\1bahnhof\2';
-	'(^| )bf($| )' -> '\1bahnhof\2';
-	'(^| )bhf\.($| )' -> '\1bahnhof\2';
-	'(^| )bhf($| )' -> '\1bahnhof\2';
-	'(^| )bhfeingang($| )' -> '\1bahnhofeingang\2';
-	'(^| )gare de($| )' -> '\1gare\2';
-
-
-	# if a stations starts with  single station identifier
-	# always put it at the end (for example, "hauptbahnhof freiburg" becomes "freiburg hauptbahnhof")
-	'^hauptbahnhof (.+)$' -> \1 hauptbahnhof;
-	'^bahnhof (.+)$' -> \1 bahnhof;
-	'^busbahnhof (.+)$' -> \1 busbahnhof;
-	'^gare (.+)$' -> \1 gare;
-	'^station (.+)$' -> \1 station;
-
-	'(^| )busbahnhof($| )' -> '\1bbahnhof\2';
-
-	# normalize line types in station names
-	'(^| )u bahn\.($| )' -> '\1ubahn\2';
-	'(^| )metro\.($| )' -> '\1ubahn\2';
-	'(^| )subway\.($| )' -> '\1ubahn\2';
-	'(^| )underground\.($| )' -> '\1ubahn\2';
-	'(^| )ubahn($| )' -> '\1u\2';
-	'(^| )s bahn\.($| )' -> '\1sbahn\2';
-	'(^| )sbahn($| )' -> '\1s\2';
-	'(^| )tramway($| )' -> '\1tram\2';
-	'(^| )stadtbahn($| )' -> '\1tram\2';
-	'(^| )strassenbahn($| )' -> '\1tram\2';
-	'(^| )streetcar($| )' -> '\1tram\2';
-	'(^| )tram($| )' -> '\1t\2';
-
-	# delete track information from name
-	'(^| )kante [a-zA-Z0-9]{1,2}($| )' -> ' ';
-	'(^| )gleis [a-zA-Z0-9]{1,2}($| )' -> ' ';
-	'(^| )track [a-zA-Z0-9]{1,2}($| )' -> ' ';
-	'(^| )voie [a-zA-Z0-9]{1,2}($| )' -> ' ';
-
-	# abbrv
-	'(^| )und($| )' -> '\1+\2';
-	'(^| )and($| )' -> '\1+\2';
-	'(^| )et($| )' -> '\1+\2';
-
-	# noise
-	'\sde\s' -> ' ';
-	'\sda\s' -> ' ';
-	'\sdi\s' -> ' ';
-	'\sdel\s' -> ' ';
-	'\sdal\s' -> ' ';
-
-	# abbrv in most western languages
-	'(^| )saint ' -> '\1st. ';
-	'(^| )sankt ' -> '\1st. ';
-	'(^| )sanct ' -> '\1st. ';
-
-	\. -> ' ';
-
-	# whitespace
-	\s+ -> ' ';
-	^\s -> '';
-	\s$ -> '';
-
-line_normalize_chain:
-	, -> ' ';
-	- -> ' ';
-	_ -> ' ';
-	" -> '';
-	' -> '';
-	` -> '';
-	/ -> ' ';
-	< -> ' ';
-	> -> ' ';
-	& -> '+';
-	ä -> ae;
-	ö -> oe;
-	ü -> ue;
-	ß -> ss;
-	è -> e;
-	é -> e;
-	á -> a;
-	à -> a;
-	ó -> o;
-	ò -> o;
-	í -> i;
-	ú -> u;
-	ù -> u;
-	ë -> e;
-	å -> ae;
-	ç -> c;
-	â -> a;
-	ê -> e;
-	ï -> i;
-	œ -> oe;
-	ø -> oe;
-	^line -> '';
-	^linie -> '';
-	^metro -> '';
-	^tram -> '';
-	^strassenbahn -> '';
-	^bus -> '';
-
-	# delete everything in brackets
-	\(.+\) -> ' ';
-	\[.+\] -> ' ';
-
-	# whitespace
-	\s+ -> ' ';
-	^\s -> '';
-	\s$ -> '';
-
-	# line/number combs ALWAYS without whitespace (T 2 -> T2)
-	^([a-zA-Z]+) ([0-9]+)$ -> \1\2;
-
-track_normalize_chain:
-	'(^| )gleis($| )' -> '';
-	'(^| )gl\.($| )' -> '';
-	'(^| )platform($| )' -> '';
-	'(^| )track($| )' -> '';
-	'(^| )rail($| )' -> '';
-	# line/number combs ALWAYS without whitespace (1 A -> 1A)
-	^([a-zA-Z]+) ([0-9]+)$ -> \1\2;
-	^([0-9]+) ([a-zA-Z]+)$ -> \1\2;
-
-	# delete track numbers greater than 999
-	^[0-9]{4,}$ -> '';
diff --git a/geo/pfaedle.qgs b/geo/pfaedle.qgs
index 2ec03bf..aa197d3 100644
--- a/geo/pfaedle.qgs
+++ b/geo/pfaedle.qgs
@@ -1,176 +1,140 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis projectname="" version="3.4.6-Madeira">
-  <homePath path=""/>
+<qgis projectname="" version="2.18.17">
   <title></title>
   <autotransaction active="0"/>
   <evaluateDefaultValues active="0"/>
-  <trust active="0"/>
-  <projectCrs>
-    <spatialrefsys>
-      <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</proj4>
-      <srsid>3857</srsid>
-      <srid>3857</srid>
-      <authid>EPSG:3857</authid>
-      <description>WGS 84 / Pseudo-Mercator</description>
-      <projectionacronym>merc</projectionacronym>
-      <ellipsoidacronym>WGS84</ellipsoidacronym>
-      <geographicflag>false</geographicflag>
-    </spatialrefsys>
-  </projectCrs>
-  <layer-tree-group>
+  <layer-tree-group expanded="1" checked="Qt::PartiallyChecked" name="">
     <customproperties/>
-    <layer-tree-group checked="Qt::Checked" name="path" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="path">
       <customproperties/>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="path" expanded="1" id="path20180217155708341" source="./path.json">
+      <layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="path20180217155708341" source="/home/patrick/repos/pfaedle/geo/path.json" name="path">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="graph" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="graph">
       <customproperties/>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="OGRGeoJSON Point" expanded="1" id="OGRGeoJSON_Point20180203134333739" source="./graph.json">
+      <layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="OGRGeoJSON_Point20180203134333739" source="/home/patrick/repos/pfaedle/geo/graph.json" name="OGRGeoJSON Point">
         <customproperties>
-          <property value="1" key="showFeatureCount"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="OGRGeoJSON LineString" expanded="1" id="OGRGeoJSON_LineString20180203134333975" source="./graph.json">
+      <layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="OGRGeoJSON_LineString20180203134333975" source="/home/patrick/repos/pfaedle/geo/graph.json" name="OGRGeoJSON LineString">
         <customproperties>
-          <property value="1" key="overview"/>
-          <property value="1" key="showFeatureCount"/>
+          <property key="overview" value="1"/>
+          <property key="showFeatureCount" value="1"/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="combgraph" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="combgraph">
       <customproperties/>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="OGRGeoJSON Point" expanded="1" id="OGRGeoJSON_Point20180206114956218" source="./combgraph.json">
+      <layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="OGRGeoJSON_Point20180206114956218" source="/home/patrick/repos/pfaedle/geo/combgraph.json" name="OGRGeoJSON Point">
         <customproperties/>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="OGRGeoJSON LineString" expanded="1" id="OGRGeoJSON_LineString20180206114956229" source="./combgraph.json|layerid=0|subset=&quot;dummy&quot; = 'no'">
+      <layer-tree-layer expanded="1" providerKey="ogr" checked="Qt::Checked" id="OGRGeoJSON_LineString20180206114956229" source="/home/patrick/repos/pfaedle/geo/combgraph.json|layerid=0|subset=&quot;dummy&quot; = 'no'" name="OGRGeoJSON LineString">
         <customproperties/>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="trgraph" expanded="1">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="trgraph">
       <customproperties/>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="trgraph trgraph LineString" expanded="0" id="trgraph_trgraph_LineString20180508200527144" source="./trgraph.json|layerid=0|geometrytype=LineString">
-        <customproperties/>
-      </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" providerKey="ogr" name="trgraph trgraph Point" expanded="1" id="trgraph_trgraph_Point20180508200527256" source="./trgraph.json|layerid=0|geometrytype=Point">
-        <customproperties/>
-      </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Checked" providerKey="wms" name="OSM Transportation" expanded="1" id="OSM_Transportation20181215024818603" source="crs=EPSG:3857&amp;format&amp;type=xyz&amp;url=http://tile.thunderforest.com/transport/%7Bz%7D/%7Bx%7D/%7By%7D.png&amp;zmax=19&amp;zmin=0">
+    <layer-tree-layer expanded="1" providerKey="wms" checked="Qt::Checked" id="OSM_Transportation20181215024818603" source="crs=EPSG:3857&amp;format&amp;type=xyz&amp;url=http://tile.thunderforest.com/transport/%7Bz%7D/%7Bx%7D/%7By%7D.png&amp;zmax=19&amp;zmin=0" name="OSM Transportation">
       <customproperties/>
     </layer-tree-layer>
-    <layer-tree-layer checked="Qt::Unchecked" providerKey="wms" name="OpenStreetMap.de" expanded="1" id="OpenStreetMap_de20181215024846026" source="crs=EPSG:3857&amp;format&amp;type=xyz&amp;url=http://a.tile.openstreetmap.de/tiles/osmde/%7Bz%7D/%7Bx%7D/%7By%7D.png&amp;zmax=18&amp;zmin=0">
+    <layer-tree-layer expanded="1" providerKey="wms" checked="Qt::Unchecked" id="OpenStreetMap_de20181215024846026" source="crs=EPSG:3857&amp;format&amp;type=xyz&amp;url=http://a.tile.openstreetmap.de/tiles/osmde/%7Bz%7D/%7Bx%7D/%7By%7D.png&amp;zmax=18&amp;zmin=0" name="OpenStreetMap.de">
       <customproperties/>
     </layer-tree-layer>
-    <custom-order enabled="0">
-      <item>OGRGeoJSON_Point20180203134333739</item>
-      <item>OGRGeoJSON_LineString20180203134333975</item>
-      <item>OGRGeoJSON_Point20180206114956218</item>
-      <item>OGRGeoJSON_LineString20180206114956229</item>
-      <item>path20180217155708341</item>
-      <item>trgraph_trgraph_LineString20180508200527144</item>
-      <item>trgraph_trgraph_Point20180508200527256</item>
-      <item>OSM_Transportation20181215024818603</item>
-      <item>OpenStreetMap_de20181215024846026</item>
-    </custom-order>
   </layer-tree-group>
-  <snapping-settings type="1" tolerance="0" unit="2" enabled="0" mode="1" intersection-snapping="0">
-    <individual-layer-settings>
-      <layer-setting type="1" tolerance="0" enabled="1" units="2" id="OGRGeoJSON_Point20180203134333739"/>
-      <layer-setting type="1" tolerance="0" enabled="1" units="2" id="OGRGeoJSON_LineString20180206114956229"/>
-      <layer-setting type="1" tolerance="0" enabled="1" units="2" id="path20180217155708341"/>
-      <layer-setting type="2" tolerance="0" enabled="0" units="2" id="trgraph_trgraph_LineString20180508200527144"/>
-      <layer-setting type="1" tolerance="0" enabled="1" units="2" id="OGRGeoJSON_LineString20180203134333975"/>
-      <layer-setting type="1" tolerance="0" enabled="1" units="2" id="OGRGeoJSON_Point20180206114956218"/>
-      <layer-setting type="2" tolerance="0" enabled="0" units="2" id="trgraph_trgraph_Point20180508200527256"/>
-    </individual-layer-settings>
-  </snapping-settings>
   <relations/>
-  <mapcanvas annotationsVisible="1" name="theMapCanvas">
+  <mapcanvas>
     <units>meters</units>
     <extent>
-      <xmin>-374853.74009754881262779</xmin>
-      <ymin>4605645.85081499628722668</ymin>
-      <xmax>2640376.65992686524987221</xmax>
-      <ymax>7553306.65061968378722668</ymax>
+      <xmin>866081.24618305882904679</xmin>
+      <ymin>6076552.62015097495168447</ymin>
+      <xmax>870662.44395622855518013</xmax>
+      <ymax>6080842.96235341485589743</ymax>
     </extent>
     <rotation>0</rotation>
+    <projections>1</projections>
     <destinationsrs>
       <spatialrefsys>
-        <proj4>+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</proj4>
-        <srsid>3857</srsid>
-        <srid>3857</srid>
-        <authid>EPSG:3857</authid>
-        <description>WGS 84 / Pseudo-Mercator</description>
+        <proj4>+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs</proj4>
+        <srsid>1353</srsid>
+        <srid>3395</srid>
+        <authid>EPSG:3395</authid>
+        <description>WGS 84 / World Mercator</description>
         <projectionacronym>merc</projectionacronym>
         <ellipsoidacronym>WGS84</ellipsoidacronym>
         <geographicflag>false</geographicflag>
       </spatialrefsys>
     </destinationsrs>
     <rendermaptile>0</rendermaptile>
+    <layer_coordinate_transform_info>
+      <layer_coordinate_transform destAuthId="EPSG:3395" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="OGRGeoJSON_LineString20180203134333975"/>
+      <layer_coordinate_transform destAuthId="EPSG:3395" srcAuthId="EPSG:3857" srcDatumTransform="-1" destDatumTransform="-1" layerid="OSM_Transportation20181215024818603"/>
+      <layer_coordinate_transform destAuthId="EPSG:3395" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="OGRGeoJSON_Point20180206114956218"/>
+      <layer_coordinate_transform destAuthId="EPSG:3395" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="path20180217155708341"/>
+      <layer_coordinate_transform destAuthId="EPSG:3395" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="OGRGeoJSON_Point20180203134333739"/>
+    </layer_coordinate_transform_info>
   </mapcanvas>
-  <projectModels/>
+  <layer-tree-canvas>
+    <custom-order enabled="0">
+      <item>path20180217155708341</item>
+      <item>OGRGeoJSON_Point20180203134333739</item>
+      <item>OGRGeoJSON_LineString20180203134333975</item>
+      <item>OGRGeoJSON_Point20180206114956218</item>
+      <item>OGRGeoJSON_LineString20180206114956229</item>
+      <item>OSM_Transportation20181215024818603</item>
+      <item>OpenStreetMap_de20181215024846026</item>
+    </custom-order>
+  </layer-tree-canvas>
   <legend updateDrawingOrder="true">
     <legendgroup open="true" checked="Qt::Checked" name="path">
       <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="path" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="path20180217155708341" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="path20180217155708341" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup open="true" checked="Qt::Checked" name="graph">
       <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="OGRGeoJSON Point" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="OGRGeoJSON_Point20180203134333739" visible="1" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="OGRGeoJSON_Point20180203134333739" visible="1"/>
         </filegroup>
       </legendlayer>
       <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="OGRGeoJSON LineString" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="OGRGeoJSON_LineString20180203134333975" visible="1" isInOverview="1"/>
+          <legendlayerfile isInOverview="1" layerid="OGRGeoJSON_LineString20180203134333975" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="combgraph">
+    <legendgroup open="true" checked="Qt::Checked" name="combgraph">
       <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="OGRGeoJSON Point" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="OGRGeoJSON_Point20180206114956218" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="OGRGeoJSON_Point20180206114956218" visible="1"/>
         </filegroup>
       </legendlayer>
       <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="OGRGeoJSON LineString" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="OGRGeoJSON_LineString20180206114956229" visible="0" isInOverview="0"/>
-        </filegroup>
-      </legendlayer>
-    </legendgroup>
-    <legendgroup open="true" checked="Qt::Unchecked" name="trgraph">
-      <legendlayer drawingOrder="-1" open="false" checked="Qt::Checked" name="trgraph trgraph LineString" showFeatureCount="0">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="trgraph_trgraph_LineString20180508200527144" visible="0" isInOverview="0"/>
-        </filegroup>
-      </legendlayer>
-      <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="trgraph trgraph Point" showFeatureCount="0">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="trgraph_trgraph_Point20180508200527256" visible="0" isInOverview="0"/>
+          <legendlayerfile isInOverview="0" layerid="OGRGeoJSON_LineString20180206114956229" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
+    <legendgroup open="true" checked="Qt::Checked" name="trgraph"/>
     <legendlayer drawingOrder="-1" open="true" checked="Qt::Checked" name="OSM Transportation" showFeatureCount="0">
       <filegroup open="true" hidden="false">
-        <legendlayerfile layerid="OSM_Transportation20181215024818603" visible="1" isInOverview="0"/>
+        <legendlayerfile isInOverview="0" layerid="OSM_Transportation20181215024818603" visible="1"/>
       </filegroup>
     </legendlayer>
     <legendlayer drawingOrder="-1" open="true" checked="Qt::Unchecked" name="OpenStreetMap.de" showFeatureCount="0">
       <filegroup open="true" hidden="false">
-        <legendlayerfile layerid="OpenStreetMap_de20181215024846026" visible="0" isInOverview="0"/>
+        <legendlayerfile isInOverview="0" layerid="OpenStreetMap_de20181215024846026" visible="0"/>
       </filegroup>
     </legendlayer>
   </legend>
-  <mapViewDocks/>
   <projectlayers>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="0" simplifyDrawingTol="1" geometry="Point" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer simplifyAlgorithm="0" minimumScale="0" maximumScale="0" simplifyDrawingHints="0" minLabelScale="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
       <extent>
         <xmin>6.70734330570000026</xmin>
         <ymin>47.04982400000000098</ymin>
@@ -195,1730 +159,1127 @@
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <edittypes>
+        <edittype widgetv2type="TextEdit" name="component">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_in">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_out">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from_osm">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="id">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_alt_names">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group_stops">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_info_ptr">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_name">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_platform">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="level">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="lines">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="m_length">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="oneway">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="restriction">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="to">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+      </edittypes>
+      <renderer-v2 forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
         <rules key="{d740471d-1fea-4503-93d3-540d7d13ba8c}">
-          <rule label=" level = 0" description=" level = 0" symbol="0" filter=" level = 0" key="{477fbce7-6507-4835-a58f-5709640cbd92}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="1" filter="&quot;restriction&quot; = 'yes'" key="{23a37c91-b95b-4ff2-a526-c29ca7c8ce8b}"/>
+          <rule description=" level = 0" filter=" level = 0" key="{477fbce7-6507-4835-a58f-5709640cbd92}" symbol="0" label=" level = 0">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{23a37c91-b95b-4ff2-a526-c29ca7c8ce8b}" symbol="1" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 7" symbol="2" filter="level = 7" key="{a4252e6c-3cab-4144-84b9-832f9a71bf7a}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="3" filter="&quot;restriction&quot; = 'yes'" key="{b62fea49-976c-420d-9be2-d1f7b42c14e7}"/>
+          <rule filter="level = 7" key="{a4252e6c-3cab-4144-84b9-832f9a71bf7a}" symbol="2" label="level = 7">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{b62fea49-976c-420d-9be2-d1f7b42c14e7}" symbol="3" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 6" symbol="4" filter="level = 6" key="{6d6c6f05-ef70-4bf5-906c-9969de784a81}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="5" filter="&quot;restriction&quot; = 'yes'" key="{7414ed9f-d694-4281-a72d-7f9619d38308}"/>
+          <rule filter="level = 6" key="{6d6c6f05-ef70-4bf5-906c-9969de784a81}" symbol="4" label="level = 6">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{7414ed9f-d694-4281-a72d-7f9619d38308}" symbol="5" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 5" symbol="6" filter="level = 5" key="{ea74e2a8-5440-4492-b263-7f55bbd9f6d6}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="7" filter="&quot;restriction&quot; = 'yes'" key="{5ba0b691-48b6-4a89-a68b-4055546e2f91}"/>
+          <rule filter="level = 5" key="{ea74e2a8-5440-4492-b263-7f55bbd9f6d6}" symbol="6" label="level = 5">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{5ba0b691-48b6-4a89-a68b-4055546e2f91}" symbol="7" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 4" symbol="8" filter="level = 4" key="{26859e74-ef15-4ff0-af26-759ab3c09d06}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="9" filter="&quot;restriction&quot; = 'yes'" key="{897b73bd-1f52-4114-89ce-48a6050d54eb}"/>
+          <rule filter="level = 4" key="{26859e74-ef15-4ff0-af26-759ab3c09d06}" symbol="8" label="level = 4">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{897b73bd-1f52-4114-89ce-48a6050d54eb}" symbol="9" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 3" symbol="10" filter="level = 3" key="{7eaa37da-0202-47c8-8b67-99f606c2ee6a}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="11" filter="&quot;restriction&quot; = 'yes'" key="{99b2cc64-bded-472d-8d5a-caea3ce3befd}"/>
+          <rule filter="level = 3" key="{7eaa37da-0202-47c8-8b67-99f606c2ee6a}" symbol="10" label="level = 3">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{99b2cc64-bded-472d-8d5a-caea3ce3befd}" symbol="11" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 2" symbol="12" filter="level = 2" key="{529e9967-355c-4a8b-931c-7c2c923f2041}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="13" filter="&quot;restriction&quot; = 'yes'" key="{27ec51ba-7d0a-4834-8a80-5f9b38a79099}"/>
+          <rule filter="level = 2" key="{529e9967-355c-4a8b-931c-7c2c923f2041}" symbol="12" label="level = 2">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{27ec51ba-7d0a-4834-8a80-5f9b38a79099}" symbol="13" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label="level = 1" symbol="14" filter="level = 1" key="{171385c8-4472-4898-b972-397ae8cd9936}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="15" filter="&quot;restriction&quot; = 'yes'" key="{1331180b-bd2c-4e67-9247-b66d4ec94802}"/>
+          <rule filter="level = 1" key="{171385c8-4472-4898-b972-397ae8cd9936}" symbol="14" label="level = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{1331180b-bd2c-4e67-9247-b66d4ec94802}" symbol="15" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 0  AND oneway = 1" description=" level = 0  AND oneway = 1" symbol="16" filter=" level = 0  AND oneway = 1" key="{ab3c7ecd-9b32-4735-bbbb-66f2640f0a8e}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="17" filter="&quot;restriction&quot; = 'yes'" key="{61148229-5ab4-45da-a426-51c93544e705}"/>
+          <rule description=" level = 0  AND oneway = 1" filter=" level = 0  AND oneway = 1" key="{ab3c7ecd-9b32-4735-bbbb-66f2640f0a8e}" symbol="16" label=" level = 0  AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{61148229-5ab4-45da-a426-51c93544e705}" symbol="17" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 7  AND oneway = 1" description=" level = 7  AND oneway = 1" symbol="18" filter=" level = 7  AND oneway = 1" key="{878d11fd-5f54-4ec8-84d2-403b4c50d8f0}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="19" filter="&quot;restriction&quot; = 'yes'" key="{d2f6d47c-4b36-4cd3-ac73-4404d56bccf1}"/>
+          <rule description=" level = 7  AND oneway = 1" filter=" level = 7  AND oneway = 1" key="{878d11fd-5f54-4ec8-84d2-403b4c50d8f0}" symbol="18" label=" level = 7  AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{d2f6d47c-4b36-4cd3-ac73-4404d56bccf1}" symbol="19" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 6  AND oneway = 1" description=" level = 6  AND oneway = 1" symbol="20" filter=" level = 6  AND oneway = 1" key="{eaa1fd22-0006-434b-a565-5bef6875b37a}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="21" filter="&quot;restriction&quot; = 'yes'" key="{ba080dce-4b66-4731-87e5-773d98aa8110}"/>
+          <rule description=" level = 6  AND oneway = 1" filter=" level = 6  AND oneway = 1" key="{eaa1fd22-0006-434b-a565-5bef6875b37a}" symbol="20" label=" level = 6  AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{ba080dce-4b66-4731-87e5-773d98aa8110}" symbol="21" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 5  AND oneway = 1" description=" level = 5  AND oneway = 1" symbol="22" filter=" level = 5  AND oneway = 1" key="{9cb900ed-24f7-45ce-9501-7b15a9bb7fab}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="23" filter="&quot;restriction&quot; = 'yes'" key="{b45d13fd-1ace-41af-91b6-ef00c8ed5381}"/>
+          <rule description=" level = 5  AND oneway = 1" filter=" level = 5  AND oneway = 1" key="{9cb900ed-24f7-45ce-9501-7b15a9bb7fab}" symbol="22" label=" level = 5  AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{b45d13fd-1ace-41af-91b6-ef00c8ed5381}" symbol="23" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 4  AND oneway = 1" description=" level = 4  AND oneway = 1" symbol="24" filter=" level = 4  AND oneway = 1" key="{609e2e38-0d45-4a30-bae8-7c2577e06554}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="25" filter="&quot;restriction&quot; = 'yes'" key="{60ec8890-3555-4f9d-b497-68cbee158ea8}"/>
+          <rule description=" level = 4  AND oneway = 1" filter=" level = 4  AND oneway = 1" key="{609e2e38-0d45-4a30-bae8-7c2577e06554}" symbol="24" label=" level = 4  AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{60ec8890-3555-4f9d-b497-68cbee158ea8}" symbol="25" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 3  AND oneway = 1" description=" level = 3  AND oneway = 1" symbol="26" filter=" level = 3  AND oneway = 1" key="{1feab2e7-1200-4cf9-87e2-77fa736ed14d}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="27" filter="&quot;restriction&quot; = 'yes'" key="{45559600-85ad-49e2-8513-122f88e4e7e8}"/>
+          <rule description=" level = 3  AND oneway = 1" filter=" level = 3  AND oneway = 1" key="{1feab2e7-1200-4cf9-87e2-77fa736ed14d}" symbol="26" label=" level = 3  AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{45559600-85ad-49e2-8513-122f88e4e7e8}" symbol="27" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 2 AND oneway = 1" description=" level = 2 AND oneway = 1" symbol="28" filter=" level = 2 AND oneway = 1" key="{318f6613-70df-4605-a1c2-291ec7537698}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="29" filter="&quot;restriction&quot; = 'yes'" key="{f0fb42fa-c06e-49c5-b297-f32198a393f1}"/>
+          <rule description=" level = 2 AND oneway = 1" filter=" level = 2 AND oneway = 1" key="{318f6613-70df-4605-a1c2-291ec7537698}" symbol="28" label=" level = 2 AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{f0fb42fa-c06e-49c5-b297-f32198a393f1}" symbol="29" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
-          <rule label=" level = 1 AND oneway = 1" description=" level = 1 AND oneway = 1" symbol="30" filter=" level = 1 AND oneway = 1" key="{ebc63fc9-a7d7-401f-ac16-100e97ff936e}">
-            <rule label="&quot;restriction&quot; = 'yes'" symbol="31" filter="&quot;restriction&quot; = 'yes'" key="{28093c30-fd06-480a-8a95-7dc4d3c51489}"/>
+          <rule description=" level = 1 AND oneway = 1" filter=" level = 1 AND oneway = 1" key="{ebc63fc9-a7d7-401f-ac16-100e97ff936e}" symbol="30" label=" level = 1 AND oneway = 1">
+            <rule filter="&quot;restriction&quot; = 'yes'" key="{28093c30-fd06-480a-8a95-7dc4d3c51489}" symbol="31" label="&quot;restriction&quot; = 'yes'"/>
           </rule>
         </rules>
         <symbols>
-          <symbol type="line" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="95,0,211,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.66" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="0">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="95,0,211,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.66"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="1" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="1">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="10" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="143,153,240,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="10">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="143,153,240,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="11" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="11">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="12" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,125,208,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.36" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="12">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,125,208,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.36"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="13" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="13">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="14" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="185,0,195,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="14">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="185,0,195,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.46"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="15" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="15">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="16" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="95,0,211,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.66" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="16">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="95,0,211,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.66"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="8.4" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@16@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="1.6" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="8.4"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@16@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="1.6"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="17" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="17">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="18" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="51,9,177,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="18">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="51,9,177,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="10.8" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@18@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="0.8" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="10.8"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@18@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="0.8"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="19" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="19">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="2" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="51,9,177,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="2">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="51,9,177,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="20" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,3,238,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="20">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,3,238,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="7.4" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@20@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="0.4" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="7.4"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@20@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="0.4"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="21" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="21">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="22" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="127,126,211,255" k="line_color"/>
-              <prop v="dash dot" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="22">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="127,126,211,255"/>
+              <prop k="line_style" v="dash dot"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="10.4" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@22@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="0.8" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="10.4"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@22@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="0.8"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="23" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="23">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="24" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="83,99,194,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="24">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="83,99,194,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="12.4" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@24@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="0.8" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="12.4"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@24@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="0.8"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="25" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="25">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="26" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="143,153,240,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="26">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="143,153,240,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="11.2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@26@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="0.8" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="11.2"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@26@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="0.8"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="27" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="27">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="28" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,125,208,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.36" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="28">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,125,208,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.36"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="13.2" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@28@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="1.2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="13.2"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@28@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="1.2"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="29" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="29">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="3" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="3">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="30" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="185,0,195,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="30">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="185,0,195,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.46"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="13" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@30@1" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="1.6" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="13"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@30@1">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="1.6"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="31" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="31">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="4" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,3,238,255" k="line_color"/>
-              <prop v="dot" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="4">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="0,3,238,255"/>
+              <prop k="line_style" v="dot"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="5" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="5">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="6" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="127,126,211,255" k="line_color"/>
-              <prop v="dash dot" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="6">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="127,126,211,255"/>
+              <prop k="line_style" v="dash dot"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="7" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="7">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="8" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="83,99,194,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.16" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="8">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="83,99,194,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.16"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
-          <symbol type="line" clip_to_extent="1" name="9" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="200,0,96,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.86" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="9">
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="200,0,96,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="0.86"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
         </symbols>
       </renderer-v2>
+      <labeling type="simple"/>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
+      <layerTransparency>0</layerTransparency>
+      <displayfield>station_alt_names</displayfield>
+      <label>0</label>
+      <labelattributes>
+        <label fieldname="" text="Beschriftung"/>
+        <family fieldname="" name="Ubuntu"/>
+        <size fieldname="" units="pt" value="12"/>
+        <bold fieldname="" on="0"/>
+        <italic fieldname="" on="0"/>
+        <underline fieldname="" on="0"/>
+        <strikeout fieldname="" on="0"/>
+        <color fieldname="" red="0" blue="0" green="0"/>
+        <x fieldname=""/>
+        <y fieldname=""/>
+        <offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
+        <angle fieldname="" value="0" auto="0"/>
+        <alignment fieldname="" value="center"/>
+        <buffercolor fieldname="" red="255" blue="255" green="255"/>
+        <buffersize fieldname="" units="pt" value="1"/>
+        <bufferenabled fieldname="" on=""/>
+        <multilineenabled fieldname="" on=""/>
+        <selectedonly on=""/>
+      </labelattributes>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" sizeLegend="0" attributeLegend="1">
+        <DiagramCategory penColor="#000000" labelPlacementMethod="XHeight" penWidth="0" diagramOrientation="Up" sizeScale="0,0,0,0,0,0" minimumSize="0" barWidth="5" penAlpha="255" maxScaleDenominator="1e+08" backgroundColor="#ffffff" transparency="0" width="15" scaleDependency="Area" backgroundAlpha="255" angleOffset="0" scaleBasedVisibility="0" enabled="0" height="15" lineSizeScale="0,0,0,0,0,0" sizeType="MM" lineSizeType="MM" minScaleDenominator="0">
+          <fontProperties description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
+        <symbol alpha="1" clip_to_extent="1" type="marker" name="sizeSymbol">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="horizontal_anchor_point" v="1"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="name" v="circle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="diameter"/>
+            <prop k="size" v="2"/>
+            <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="size_unit" v="MM"/>
+            <prop k="vertical_anchor_point" v="1"/>
+          </layer>
+        </symbol>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration>
-        <field name="component">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_in">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_out">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="dijkstra_vis">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from_osm">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="id">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_alt_names">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group_stops">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_info_ptr">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_platform">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="level">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="lines">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="m_length">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="oneway">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="restriction">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="to">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
+      <DiagramLayerSettings yPosColumn="0" showColumn="0" linePlacementFlags="2" placement="0" dist="0" xPosColumn="0" priority="0" obstacle="0" zIndex="0" showAll="1"/>
+      <annotationform></annotationform>
       <aliases>
-        <alias index="0" field="component" name=""/>
-        <alias index="1" field="deg" name=""/>
-        <alias index="2" field="deg_in" name=""/>
-        <alias index="3" field="deg_out" name=""/>
-        <alias index="4" field="dijkstra_vis" name=""/>
-        <alias index="5" field="from_osm" name=""/>
-        <alias index="6" field="id" name=""/>
-        <alias index="7" field="station_alt_names" name=""/>
-        <alias index="8" field="station_group" name=""/>
-        <alias index="9" field="station_group_stops" name=""/>
-        <alias index="10" field="station_info_ptr" name=""/>
-        <alias index="11" field="station_name" name=""/>
-        <alias index="12" field="station_platform" name=""/>
-        <alias index="13" field="from" name=""/>
-        <alias index="14" field="level" name=""/>
-        <alias index="15" field="lines" name=""/>
-        <alias index="16" field="m_length" name=""/>
-        <alias index="17" field="oneway" name=""/>
-        <alias index="18" field="restriction" name=""/>
-        <alias index="19" field="to" name=""/>
+        <alias field="component" index="0" name=""/>
+        <alias field="deg" index="1" name=""/>
+        <alias field="deg_in" index="2" name=""/>
+        <alias field="deg_out" index="3" name=""/>
+        <alias field="from_osm" index="4" name=""/>
+        <alias field="id" index="5" name=""/>
+        <alias field="station_alt_names" index="6" name=""/>
+        <alias field="station_group" index="7" name=""/>
+        <alias field="station_group_stops" index="8" name=""/>
+        <alias field="station_info_ptr" index="9" name=""/>
+        <alias field="station_name" index="10" name=""/>
+        <alias field="station_platform" index="11" name=""/>
+        <alias field="from" index="12" name=""/>
+        <alias field="level" index="13" name=""/>
+        <alias field="lines" index="14" name=""/>
+        <alias field="m_length" index="15" name=""/>
+        <alias field="oneway" index="16" name=""/>
+        <alias field="restriction" index="17" name=""/>
+        <alias field="to" index="18" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
-      <defaults>
-        <default field="component" expression="" applyOnUpdate="0"/>
-        <default field="deg" expression="" applyOnUpdate="0"/>
-        <default field="deg_in" expression="" applyOnUpdate="0"/>
-        <default field="deg_out" expression="" applyOnUpdate="0"/>
-        <default field="dijkstra_vis" expression="" applyOnUpdate="0"/>
-        <default field="from_osm" expression="" applyOnUpdate="0"/>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="station_alt_names" expression="" applyOnUpdate="0"/>
-        <default field="station_group" expression="" applyOnUpdate="0"/>
-        <default field="station_group_stops" expression="" applyOnUpdate="0"/>
-        <default field="station_info_ptr" expression="" applyOnUpdate="0"/>
-        <default field="station_name" expression="" applyOnUpdate="0"/>
-        <default field="station_platform" expression="" applyOnUpdate="0"/>
-        <default field="from" expression="" applyOnUpdate="0"/>
-        <default field="level" expression="" applyOnUpdate="0"/>
-        <default field="lines" expression="" applyOnUpdate="0"/>
-        <default field="m_length" expression="" applyOnUpdate="0"/>
-        <default field="oneway" expression="" applyOnUpdate="0"/>
-        <default field="restriction" expression="" applyOnUpdate="0"/>
-        <default field="to" expression="" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint field="component" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_in" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_out" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="dijkstra_vis" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from_osm" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="id" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_alt_names" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group_stops" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_info_ptr" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_name" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_platform" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="level" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="lines" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="m_length" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="oneway" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="restriction" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="to" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="component" exp="" desc=""/>
-        <constraint field="deg" exp="" desc=""/>
-        <constraint field="deg_in" exp="" desc=""/>
-        <constraint field="deg_out" exp="" desc=""/>
-        <constraint field="dijkstra_vis" exp="" desc=""/>
-        <constraint field="from_osm" exp="" desc=""/>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="station_alt_names" exp="" desc=""/>
-        <constraint field="station_group" exp="" desc=""/>
-        <constraint field="station_group_stops" exp="" desc=""/>
-        <constraint field="station_info_ptr" exp="" desc=""/>
-        <constraint field="station_name" exp="" desc=""/>
-        <constraint field="station_platform" exp="" desc=""/>
-        <constraint field="from" exp="" desc=""/>
-        <constraint field="level" exp="" desc=""/>
-        <constraint field="lines" exp="" desc=""/>
-        <constraint field="m_length" exp="" desc=""/>
-        <constraint field="oneway" exp="" desc=""/>
-        <constraint field="restriction" exp="" desc=""/>
-        <constraint field="to" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      <attributeactions default="0">
+        <actionsetting showInAttributeTable="1" action="" icon="" capture="0" type="0" name="" shortTitle=""/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" hidden="0" name="component"/>
-          <column type="field" width="-1" hidden="0" name="deg"/>
-          <column type="field" width="-1" hidden="0" name="deg_in"/>
-          <column type="field" width="-1" hidden="0" name="deg_out"/>
-          <column type="field" width="-1" hidden="0" name="from_osm"/>
-          <column type="field" width="-1" hidden="0" name="id"/>
-          <column type="field" width="-1" hidden="0" name="station_alt_names"/>
-          <column type="field" width="-1" hidden="0" name="station_group"/>
-          <column type="field" width="-1" hidden="0" name="station_group_stops"/>
-          <column type="field" width="-1" hidden="0" name="station_info_ptr"/>
-          <column type="field" width="-1" hidden="0" name="station_name"/>
-          <column type="field" width="-1" hidden="0" name="station_platform"/>
-          <column type="field" width="-1" hidden="0" name="from"/>
-          <column type="field" width="-1" hidden="0" name="level"/>
-          <column type="field" width="-1" hidden="0" name="lines"/>
-          <column type="field" width="-1" hidden="0" name="m_length"/>
-          <column type="field" width="-1" hidden="0" name="oneway"/>
-          <column type="field" width="-1" hidden="0" name="restriction"/>
-          <column type="field" width="-1" hidden="0" name="to"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" hidden="0" name="dijkstra_vis"/>
+          <column width="-1" hidden="0" type="field" name="component"/>
+          <column width="-1" hidden="0" type="field" name="deg"/>
+          <column width="-1" hidden="0" type="field" name="deg_in"/>
+          <column width="-1" hidden="0" type="field" name="deg_out"/>
+          <column width="-1" hidden="0" type="field" name="from_osm"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="station_alt_names"/>
+          <column width="-1" hidden="0" type="field" name="station_group"/>
+          <column width="-1" hidden="0" type="field" name="station_group_stops"/>
+          <column width="-1" hidden="0" type="field" name="station_info_ptr"/>
+          <column width="-1" hidden="0" type="field" name="station_name"/>
+          <column width="-1" hidden="0" type="field" name="station_platform"/>
+          <column width="-1" hidden="0" type="field" name="from"/>
+          <column width="-1" hidden="0" type="field" name="level"/>
+          <column width="-1" hidden="0" type="field" name="lines"/>
+          <column width="-1" hidden="0" type="field" name="m_length"/>
+          <column width="-1" hidden="0" type="field" name="oneway"/>
+          <column width="-1" hidden="0" type="field" name="restriction"/>
+          <column width="-1" hidden="0" type="field" name="to"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" type="field" name="dijkstra_vis"/>
         </columns>
       </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1">.</editform>
+      <editform>.</editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>.</editforminitfilepath>
@@ -1941,55 +1302,35 @@ def my_form_open(dialog, layer, feature):
 ]]></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="component" editable="1"/>
-        <field name="deg" editable="1"/>
-        <field name="deg_in" editable="1"/>
-        <field name="deg_out" editable="1"/>
-        <field name="dijkstra_vis" editable="1"/>
-        <field name="from" editable="1"/>
-        <field name="from_osm" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="level" editable="1"/>
-        <field name="lines" editable="1"/>
-        <field name="m_length" editable="1"/>
-        <field name="oneway" editable="1"/>
-        <field name="restriction" editable="1"/>
-        <field name="station_alt_names" editable="1"/>
-        <field name="station_group" editable="1"/>
-        <field name="station_group_stops" editable="1"/>
-        <field name="station_info_ptr" editable="1"/>
-        <field name="station_name" editable="1"/>
-        <field name="station_platform" editable="1"/>
-        <field name="to" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="component" labelOnTop="0"/>
-        <field name="deg" labelOnTop="0"/>
-        <field name="deg_in" labelOnTop="0"/>
-        <field name="deg_out" labelOnTop="0"/>
-        <field name="dijkstra_vis" labelOnTop="0"/>
-        <field name="from" labelOnTop="0"/>
-        <field name="from_osm" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="level" labelOnTop="0"/>
-        <field name="lines" labelOnTop="0"/>
-        <field name="m_length" labelOnTop="0"/>
-        <field name="oneway" labelOnTop="0"/>
-        <field name="restriction" labelOnTop="0"/>
-        <field name="station_alt_names" labelOnTop="0"/>
-        <field name="station_group" labelOnTop="0"/>
-        <field name="station_group_stops" labelOnTop="0"/>
-        <field name="station_info_ptr" labelOnTop="0"/>
-        <field name="station_name" labelOnTop="0"/>
-        <field name="station_platform" labelOnTop="0"/>
-        <field name="to" labelOnTop="0"/>
-      </labelOnTop>
       <widgets/>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <defaults>
+        <default field="component" expression=""/>
+        <default field="deg" expression=""/>
+        <default field="deg_in" expression=""/>
+        <default field="deg_out" expression=""/>
+        <default field="from_osm" expression=""/>
+        <default field="id" expression=""/>
+        <default field="station_alt_names" expression=""/>
+        <default field="station_group" expression=""/>
+        <default field="station_group_stops" expression=""/>
+        <default field="station_info_ptr" expression=""/>
+        <default field="station_name" expression=""/>
+        <default field="station_platform" expression=""/>
+        <default field="from" expression=""/>
+        <default field="level" expression=""/>
+        <default field="lines" expression=""/>
+        <default field="m_length" expression=""/>
+        <default field="oneway" expression=""/>
+        <default field="restriction" expression=""/>
+        <default field="to" expression=""/>
+      </defaults>
       <previewExpression>station_name</previewExpression>
-      <mapTip></mapTip>
     </maplayer>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="0" simplifyDrawingTol="1" geometry="Line" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer minimumScale="0" maximumScale="0" readOnly="0" geometry="No geometry" type="vector" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>6.70734330570000026</xmin>
         <ymin>47.05522500000000008</ymin>
@@ -2014,480 +1355,129 @@ def my_form_open(dialog, layer, feature):
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
+      <customproperties>
+        <property key="embeddedWidgets/count" value="0"/>
+        <property key="variableNames"/>
+        <property key="variableValues"/>
+      </customproperties>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
-        <symbols>
-          <symbol type="line" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="23.6" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@0@0" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
-                </layer>
-              </symbol>
-            </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,178,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </symbols>
-        <rotation/>
-        <sizescale/>
-      </renderer-v2>
-      <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="-2.14748e+09" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration>
-        <field name="component">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_in">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_out">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="dijkstra_vis">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from_osm">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="id">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_alt_names">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group_stops">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_info_ptr">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_platform">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="cost">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="dummy">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from_edge">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="to">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="to_edge">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
+      <edittypes>
+        <edittype widgetv2type="TextEdit" name="component">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_in">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_out">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from_osm">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="id">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_alt_names">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group_stops">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_info_ptr">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_name">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_platform">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="cost">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="dummy">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from_edge">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="to">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="to_edge">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="orig_ogc_fid">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+      </edittypes>
+      <annotationform></annotationform>
       <aliases>
-        <alias index="0" field="component" name=""/>
-        <alias index="1" field="deg" name=""/>
-        <alias index="2" field="deg_in" name=""/>
-        <alias index="3" field="deg_out" name=""/>
-        <alias index="4" field="dijkstra_vis" name=""/>
-        <alias index="5" field="from_osm" name=""/>
-        <alias index="6" field="id" name=""/>
-        <alias index="7" field="station_alt_names" name=""/>
-        <alias index="8" field="station_group" name=""/>
-        <alias index="9" field="station_group_stops" name=""/>
-        <alias index="10" field="station_info_ptr" name=""/>
-        <alias index="11" field="station_name" name=""/>
-        <alias index="12" field="station_platform" name=""/>
-        <alias index="13" field="cost" name=""/>
-        <alias index="14" field="dummy" name=""/>
-        <alias index="15" field="from" name=""/>
-        <alias index="16" field="from_edge" name=""/>
-        <alias index="17" field="to" name=""/>
-        <alias index="18" field="to_edge" name=""/>
+        <alias field="component" index="0" name=""/>
+        <alias field="deg" index="1" name=""/>
+        <alias field="deg_in" index="2" name=""/>
+        <alias field="deg_out" index="3" name=""/>
+        <alias field="from_osm" index="4" name=""/>
+        <alias field="id" index="5" name=""/>
+        <alias field="station_alt_names" index="6" name=""/>
+        <alias field="station_group" index="7" name=""/>
+        <alias field="station_group_stops" index="8" name=""/>
+        <alias field="station_info_ptr" index="9" name=""/>
+        <alias field="station_name" index="10" name=""/>
+        <alias field="station_platform" index="11" name=""/>
+        <alias field="cost" index="12" name=""/>
+        <alias field="dummy" index="13" name=""/>
+        <alias field="from" index="14" name=""/>
+        <alias field="from_edge" index="15" name=""/>
+        <alias field="to" index="16" name=""/>
+        <alias field="to_edge" index="17" name=""/>
+        <alias field="orig_ogc_fid" index="18" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
-      <defaults>
-        <default field="component" expression="" applyOnUpdate="0"/>
-        <default field="deg" expression="" applyOnUpdate="0"/>
-        <default field="deg_in" expression="" applyOnUpdate="0"/>
-        <default field="deg_out" expression="" applyOnUpdate="0"/>
-        <default field="dijkstra_vis" expression="" applyOnUpdate="0"/>
-        <default field="from_osm" expression="" applyOnUpdate="0"/>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="station_alt_names" expression="" applyOnUpdate="0"/>
-        <default field="station_group" expression="" applyOnUpdate="0"/>
-        <default field="station_group_stops" expression="" applyOnUpdate="0"/>
-        <default field="station_info_ptr" expression="" applyOnUpdate="0"/>
-        <default field="station_name" expression="" applyOnUpdate="0"/>
-        <default field="station_platform" expression="" applyOnUpdate="0"/>
-        <default field="cost" expression="" applyOnUpdate="0"/>
-        <default field="dummy" expression="" applyOnUpdate="0"/>
-        <default field="from" expression="" applyOnUpdate="0"/>
-        <default field="from_edge" expression="" applyOnUpdate="0"/>
-        <default field="to" expression="" applyOnUpdate="0"/>
-        <default field="to_edge" expression="" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint field="component" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_in" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_out" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="dijkstra_vis" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from_osm" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="id" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_alt_names" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group_stops" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_info_ptr" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_name" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_platform" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="cost" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="dummy" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from_edge" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="to" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="to_edge" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="component" exp="" desc=""/>
-        <constraint field="deg" exp="" desc=""/>
-        <constraint field="deg_in" exp="" desc=""/>
-        <constraint field="deg_out" exp="" desc=""/>
-        <constraint field="dijkstra_vis" exp="" desc=""/>
-        <constraint field="from_osm" exp="" desc=""/>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="station_alt_names" exp="" desc=""/>
-        <constraint field="station_group" exp="" desc=""/>
-        <constraint field="station_group_stops" exp="" desc=""/>
-        <constraint field="station_info_ptr" exp="" desc=""/>
-        <constraint field="station_name" exp="" desc=""/>
-        <constraint field="station_platform" exp="" desc=""/>
-        <constraint field="cost" exp="" desc=""/>
-        <constraint field="dummy" exp="" desc=""/>
-        <constraint field="from" exp="" desc=""/>
-        <constraint field="from_edge" exp="" desc=""/>
-        <constraint field="to" exp="" desc=""/>
-        <constraint field="to_edge" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      <attributeactions default="0">
+        <actionsetting showInAttributeTable="1" action="" icon="" capture="0" type="0" name="" shortTitle=""/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" hidden="0" name="component"/>
-          <column type="field" width="-1" hidden="0" name="deg"/>
-          <column type="field" width="-1" hidden="0" name="deg_in"/>
-          <column type="field" width="-1" hidden="0" name="deg_out"/>
-          <column type="field" width="-1" hidden="0" name="from_osm"/>
-          <column type="field" width="-1" hidden="0" name="id"/>
-          <column type="field" width="-1" hidden="0" name="station_group"/>
-          <column type="field" width="-1" hidden="0" name="station_group_stops"/>
-          <column type="field" width="-1" hidden="0" name="station_name"/>
-          <column type="field" width="-1" hidden="0" name="station_platform"/>
-          <column type="field" width="-1" hidden="0" name="cost"/>
-          <column type="field" width="-1" hidden="0" name="from"/>
-          <column type="field" width="-1" hidden="0" name="to"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" hidden="0" name="station_alt_names"/>
-          <column type="field" width="-1" hidden="0" name="station_info_ptr"/>
-          <column type="field" width="-1" hidden="0" name="dummy"/>
-          <column type="field" width="-1" hidden="0" name="from_edge"/>
-          <column type="field" width="-1" hidden="0" name="to_edge"/>
-          <column type="field" width="-1" hidden="0" name="dijkstra_vis"/>
+          <column width="-1" hidden="0" type="field" name="component"/>
+          <column width="-1" hidden="0" type="field" name="deg"/>
+          <column width="-1" hidden="0" type="field" name="deg_in"/>
+          <column width="-1" hidden="0" type="field" name="deg_out"/>
+          <column width="-1" hidden="0" type="field" name="from_osm"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="station_group"/>
+          <column width="-1" hidden="0" type="field" name="station_group_stops"/>
+          <column width="-1" hidden="0" type="field" name="station_name"/>
+          <column width="-1" hidden="0" type="field" name="station_platform"/>
+          <column width="-1" hidden="0" type="field" name="cost"/>
+          <column width="-1" hidden="0" type="field" name="from"/>
+          <column width="-1" hidden="0" type="field" name="to"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" type="field" name="station_alt_names"/>
+          <column width="-1" hidden="0" type="field" name="station_info_ptr"/>
+          <column width="-1" hidden="0" type="field" name="dummy"/>
+          <column width="-1" hidden="0" type="field" name="from_edge"/>
+          <column width="-1" hidden="0" type="field" name="to_edge"/>
+          <column width="-1" hidden="0" type="field" name="dijkstra_vis"/>
         </columns>
       </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1">.</editform>
+      <editform>.</editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>.</editforminitfilepath>
@@ -2510,53 +1500,35 @@ def my_form_open(dialog, layer, feature):
 ]]></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="component" editable="1"/>
-        <field name="cost" editable="1"/>
-        <field name="deg" editable="1"/>
-        <field name="deg_in" editable="1"/>
-        <field name="deg_out" editable="1"/>
-        <field name="dijkstra_vis" editable="1"/>
-        <field name="dummy" editable="1"/>
-        <field name="from" editable="1"/>
-        <field name="from_edge" editable="1"/>
-        <field name="from_osm" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="station_alt_names" editable="1"/>
-        <field name="station_group" editable="1"/>
-        <field name="station_group_stops" editable="1"/>
-        <field name="station_info_ptr" editable="1"/>
-        <field name="station_name" editable="1"/>
-        <field name="station_platform" editable="1"/>
-        <field name="to" editable="1"/>
-        <field name="to_edge" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="component" labelOnTop="0"/>
-        <field name="cost" labelOnTop="0"/>
-        <field name="deg" labelOnTop="0"/>
-        <field name="deg_in" labelOnTop="0"/>
-        <field name="deg_out" labelOnTop="0"/>
-        <field name="dijkstra_vis" labelOnTop="0"/>
-        <field name="dummy" labelOnTop="0"/>
-        <field name="from" labelOnTop="0"/>
-        <field name="from_edge" labelOnTop="0"/>
-        <field name="from_osm" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="station_alt_names" labelOnTop="0"/>
-        <field name="station_group" labelOnTop="0"/>
-        <field name="station_group_stops" labelOnTop="0"/>
-        <field name="station_info_ptr" labelOnTop="0"/>
-        <field name="station_name" labelOnTop="0"/>
-        <field name="station_platform" labelOnTop="0"/>
-        <field name="to" labelOnTop="0"/>
-        <field name="to_edge" labelOnTop="0"/>
-      </labelOnTop>
       <widgets/>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <defaults>
+        <default field="component" expression=""/>
+        <default field="deg" expression=""/>
+        <default field="deg_in" expression=""/>
+        <default field="deg_out" expression=""/>
+        <default field="from_osm" expression=""/>
+        <default field="id" expression=""/>
+        <default field="station_alt_names" expression=""/>
+        <default field="station_group" expression=""/>
+        <default field="station_group_stops" expression=""/>
+        <default field="station_info_ptr" expression=""/>
+        <default field="station_name" expression=""/>
+        <default field="station_platform" expression=""/>
+        <default field="cost" expression=""/>
+        <default field="dummy" expression=""/>
+        <default field="from" expression=""/>
+        <default field="from_edge" expression=""/>
+        <default field="to" expression=""/>
+        <default field="to_edge" expression=""/>
+        <default field="orig_ogc_fid" expression=""/>
+      </defaults>
       <previewExpression>station_name</previewExpression>
-      <mapTip></mapTip>
     </maplayer>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="1" simplifyDrawingTol="1" geometry="Point" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer simplifyAlgorithm="0" minimumScale="0" maximumScale="0" simplifyDrawingHints="0" minLabelScale="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
       <extent>
         <xmin>6.70734330570000026</xmin>
         <ymin>47.04982400000000098</ymin>
@@ -2581,615 +1553,326 @@ def my_form_open(dialog, layer, feature):
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="RuleRenderer" forceraster="0" symbollevels="0" enableorderby="0">
+      <edittypes>
+        <edittype widgetv2type="TextEdit" name="component">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_in">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_out">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from_osm">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="id">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_alt_names">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group_stops">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_info_ptr">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_name">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_platform">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="level">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="lines">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="m_length">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="oneway">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="restriction">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="to">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+      </edittypes>
+      <renderer-v2 forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
         <rules key="{cf9829be-a85d-4861-96b4-c969591ca0f2}">
-          <rule symbol="0" filter="dijkstra_vis = 'yes'" key="{7b703599-4017-44f6-af6c-59d074c32041}" checkstate="0"/>
-          <rule symbol="1" filter="ELSE" key="{6a31b889-bb6a-480c-9002-422c9fdac99d}"/>
-          <rule label="1" symbol="2" filter="deg = 1" key="{011266cd-ccb0-4308-b7ca-222695a1738a}"/>
-          <rule symbol="3" filter="station_group_stops = ''" key="{5dd5d500-2978-429f-acaf-c6240ae74f31}"/>
-          <rule symbol="4" filter="station_name != ''" key="{80e23502-a012-4a67-9934-e9714ef7940c}"/>
+          <rule checkstate="0" filter="dijkstra_vis = 'yes'" key="{7b703599-4017-44f6-af6c-59d074c32041}" symbol="0"/>
+          <rule filter="ELSE" key="{6a31b889-bb6a-480c-9002-422c9fdac99d}" symbol="1"/>
+          <rule filter="deg = 1" key="{011266cd-ccb0-4308-b7ca-222695a1738a}" symbol="2" label="1"/>
+          <rule filter="station_group_stops = ''" key="{5dd5d500-2978-429f-acaf-c6240ae74f31}" symbol="3"/>
+          <rule filter="station_name != ''" key="{80e23502-a012-4a67-9934-e9714ef7940c}" symbol="4"/>
         </rules>
         <symbols>
-          <symbol type="marker" clip_to_extent="1" name="0" alpha="0.568627" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="227,0,49,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,255,255,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="3.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="0.568627" clip_to_extent="1" type="marker" name="0">
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="227,0,49,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,255,255,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="3.6"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" name="1" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="175,232,247,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="36,91,255,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="1" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="marker" name="1">
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="175,232,247,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="36,91,255,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" name="2" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="225,0,3,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="cross2" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="255,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.6" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="1.2" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="marker" name="2">
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="225,0,3,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="cross2"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="255,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.6"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="1.2"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" name="3" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="139,104,114,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="equilateral_triangle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="3.2" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="marker" name="3">
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="139,104,114,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="equilateral_triangle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="3.2"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
           </symbol>
-          <symbol type="marker" clip_to_extent="1" name="4" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="50,255,63,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="1.6" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="marker" name="4">
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="50,255,63,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="1.6"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="0.2" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="0.2"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
           </symbol>
         </symbols>
       </renderer-v2>
-      <labeling type="simple">
-        <settings>
-          <text-style fieldName="station_name ||  (CASE WHEN &quot;station_platform&quot; != '' THEN '[' || &quot;station_platform&quot; || ']' ELSE '' END)" fontSize="5" isExpression="1" fontUnderline="0" textColor="0,0,0,255" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="1" blendMode="0" fontFamily="Ubuntu" fontStrikeout="0" fontLetterSpacing="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" fontWeight="50" fontWordSpacing="0" fontCapitals="1" fontSizeUnit="Point" fontItalic="0" namedStyle="Regular">
-            <text-buffer bufferBlendMode="0" bufferJoinStyle="64" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferColor="255,255,255,255" bufferOpacity="1" bufferDraw="0" bufferNoFill="0"/>
-            <background shapeSizeY="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRadiiUnit="MM" shapeSizeX="0" shapeRadiiY="3" shapeSizeType="0" shapeOpacity="0.7" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeOffsetUnit="MM" shapeDraw="1" shapeBorderWidth="0" shapeBlendMode="0" shapeRadiiX="2" shapeOffsetY="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeOffsetX="0" shapeFillColor="255,255,255,255" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeBorderWidthUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0"/>
-            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="218,218,218,255" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadius="0" shadowOpacity="0.7" shadowRadiusUnit="MM" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="1" shadowUnder="0" shadowScale="100" shadowBlendMode="6" shadowDraw="0" shadowOffsetGlobal="1"/>
-            <substitutions/>
-          </text-style>
-          <text-format decimals="3" placeDirectionSymbol="0" wrapChar="" rightDirectionSymbol=">" multilineAlign="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" plussign="0" formatNumbers="0"/>
-          <placement priority="5" repeatDistanceUnits="MM" centroidInside="0" yOffset="0" distUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" maxCurvedCharAngleOut="-20" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" offsetType="0" placement="0" placementFlags="0" maxCurvedCharAngleIn="20" centroidWhole="0" rotationAngle="0" quadOffset="4" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" repeatDistance="0" dist="0" fitInPolygonOnly="0"/>
-          <rendering scaleMin="1" maxNumLabels="2000" obstacleFactor="1" scaleMax="10000000" drawLabels="1" fontLimitPixelSize="0" fontMaxPixelSize="10000" obstacleType="0" limitNumLabels="0" mergeLines="0" upsidedownLabels="0" scaleVisibility="0" labelPerPart="0" displayAll="0" fontMinPixelSize="3" obstacle="1" zIndex="0" minFeatureSize="0"/>
-          <dd_properties>
-            <Option type="Map">
-              <Option type="QString" value="" name="name"/>
-              <Option name="properties"/>
-              <Option type="QString" value="collection" name="type"/>
-            </Option>
-          </dd_properties>
-        </settings>
-      </labeling>
+      <labeling type="simple"/>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="-2.14748e+09" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
+      <layerTransparency>0</layerTransparency>
+      <displayfield>station_alt_names</displayfield>
+      <label>0</label>
+      <labelattributes>
+        <label fieldname="" text="Beschriftung"/>
+        <family fieldname="" name="Ubuntu"/>
+        <size fieldname="" units="pt" value="12"/>
+        <bold fieldname="" on="0"/>
+        <italic fieldname="" on="0"/>
+        <underline fieldname="" on="0"/>
+        <strikeout fieldname="" on="0"/>
+        <color fieldname="" red="0" blue="0" green="0"/>
+        <x fieldname=""/>
+        <y fieldname=""/>
+        <offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
+        <angle fieldname="" value="0" auto="0"/>
+        <alignment fieldname="" value="center"/>
+        <buffercolor fieldname="" red="255" blue="255" green="255"/>
+        <buffersize fieldname="" units="pt" value="1"/>
+        <bufferenabled fieldname="" on=""/>
+        <multilineenabled fieldname="" on=""/>
+        <selectedonly on=""/>
+      </labelattributes>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" sizeLegend="0" attributeLegend="1">
+        <DiagramCategory penColor="#000000" labelPlacementMethod="XHeight" penWidth="0" diagramOrientation="Up" sizeScale="0,0,0,0,0,0" minimumSize="0" barWidth="5" penAlpha="255" maxScaleDenominator="1e+08" backgroundColor="#ffffff" transparency="0" width="15" scaleDependency="Area" backgroundAlpha="255" angleOffset="0" scaleBasedVisibility="0" enabled="0" height="15" lineSizeScale="0,0,0,0,0,0" sizeType="MM" lineSizeType="MM" minScaleDenominator="-2.14748e+09">
+          <fontProperties description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
+        <symbol alpha="1" clip_to_extent="1" type="marker" name="sizeSymbol">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="horizontal_anchor_point" v="1"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="name" v="circle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="diameter"/>
+            <prop k="size" v="2"/>
+            <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="size_unit" v="MM"/>
+            <prop k="vertical_anchor_point" v="1"/>
+          </layer>
+        </symbol>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration>
-        <field name="component">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_in">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_out">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="dijkstra_vis">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from_osm">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="id">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_alt_names">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group_stops">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_info_ptr">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_platform">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="level">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="lines">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="m_length">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="oneway">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="restriction">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="to">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
+      <DiagramLayerSettings yPosColumn="0" showColumn="0" linePlacementFlags="2" placement="0" dist="0" xPosColumn="0" priority="0" obstacle="0" zIndex="0" showAll="1"/>
+      <annotationform></annotationform>
       <aliases>
-        <alias index="0" field="component" name=""/>
-        <alias index="1" field="deg" name=""/>
-        <alias index="2" field="deg_in" name=""/>
-        <alias index="3" field="deg_out" name=""/>
-        <alias index="4" field="dijkstra_vis" name=""/>
-        <alias index="5" field="from_osm" name=""/>
-        <alias index="6" field="id" name=""/>
-        <alias index="7" field="station_alt_names" name=""/>
-        <alias index="8" field="station_group" name=""/>
-        <alias index="9" field="station_group_stops" name=""/>
-        <alias index="10" field="station_info_ptr" name=""/>
-        <alias index="11" field="station_name" name=""/>
-        <alias index="12" field="station_platform" name=""/>
-        <alias index="13" field="from" name=""/>
-        <alias index="14" field="level" name=""/>
-        <alias index="15" field="lines" name=""/>
-        <alias index="16" field="m_length" name=""/>
-        <alias index="17" field="oneway" name=""/>
-        <alias index="18" field="restriction" name=""/>
-        <alias index="19" field="to" name=""/>
+        <alias field="component" index="0" name=""/>
+        <alias field="deg" index="1" name=""/>
+        <alias field="deg_in" index="2" name=""/>
+        <alias field="deg_out" index="3" name=""/>
+        <alias field="from_osm" index="4" name=""/>
+        <alias field="id" index="5" name=""/>
+        <alias field="station_alt_names" index="6" name=""/>
+        <alias field="station_group" index="7" name=""/>
+        <alias field="station_group_stops" index="8" name=""/>
+        <alias field="station_info_ptr" index="9" name=""/>
+        <alias field="station_name" index="10" name=""/>
+        <alias field="station_platform" index="11" name=""/>
+        <alias field="from" index="12" name=""/>
+        <alias field="level" index="13" name=""/>
+        <alias field="lines" index="14" name=""/>
+        <alias field="m_length" index="15" name=""/>
+        <alias field="oneway" index="16" name=""/>
+        <alias field="restriction" index="17" name=""/>
+        <alias field="to" index="18" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
-      <defaults>
-        <default field="component" expression="" applyOnUpdate="0"/>
-        <default field="deg" expression="" applyOnUpdate="0"/>
-        <default field="deg_in" expression="" applyOnUpdate="0"/>
-        <default field="deg_out" expression="" applyOnUpdate="0"/>
-        <default field="dijkstra_vis" expression="" applyOnUpdate="0"/>
-        <default field="from_osm" expression="" applyOnUpdate="0"/>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="station_alt_names" expression="" applyOnUpdate="0"/>
-        <default field="station_group" expression="" applyOnUpdate="0"/>
-        <default field="station_group_stops" expression="" applyOnUpdate="0"/>
-        <default field="station_info_ptr" expression="" applyOnUpdate="0"/>
-        <default field="station_name" expression="" applyOnUpdate="0"/>
-        <default field="station_platform" expression="" applyOnUpdate="0"/>
-        <default field="from" expression="" applyOnUpdate="0"/>
-        <default field="level" expression="" applyOnUpdate="0"/>
-        <default field="lines" expression="" applyOnUpdate="0"/>
-        <default field="m_length" expression="" applyOnUpdate="0"/>
-        <default field="oneway" expression="" applyOnUpdate="0"/>
-        <default field="restriction" expression="" applyOnUpdate="0"/>
-        <default field="to" expression="" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint field="component" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_in" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_out" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="dijkstra_vis" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from_osm" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="id" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_alt_names" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group_stops" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_info_ptr" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_name" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_platform" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="level" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="lines" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="m_length" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="oneway" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="restriction" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="to" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="component" exp="" desc=""/>
-        <constraint field="deg" exp="" desc=""/>
-        <constraint field="deg_in" exp="" desc=""/>
-        <constraint field="deg_out" exp="" desc=""/>
-        <constraint field="dijkstra_vis" exp="" desc=""/>
-        <constraint field="from_osm" exp="" desc=""/>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="station_alt_names" exp="" desc=""/>
-        <constraint field="station_group" exp="" desc=""/>
-        <constraint field="station_group_stops" exp="" desc=""/>
-        <constraint field="station_info_ptr" exp="" desc=""/>
-        <constraint field="station_name" exp="" desc=""/>
-        <constraint field="station_platform" exp="" desc=""/>
-        <constraint field="from" exp="" desc=""/>
-        <constraint field="level" exp="" desc=""/>
-        <constraint field="lines" exp="" desc=""/>
-        <constraint field="m_length" exp="" desc=""/>
-        <constraint field="oneway" exp="" desc=""/>
-        <constraint field="restriction" exp="" desc=""/>
-        <constraint field="to" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      <attributeactions default="0">
+        <actionsetting showInAttributeTable="1" action="" icon="" capture="0" type="0" name="" shortTitle=""/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" hidden="0" name="component"/>
-          <column type="field" width="-1" hidden="0" name="deg"/>
-          <column type="field" width="-1" hidden="0" name="deg_in"/>
-          <column type="field" width="-1" hidden="0" name="deg_out"/>
-          <column type="field" width="-1" hidden="0" name="id"/>
-          <column type="field" width="-1" hidden="0" name="from_osm"/>
-          <column type="field" width="-1" hidden="0" name="station_group"/>
-          <column type="field" width="-1" hidden="0" name="station_group_stops"/>
-          <column type="field" width="-1" hidden="0" name="station_name"/>
-          <column type="field" width="-1" hidden="0" name="station_platform"/>
-          <column type="field" width="-1" hidden="0" name="from"/>
-          <column type="field" width="-1" hidden="0" name="level"/>
-          <column type="field" width="-1" hidden="0" name="lines"/>
-          <column type="field" width="-1" hidden="0" name="m_length"/>
-          <column type="field" width="-1" hidden="0" name="oneway"/>
-          <column type="field" width="-1" hidden="0" name="restriction"/>
-          <column type="field" width="-1" hidden="0" name="to"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" hidden="0" name="station_alt_names"/>
-          <column type="field" width="-1" hidden="0" name="station_info_ptr"/>
-          <column type="field" width="-1" hidden="0" name="dijkstra_vis"/>
+          <column width="-1" hidden="0" type="field" name="component"/>
+          <column width="-1" hidden="0" type="field" name="deg"/>
+          <column width="-1" hidden="0" type="field" name="deg_in"/>
+          <column width="-1" hidden="0" type="field" name="deg_out"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="from_osm"/>
+          <column width="-1" hidden="0" type="field" name="station_group"/>
+          <column width="-1" hidden="0" type="field" name="station_group_stops"/>
+          <column width="-1" hidden="0" type="field" name="station_name"/>
+          <column width="-1" hidden="0" type="field" name="station_platform"/>
+          <column width="-1" hidden="0" type="field" name="from"/>
+          <column width="-1" hidden="0" type="field" name="level"/>
+          <column width="-1" hidden="0" type="field" name="lines"/>
+          <column width="-1" hidden="0" type="field" name="m_length"/>
+          <column width="-1" hidden="0" type="field" name="oneway"/>
+          <column width="-1" hidden="0" type="field" name="restriction"/>
+          <column width="-1" hidden="0" type="field" name="to"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" type="field" name="station_alt_names"/>
+          <column width="-1" hidden="0" type="field" name="station_info_ptr"/>
+          <column width="-1" hidden="0" type="field" name="dijkstra_vis"/>
         </columns>
       </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1">.</editform>
+      <editform>.</editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>.</editforminitfilepath>
@@ -3212,59 +1895,39 @@ def my_form_open(dialog, layer, feature):
 ]]></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="component" editable="1"/>
-        <field name="deg" editable="1"/>
-        <field name="deg_in" editable="1"/>
-        <field name="deg_out" editable="1"/>
-        <field name="dijkstra_vis" editable="1"/>
-        <field name="from" editable="1"/>
-        <field name="from_osm" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="level" editable="1"/>
-        <field name="lines" editable="1"/>
-        <field name="m_length" editable="1"/>
-        <field name="oneway" editable="1"/>
-        <field name="restriction" editable="1"/>
-        <field name="station_alt_names" editable="1"/>
-        <field name="station_group" editable="1"/>
-        <field name="station_group_stops" editable="1"/>
-        <field name="station_info_ptr" editable="1"/>
-        <field name="station_name" editable="1"/>
-        <field name="station_platform" editable="1"/>
-        <field name="to" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="component" labelOnTop="0"/>
-        <field name="deg" labelOnTop="0"/>
-        <field name="deg_in" labelOnTop="0"/>
-        <field name="deg_out" labelOnTop="0"/>
-        <field name="dijkstra_vis" labelOnTop="0"/>
-        <field name="from" labelOnTop="0"/>
-        <field name="from_osm" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="level" labelOnTop="0"/>
-        <field name="lines" labelOnTop="0"/>
-        <field name="m_length" labelOnTop="0"/>
-        <field name="oneway" labelOnTop="0"/>
-        <field name="restriction" labelOnTop="0"/>
-        <field name="station_alt_names" labelOnTop="0"/>
-        <field name="station_group" labelOnTop="0"/>
-        <field name="station_group_stops" labelOnTop="0"/>
-        <field name="station_info_ptr" labelOnTop="0"/>
-        <field name="station_name" labelOnTop="0"/>
-        <field name="station_platform" labelOnTop="0"/>
-        <field name="to" labelOnTop="0"/>
-      </labelOnTop>
       <widgets>
         <widget name="orig_ogc_fid">
           <config/>
         </widget>
       </widgets>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <defaults>
+        <default field="component" expression=""/>
+        <default field="deg" expression=""/>
+        <default field="deg_in" expression=""/>
+        <default field="deg_out" expression=""/>
+        <default field="from_osm" expression=""/>
+        <default field="id" expression=""/>
+        <default field="station_alt_names" expression=""/>
+        <default field="station_group" expression=""/>
+        <default field="station_group_stops" expression=""/>
+        <default field="station_info_ptr" expression=""/>
+        <default field="station_name" expression=""/>
+        <default field="station_platform" expression=""/>
+        <default field="from" expression=""/>
+        <default field="level" expression=""/>
+        <default field="lines" expression=""/>
+        <default field="m_length" expression=""/>
+        <default field="oneway" expression=""/>
+        <default field="restriction" expression=""/>
+        <default field="to" expression=""/>
+      </defaults>
       <previewExpression>station_name</previewExpression>
-      <mapTip></mapTip>
     </maplayer>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="0" simplifyDrawingTol="1" geometry="Point" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer simplifyAlgorithm="0" minimumScale="0" maximumScale="0" simplifyDrawingHints="0" minLabelScale="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
       <extent>
         <xmin>6.70734330570000026</xmin>
         <ymin>47.05522500000000008</ymin>
@@ -3289,432 +1952,208 @@ def my_form_open(dialog, layer, feature):
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <edittypes>
+        <edittype widgetv2type="TextEdit" name="component">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_in">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="deg_out">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from_osm">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="id">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_alt_names">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_group_stops">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_info_ptr">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_name">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="station_platform">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="cost">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="dummy">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="from_edge">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="to">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+        <edittype widgetv2type="TextEdit" name="to_edge">
+          <widgetv2config IsMultiline="0" fieldEditable="1" constraint="" UseHtml="0" labelOnTop="0" constraintDescription="" notNull="0"/>
+        </edittype>
+      </edittypes>
+      <renderer-v2 forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
         <symbols>
-          <symbol type="marker" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="84,177,118,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="2" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="marker" name="0">
+            <layer pass="0" class="SimpleMarker" locked="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="84,177,118,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="circle"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0"/>
+              <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="2"/>
+              <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MM"/>
+              <prop k="vertical_anchor_point" v="1"/>
             </layer>
           </symbol>
         </symbols>
         <rotation/>
-        <sizescale/>
+        <sizescale scalemethod="diameter"/>
       </renderer-v2>
+      <labeling type="simple"/>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="-2.14748e+09" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
+      <layerTransparency>0</layerTransparency>
+      <displayfield>station_alt_names</displayfield>
+      <label>0</label>
+      <labelattributes>
+        <label fieldname="" text="Beschriftung"/>
+        <family fieldname="" name="Ubuntu"/>
+        <size fieldname="" units="pt" value="12"/>
+        <bold fieldname="" on="0"/>
+        <italic fieldname="" on="0"/>
+        <underline fieldname="" on="0"/>
+        <strikeout fieldname="" on="0"/>
+        <color fieldname="" red="0" blue="0" green="0"/>
+        <x fieldname=""/>
+        <y fieldname=""/>
+        <offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
+        <angle fieldname="" value="0" auto="0"/>
+        <alignment fieldname="" value="center"/>
+        <buffercolor fieldname="" red="255" blue="255" green="255"/>
+        <buffersize fieldname="" units="pt" value="1"/>
+        <bufferenabled fieldname="" on=""/>
+        <multilineenabled fieldname="" on=""/>
+        <selectedonly on=""/>
+      </labelattributes>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" sizeLegend="0" attributeLegend="1">
+        <DiagramCategory penColor="#000000" labelPlacementMethod="XHeight" penWidth="0" diagramOrientation="Up" sizeScale="0,0,0,0,0,0" minimumSize="0" barWidth="5" penAlpha="255" maxScaleDenominator="1e+08" backgroundColor="#ffffff" transparency="0" width="15" scaleDependency="Area" backgroundAlpha="255" angleOffset="0" scaleBasedVisibility="0" enabled="0" height="15" lineSizeScale="0,0,0,0,0,0" sizeType="MM" lineSizeType="MM" minScaleDenominator="-2.14748e+09">
+          <fontProperties description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
+        <symbol alpha="1" clip_to_extent="1" type="marker" name="sizeSymbol">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="horizontal_anchor_point" v="1"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="name" v="circle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="diameter"/>
+            <prop k="size" v="2"/>
+            <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="size_unit" v="MM"/>
+            <prop k="vertical_anchor_point" v="1"/>
+          </layer>
+        </symbol>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration>
-        <field name="component">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_in">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="deg_out">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="dijkstra_vis">
-          <editWidget type="TextEdit">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from_osm">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="id">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_alt_names">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_group_stops">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_info_ptr">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="station_platform">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="cost">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="dummy">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="from_edge">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="to">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="to_edge">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" value="0" name="IsMultiline"/>
-                <Option type="QString" value="0" name="UseHtml"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
+      <DiagramLayerSettings yPosColumn="0" showColumn="0" linePlacementFlags="2" placement="0" dist="0" xPosColumn="0" priority="0" obstacle="0" zIndex="0" showAll="1"/>
+      <annotationform></annotationform>
       <aliases>
-        <alias index="0" field="component" name=""/>
-        <alias index="1" field="deg" name=""/>
-        <alias index="2" field="deg_in" name=""/>
-        <alias index="3" field="deg_out" name=""/>
-        <alias index="4" field="dijkstra_vis" name=""/>
-        <alias index="5" field="from_osm" name=""/>
-        <alias index="6" field="id" name=""/>
-        <alias index="7" field="station_alt_names" name=""/>
-        <alias index="8" field="station_group" name=""/>
-        <alias index="9" field="station_group_stops" name=""/>
-        <alias index="10" field="station_info_ptr" name=""/>
-        <alias index="11" field="station_name" name=""/>
-        <alias index="12" field="station_platform" name=""/>
-        <alias index="13" field="cost" name=""/>
-        <alias index="14" field="dummy" name=""/>
-        <alias index="15" field="from" name=""/>
-        <alias index="16" field="from_edge" name=""/>
-        <alias index="17" field="to" name=""/>
-        <alias index="18" field="to_edge" name=""/>
+        <alias field="component" index="0" name=""/>
+        <alias field="deg" index="1" name=""/>
+        <alias field="deg_in" index="2" name=""/>
+        <alias field="deg_out" index="3" name=""/>
+        <alias field="from_osm" index="4" name=""/>
+        <alias field="id" index="5" name=""/>
+        <alias field="station_alt_names" index="6" name=""/>
+        <alias field="station_group" index="7" name=""/>
+        <alias field="station_group_stops" index="8" name=""/>
+        <alias field="station_info_ptr" index="9" name=""/>
+        <alias field="station_name" index="10" name=""/>
+        <alias field="station_platform" index="11" name=""/>
+        <alias field="cost" index="12" name=""/>
+        <alias field="dummy" index="13" name=""/>
+        <alias field="from" index="14" name=""/>
+        <alias field="from_edge" index="15" name=""/>
+        <alias field="to" index="16" name=""/>
+        <alias field="to_edge" index="17" name=""/>
       </aliases>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
-      <defaults>
-        <default field="component" expression="" applyOnUpdate="0"/>
-        <default field="deg" expression="" applyOnUpdate="0"/>
-        <default field="deg_in" expression="" applyOnUpdate="0"/>
-        <default field="deg_out" expression="" applyOnUpdate="0"/>
-        <default field="dijkstra_vis" expression="" applyOnUpdate="0"/>
-        <default field="from_osm" expression="" applyOnUpdate="0"/>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="station_alt_names" expression="" applyOnUpdate="0"/>
-        <default field="station_group" expression="" applyOnUpdate="0"/>
-        <default field="station_group_stops" expression="" applyOnUpdate="0"/>
-        <default field="station_info_ptr" expression="" applyOnUpdate="0"/>
-        <default field="station_name" expression="" applyOnUpdate="0"/>
-        <default field="station_platform" expression="" applyOnUpdate="0"/>
-        <default field="cost" expression="" applyOnUpdate="0"/>
-        <default field="dummy" expression="" applyOnUpdate="0"/>
-        <default field="from" expression="" applyOnUpdate="0"/>
-        <default field="from_edge" expression="" applyOnUpdate="0"/>
-        <default field="to" expression="" applyOnUpdate="0"/>
-        <default field="to_edge" expression="" applyOnUpdate="0"/>
-      </defaults>
-      <constraints>
-        <constraint field="component" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_in" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="deg_out" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="dijkstra_vis" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from_osm" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="id" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_alt_names" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_group_stops" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_info_ptr" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_name" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="station_platform" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="cost" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="dummy" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="from_edge" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="to" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-        <constraint field="to_edge" constraints="0" exp_strength="0" unique_strength="0" notnull_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint field="component" exp="" desc=""/>
-        <constraint field="deg" exp="" desc=""/>
-        <constraint field="deg_in" exp="" desc=""/>
-        <constraint field="deg_out" exp="" desc=""/>
-        <constraint field="dijkstra_vis" exp="" desc=""/>
-        <constraint field="from_osm" exp="" desc=""/>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="station_alt_names" exp="" desc=""/>
-        <constraint field="station_group" exp="" desc=""/>
-        <constraint field="station_group_stops" exp="" desc=""/>
-        <constraint field="station_info_ptr" exp="" desc=""/>
-        <constraint field="station_name" exp="" desc=""/>
-        <constraint field="station_platform" exp="" desc=""/>
-        <constraint field="cost" exp="" desc=""/>
-        <constraint field="dummy" exp="" desc=""/>
-        <constraint field="from" exp="" desc=""/>
-        <constraint field="from_edge" exp="" desc=""/>
-        <constraint field="to" exp="" desc=""/>
-        <constraint field="to_edge" exp="" desc=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      <attributeactions default="0">
+        <actionsetting showInAttributeTable="1" action="" icon="" capture="0" type="0" name="" shortTitle=""/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="field" width="-1" hidden="0" name="component"/>
-          <column type="field" width="-1" hidden="0" name="deg"/>
-          <column type="field" width="-1" hidden="0" name="deg_in"/>
-          <column type="field" width="-1" hidden="0" name="deg_out"/>
-          <column type="field" width="-1" hidden="0" name="from_osm"/>
-          <column type="field" width="-1" hidden="0" name="id"/>
-          <column type="field" width="-1" hidden="0" name="station_alt_names"/>
-          <column type="field" width="-1" hidden="0" name="station_group"/>
-          <column type="field" width="-1" hidden="0" name="station_group_stops"/>
-          <column type="field" width="-1" hidden="0" name="station_info_ptr"/>
-          <column type="field" width="-1" hidden="0" name="station_name"/>
-          <column type="field" width="-1" hidden="0" name="station_platform"/>
-          <column type="field" width="-1" hidden="0" name="cost"/>
-          <column type="field" width="-1" hidden="0" name="dummy"/>
-          <column type="field" width="-1" hidden="0" name="from"/>
-          <column type="field" width="-1" hidden="0" name="from_edge"/>
-          <column type="field" width="-1" hidden="0" name="to"/>
-          <column type="field" width="-1" hidden="0" name="to_edge"/>
-          <column type="actions" width="-1" hidden="1"/>
-          <column type="field" width="-1" hidden="0" name="dijkstra_vis"/>
+          <column width="-1" hidden="0" type="field" name="component"/>
+          <column width="-1" hidden="0" type="field" name="deg"/>
+          <column width="-1" hidden="0" type="field" name="deg_in"/>
+          <column width="-1" hidden="0" type="field" name="deg_out"/>
+          <column width="-1" hidden="0" type="field" name="from_osm"/>
+          <column width="-1" hidden="0" type="field" name="id"/>
+          <column width="-1" hidden="0" type="field" name="station_alt_names"/>
+          <column width="-1" hidden="0" type="field" name="station_group"/>
+          <column width="-1" hidden="0" type="field" name="station_group_stops"/>
+          <column width="-1" hidden="0" type="field" name="station_info_ptr"/>
+          <column width="-1" hidden="0" type="field" name="station_name"/>
+          <column width="-1" hidden="0" type="field" name="station_platform"/>
+          <column width="-1" hidden="0" type="field" name="cost"/>
+          <column width="-1" hidden="0" type="field" name="dummy"/>
+          <column width="-1" hidden="0" type="field" name="from"/>
+          <column width="-1" hidden="0" type="field" name="from_edge"/>
+          <column width="-1" hidden="0" type="field" name="to"/>
+          <column width="-1" hidden="0" type="field" name="to_edge"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" type="field" name="dijkstra_vis"/>
         </columns>
       </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1">.</editform>
+      <editform>.</editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>.</editforminitfilepath>
@@ -3737,53 +2176,34 @@ def my_form_open(dialog, layer, feature):
 ]]></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="component" editable="1"/>
-        <field name="cost" editable="1"/>
-        <field name="deg" editable="1"/>
-        <field name="deg_in" editable="1"/>
-        <field name="deg_out" editable="1"/>
-        <field name="dijkstra_vis" editable="1"/>
-        <field name="dummy" editable="1"/>
-        <field name="from" editable="1"/>
-        <field name="from_edge" editable="1"/>
-        <field name="from_osm" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="station_alt_names" editable="1"/>
-        <field name="station_group" editable="1"/>
-        <field name="station_group_stops" editable="1"/>
-        <field name="station_info_ptr" editable="1"/>
-        <field name="station_name" editable="1"/>
-        <field name="station_platform" editable="1"/>
-        <field name="to" editable="1"/>
-        <field name="to_edge" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="component" labelOnTop="0"/>
-        <field name="cost" labelOnTop="0"/>
-        <field name="deg" labelOnTop="0"/>
-        <field name="deg_in" labelOnTop="0"/>
-        <field name="deg_out" labelOnTop="0"/>
-        <field name="dijkstra_vis" labelOnTop="0"/>
-        <field name="dummy" labelOnTop="0"/>
-        <field name="from" labelOnTop="0"/>
-        <field name="from_edge" labelOnTop="0"/>
-        <field name="from_osm" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="station_alt_names" labelOnTop="0"/>
-        <field name="station_group" labelOnTop="0"/>
-        <field name="station_group_stops" labelOnTop="0"/>
-        <field name="station_info_ptr" labelOnTop="0"/>
-        <field name="station_name" labelOnTop="0"/>
-        <field name="station_platform" labelOnTop="0"/>
-        <field name="to" labelOnTop="0"/>
-        <field name="to_edge" labelOnTop="0"/>
-      </labelOnTop>
       <widgets/>
+      <conditionalstyles>
+        <rowstyles/>
+        <fieldstyles/>
+      </conditionalstyles>
+      <defaults>
+        <default field="component" expression=""/>
+        <default field="deg" expression=""/>
+        <default field="deg_in" expression=""/>
+        <default field="deg_out" expression=""/>
+        <default field="from_osm" expression=""/>
+        <default field="id" expression=""/>
+        <default field="station_alt_names" expression=""/>
+        <default field="station_group" expression=""/>
+        <default field="station_group_stops" expression=""/>
+        <default field="station_info_ptr" expression=""/>
+        <default field="station_name" expression=""/>
+        <default field="station_platform" expression=""/>
+        <default field="cost" expression=""/>
+        <default field="dummy" expression=""/>
+        <default field="from" expression=""/>
+        <default field="from_edge" expression=""/>
+        <default field="to" expression=""/>
+        <default field="to_edge" expression=""/>
+      </defaults>
       <previewExpression>station_name</previewExpression>
-      <mapTip></mapTip>
     </maplayer>
-    <maplayer type="raster" autoRefreshTime="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer minimumScale="0" maximumScale="0" type="raster" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.34278925508260727</ymin>
@@ -3803,70 +2223,33 @@ def my_form_open(dialog, layer, feature):
           <srsid>3857</srsid>
           <srid>3857</srid>
           <authid>EPSG:3857</authid>
-          <description>WGS 84 / Pseudo-Mercator</description>
+          <description>WGS 84 / Pseudo Mercator</description>
           <projectionacronym>merc</projectionacronym>
           <ellipsoidacronym>WGS84</ellipsoidacronym>
           <geographicflag>false</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
+      <customproperties>
+        <property key="identify/format" value="Undefined"/>
+      </customproperties>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <customproperties>
-        <property value="Undefined" key="identify/format"/>
-      </customproperties>
       <pipe>
-        <rasterrenderer type="singlebandcolordata" alphaBand="-1" band="1" opacity="1">
+        <rasterrenderer opacity="1" alphaBand="-1" band="1" type="singlebandcolordata">
           <rasterTransparency/>
-          <minMaxOrigin>
-            <limits>None</limits>
-            <extent>WholeRaster</extent>
-            <statAccuracy>Estimated</statAccuracy>
-            <cumulativeCutLower>0.02</cumulativeCutLower>
-            <cumulativeCutUpper>0.98</cumulativeCutUpper>
-            <stdDevFactor>2</stdDevFactor>
-          </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation grayscaleMode="0" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeRed="255" colorizeBlue="128" colorizeStrength="100"/>
+        <huesaturation colorizeGreen="128" colorizeOn="0" colorizeRed="255" colorizeBlue="128" grayscaleMode="0" saturation="0" colorizeStrength="100"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer type="raster" autoRefreshTime="0" styleCategories="AllStyleCategories" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer minimumScale="0" maximumScale="0" type="raster" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.34278925508260727</ymin>
@@ -3886,70 +2269,33 @@ def my_form_open(dialog, layer, feature):
           <srsid>3857</srsid>
           <srid>3857</srid>
           <authid>EPSG:3857</authid>
-          <description>WGS 84 / Pseudo-Mercator</description>
+          <description>WGS 84 / Pseudo Mercator</description>
           <projectionacronym>merc</projectionacronym>
           <ellipsoidacronym>WGS84</ellipsoidacronym>
           <geographicflag>false</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
+      <customproperties>
+        <property key="identify/format" value="Undefined"/>
+      </customproperties>
       <provider>wms</provider>
       <noData>
-        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList bandNo="1" useSrcNoData="0"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <customproperties>
-        <property value="Undefined" key="identify/format"/>
-      </customproperties>
       <pipe>
-        <rasterrenderer type="singlebandcolordata" alphaBand="-1" band="1" opacity="1">
+        <rasterrenderer opacity="1" alphaBand="-1" band="1" type="singlebandcolordata">
           <rasterTransparency/>
-          <minMaxOrigin>
-            <limits>None</limits>
-            <extent>WholeRaster</extent>
-            <statAccuracy>Estimated</statAccuracy>
-            <cumulativeCutLower>0.02</cumulativeCutLower>
-            <cumulativeCutUpper>0.98</cumulativeCutUpper>
-            <stdDevFactor>2</stdDevFactor>
-          </minMaxOrigin>
         </rasterrenderer>
         <brightnesscontrast brightness="0" contrast="0"/>
-        <huesaturation grayscaleMode="0" colorizeOn="0" colorizeGreen="128" saturation="0" colorizeRed="255" colorizeBlue="128" colorizeStrength="100"/>
+        <huesaturation colorizeGreen="128" colorizeOn="0" colorizeRed="255" colorizeBlue="128" grayscaleMode="0" saturation="0" colorizeStrength="100"/>
         <rasterresampler maxOversampling="2"/>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="0" simplifyDrawingTol="1" geometry="Line" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
+    <maplayer simplifyAlgorithm="0" minimumScale="0" maximumScale="0" simplifyDrawingHints="1" minLabelScale="1" maxLabelScale="1e+08" simplifyDrawingTol="1" readOnly="0" geometry="Line" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
       <extent>
         <xmin>6.70738836720000009</xmin>
         <ymin>47.05522500000000008</ymin>
@@ -3974,193 +2320,147 @@ def my_form_open(dialog, layer, feature):
           <geographicflag>true</geographicflag>
         </spatialrefsys>
       </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
       </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
+      <edittypes/>
+      <renderer-v2 forceraster="0" symbollevels="0" type="singleSymbol" enableorderby="0">
         <symbols>
-          <symbol type="line" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="MarkerLine" pass="0" enabled="1">
-              <prop v="3" k="interval"/>
-              <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-              <prop v="MM" k="interval_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="0" k="offset_along_line"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-              <prop v="MM" k="offset_along_line_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="interval" k="placement"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="1" k="rotate"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-              <symbol type="marker" clip_to_extent="1" name="@0@0" alpha="1" force_rhr="0">
-                <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-                  <prop v="0" k="angle"/>
-                  <prop v="255,0,0,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="arrowhead" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="0,0,0,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="area" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
-                  <data_defined_properties>
-                    <Option type="Map">
-                      <Option type="QString" value="" name="name"/>
-                      <Option name="properties"/>
-                      <Option type="QString" value="collection" name="type"/>
-                    </Option>
-                  </data_defined_properties>
+          <symbol alpha="1" clip_to_extent="1" type="line" name="0">
+            <layer pass="0" class="MarkerLine" locked="0">
+              <prop k="interval" v="3"/>
+              <prop k="interval_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="interval_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_along_line" v="0"/>
+              <prop k="offset_along_line_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_along_line_unit" v="MM"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="placement" v="interval"/>
+              <prop k="rotate" v="1"/>
+              <symbol alpha="1" clip_to_extent="1" type="marker" name="@0@0">
+                <layer pass="0" class="SimpleMarker" locked="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="255,0,0,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="arrowhead"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="0,0,0,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="area"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="1.26" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
+            <layer pass="0" class="SimpleLine" locked="0">
+              <prop k="capstyle" v="square"/>
+              <prop k="customdash" v="5;2"/>
+              <prop k="customdash_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="customdash_unit" v="MM"/>
+              <prop k="draw_inside_polygon" v="0"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="line_color" v="255,0,0,255"/>
+              <prop k="line_style" v="solid"/>
+              <prop k="line_width" v="1.26"/>
+              <prop k="line_width_unit" v="MM"/>
+              <prop k="offset" v="0"/>
+              <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="use_custom_dash" v="0"/>
+              <prop k="width_map_unit_scale" v="0,0,0,0,0,0"/>
             </layer>
           </symbol>
         </symbols>
         <rotation/>
-        <sizescale/>
+        <sizescale scalemethod="diameter"/>
       </renderer-v2>
+      <labeling type="simple"/>
       <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
+        <property key="embeddedWidgets/count" value="0"/>
         <property key="variableNames"/>
         <property key="variableValues"/>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>0.7</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="-2.14748e+09" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
+      <layerTransparency>0</layerTransparency>
+      <displayfield></displayfield>
+      <label>0</label>
+      <labelattributes>
+        <label fieldname="" text="Beschriftung"/>
+        <family fieldname="" name="Ubuntu"/>
+        <size fieldname="" units="pt" value="12"/>
+        <bold fieldname="" on="0"/>
+        <italic fieldname="" on="0"/>
+        <underline fieldname="" on="0"/>
+        <strikeout fieldname="" on="0"/>
+        <color fieldname="" red="0" blue="0" green="0"/>
+        <x fieldname=""/>
+        <y fieldname=""/>
+        <offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
+        <angle fieldname="" value="0" auto="0"/>
+        <alignment fieldname="" value="center"/>
+        <buffercolor fieldname="" red="255" blue="255" green="255"/>
+        <buffersize fieldname="" units="pt" value="1"/>
+        <bufferenabled fieldname="" on=""/>
+        <multilineenabled fieldname="" on=""/>
+        <selectedonly on=""/>
+      </labelattributes>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" sizeLegend="0" attributeLegend="1">
+        <DiagramCategory penColor="#000000" labelPlacementMethod="XHeight" penWidth="0" diagramOrientation="Up" sizeScale="0,0,0,0,0,0" minimumSize="0" barWidth="5" penAlpha="255" maxScaleDenominator="1e+08" backgroundColor="#ffffff" transparency="0" width="15" scaleDependency="Area" backgroundAlpha="255" angleOffset="0" scaleBasedVisibility="0" enabled="0" height="15" lineSizeScale="0,0,0,0,0,0" sizeType="MM" lineSizeType="MM" minScaleDenominator="-2.14748e+09">
+          <fontProperties description="Ubuntu,11,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" label=""/>
         </DiagramCategory>
+        <symbol alpha="1" clip_to_extent="1" type="marker" name="sizeSymbol">
+          <layer pass="0" class="SimpleMarker" locked="0">
+            <prop k="angle" v="0"/>
+            <prop k="color" v="255,0,0,255"/>
+            <prop k="horizontal_anchor_point" v="1"/>
+            <prop k="joinstyle" v="bevel"/>
+            <prop k="name" v="circle"/>
+            <prop k="offset" v="0,0"/>
+            <prop k="offset_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="offset_unit" v="MM"/>
+            <prop k="outline_color" v="0,0,0,255"/>
+            <prop k="outline_style" v="solid"/>
+            <prop k="outline_width" v="0"/>
+            <prop k="outline_width_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="outline_width_unit" v="MM"/>
+            <prop k="scale_method" v="diameter"/>
+            <prop k="size" v="2"/>
+            <prop k="size_map_unit_scale" v="0,0,0,0,0,0"/>
+            <prop k="size_unit" v="MM"/>
+            <prop k="vertical_anchor_point" v="1"/>
+          </layer>
+        </symbol>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration/>
+      <DiagramLayerSettings yPosColumn="0" showColumn="0" linePlacementFlags="2" placement="2" dist="0" xPosColumn="0" priority="0" obstacle="0" zIndex="0" showAll="1"/>
+      <annotationform></annotationform>
       <aliases/>
       <excludeAttributesWMS/>
       <excludeAttributesWFS/>
-      <defaults/>
-      <constraints/>
-      <constraintExpressions/>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+      <attributeactions default="0">
+        <actionsetting showInAttributeTable="1" action="" icon="" capture="0" type="0" name="" shortTitle=""/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
         <columns>
-          <column type="actions" width="-1" hidden="1"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1">.</editform>
+      <editform>.</editform>
       <editforminit/>
       <editforminitcodesource>0</editforminitcodesource>
       <editforminitfilepath>.</editforminitfilepath>
@@ -4183,1965 +2483,96 @@ def my_form_open(dialog, layer, feature):
 ]]></editforminitcode>
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
-      <editable/>
-      <labelOnTop/>
       <widgets/>
-      <previewExpression></previewExpression>
-      <mapTip>ver</mapTip>
-    </maplayer>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="1" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="0" simplifyDrawingTol="1" geometry="Line" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
-      <id>trgraph_trgraph_LineString20180508200527144</id>
-      <datasource>./trgraph.json|layerid=0|geometrytype=LineString</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>trgraph trgraph LineString</layername>
-      <srs>
-        <spatialrefsys>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>WGS84</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
-      <provider encoding="UTF-8">ogr</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="graduatedSymbol" attr=" to_int(&quot;numtrips&quot;)" forceraster="0" graduatedMethod="GraduatedColor" symbollevels="0" enableorderby="0">
-        <ranges>
-          <range label=" 12 - 60 " render="true" lower="12.000000000000000" upper="59.840000000000003" symbol="0"/>
-          <range label=" 60 - 108 " render="true" lower="59.840000000000003" upper="107.680000000000007" symbol="1"/>
-          <range label=" 108 - 156 " render="true" lower="107.680000000000007" upper="155.520000000000010" symbol="2"/>
-          <range label=" 156 - 203 " render="true" lower="155.520000000000010" upper="203.360000000000014" symbol="3"/>
-          <range label=" 203 - 251 " render="true" lower="203.360000000000014" upper="251.200000000000017" symbol="4"/>
-          <range label=" 251 - 299 " render="true" lower="251.200000000000017" upper="299.040000000000020" symbol="5"/>
-          <range label=" 299 - 347 " render="true" lower="299.040000000000020" upper="346.879999999999995" symbol="6"/>
-          <range label=" 347 - 395 " render="true" lower="346.879999999999995" upper="394.720000000000027" symbol="7"/>
-          <range label=" 395 - 443 " render="true" lower="394.720000000000027" upper="442.560000000000059" symbol="8"/>
-          <range label=" 443 - 490 " render="true" lower="442.560000000000059" upper="490.400000000000091" symbol="9"/>
-          <range label=" 490 - 538 " render="true" lower="490.400000000000091" upper="538.240000000000123" symbol="10"/>
-          <range label=" 538 - 586 " render="true" lower="538.240000000000123" upper="586.080000000000155" symbol="11"/>
-          <range label=" 586 - 634 " render="true" lower="586.080000000000155" upper="633.920000000000186" symbol="12"/>
-          <range label=" 634 - 682 " render="true" lower="633.920000000000186" upper="681.760000000000218" symbol="13"/>
-          <range label=" 682 - 730 " render="true" lower="681.760000000000218" upper="729.600000000000250" symbol="14"/>
-          <range label=" 730 - 777 " render="true" lower="729.600000000000250" upper="777.440000000000282" symbol="15"/>
-          <range label=" 777 - 825 " render="true" lower="777.440000000000282" upper="825.280000000000314" symbol="16"/>
-          <range label=" 825 - 873 " render="true" lower="825.280000000000314" upper="873.120000000000346" symbol="17"/>
-          <range label=" 873 - 921 " render="true" lower="873.120000000000346" upper="920.960000000000377" symbol="18"/>
-          <range label=" 921 - 969 " render="true" lower="920.960000000000377" upper="968.800000000000409" symbol="19"/>
-          <range label=" 969 - 1017 " render="true" lower="968.800000000000409" upper="1016.640000000000441" symbol="20"/>
-          <range label=" 1017 - 1064 " render="true" lower="1016.640000000000441" upper="1064.480000000000473" symbol="21"/>
-          <range label=" 1064 - 1112 " render="true" lower="1064.480000000000473" upper="1112.320000000000391" symbol="22"/>
-          <range label=" 1112 - 1160 " render="true" lower="1112.320000000000391" upper="1160.160000000000309" symbol="23"/>
-          <range label=" 1160 - 1208 " render="true" lower="1160.160000000000309" upper="1208.000000000000227" symbol="24"/>
-          <range label=" 1208 - 1256 " render="true" lower="1208.000000000000227" upper="1255.840000000000146" symbol="25"/>
-          <range label=" 1256 - 1304 " render="true" lower="1255.840000000000146" upper="1303.680000000000064" symbol="26"/>
-          <range label=" 1304 - 1352 " render="true" lower="1303.680000000000064" upper="1351.519999999999982" symbol="27"/>
-          <range label=" 1352 - 1399 " render="true" lower="1351.519999999999982" upper="1399.359999999999900" symbol="28"/>
-          <range label=" 1399 - 1447 " render="true" lower="1399.359999999999900" upper="1447.199999999999818" symbol="29"/>
-          <range label=" 1447 - 1495 " render="true" lower="1447.199999999999818" upper="1495.039999999999736" symbol="30"/>
-          <range label=" 1495 - 1543 " render="true" lower="1495.039999999999736" upper="1542.879999999999654" symbol="31"/>
-          <range label=" 1543 - 1591 " render="true" lower="1542.879999999999654" upper="1590.719999999999573" symbol="32"/>
-          <range label=" 1591 - 1639 " render="true" lower="1590.719999999999573" upper="1638.559999999999491" symbol="33"/>
-          <range label=" 1639 - 1686 " render="true" lower="1638.559999999999491" upper="1686.399999999999409" symbol="34"/>
-          <range label=" 1686 - 1734 " render="true" lower="1686.399999999999409" upper="1734.239999999999327" symbol="35"/>
-          <range label=" 1734 - 1782 " render="true" lower="1734.239999999999327" upper="1782.079999999999245" symbol="36"/>
-          <range label=" 1782 - 1830 " render="true" lower="1782.079999999999245" upper="1829.919999999999163" symbol="37"/>
-          <range label=" 1830 - 1878 " render="true" lower="1829.919999999999163" upper="1877.759999999999081" symbol="38"/>
-          <range label=" 1878 - 1926 " render="true" lower="1877.759999999999081" upper="1925.599999999999000" symbol="39"/>
-          <range label=" 1926 - 1973 " render="true" lower="1925.599999999999000" upper="1973.439999999998918" symbol="40"/>
-          <range label=" 1973 - 2021 " render="true" lower="1973.439999999998918" upper="2021.279999999998836" symbol="41"/>
-          <range label=" 2021 - 2069 " render="true" lower="2021.279999999998836" upper="2069.119999999998981" symbol="42"/>
-          <range label=" 2069 - 2117 " render="true" lower="2069.119999999998981" upper="2116.959999999999127" symbol="43"/>
-          <range label=" 2117 - 2165 " render="true" lower="2116.959999999999127" upper="2164.799999999999272" symbol="44"/>
-          <range label=" 2165 - 2213 " render="true" lower="2164.799999999999272" upper="2212.639999999999418" symbol="45"/>
-          <range label=" 2213 - 2260 " render="true" lower="2212.639999999999418" upper="2260.479999999999563" symbol="46"/>
-          <range label=" 2260 - 2308 " render="true" lower="2260.479999999999563" upper="2308.319999999999709" symbol="47"/>
-          <range label=" 2308 - 2356 " render="true" lower="2308.319999999999709" upper="2356.159999999999854" symbol="48"/>
-          <range label=" 2356 - 2404 " render="true" lower="2356.159999999999854" upper="2404.000000000000000" symbol="49"/>
-        </ranges>
-        <symbols>
-          <symbol type="line" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="0,255,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="1" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="5,250,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="10" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="52,203,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="11" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="57,198,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="12" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="62,193,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="13" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="67,188,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="14" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="73,182,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="15" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="78,177,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="16" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="83,172,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="17" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="88,167,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="18" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="94,161,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="19" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="99,156,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="2" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="10,245,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="20" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="104,151,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="21" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="109,146,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="22" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="114,141,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="23" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="120,135,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="24" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="125,130,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="25" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="130,125,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="26" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="135,120,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="27" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="141,114,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="28" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="146,109,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="29" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="151,104,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="3" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="15,240,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="30" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="156,99,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="31" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="161,94,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="32" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="167,88,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="33" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="172,83,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="34" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="177,78,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="35" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="182,73,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="36" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="188,67,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="37" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="193,62,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="38" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="198,57,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="39" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="203,52,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="4" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="20,235,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="40" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="208,47,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="41" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="214,41,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="42" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="219,36,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="43" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="224,31,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="44" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="229,26,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="45" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="235,20,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="46" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="240,15,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="47" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="245,10,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="48" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="250,5,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="49" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="255,0,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="5" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="26,229,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="6" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="31,224,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="7" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="36,219,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="8" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="41,214,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-          <symbol type="line" clip_to_extent="1" name="9" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="47,208,0,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </symbols>
-        <source-symbol>
-          <symbol type="line" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleLine" pass="0" enabled="1">
-              <prop v="square" k="capstyle"/>
-              <prop v="5;2" k="customdash"/>
-              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-              <prop v="MM" k="customdash_unit"/>
-              <prop v="0" k="draw_inside_polygon"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="128,107,75,255" k="line_color"/>
-              <prop v="solid" k="line_style"/>
-              <prop v="0.46" k="line_width"/>
-              <prop v="MM" k="line_width_unit"/>
-              <prop v="0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0" k="ring_filter"/>
-              <prop v="0" k="use_custom_dash"/>
-              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </source-symbol>
-        <colorramp type="gradient" name="[source]">
-          <prop v="255,0,0,255" k="color1"/>
-          <prop v="0,255,0,255" k="color2"/>
-          <prop v="0" k="discrete"/>
-          <prop v="gradient" k="rampType"/>
-        </colorramp>
-        <mode name="equal"/>
-        <symmetricMode symmetryPoint="0" enabled="false" astride="false"/>
-        <rotation/>
-        <sizescale/>
-        <labelformat decimalplaces="0" format=" %1 - %2 " trimtrailingzeroes="false"/>
-      </renderer-v2>
-      <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="2" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration/>
-      <aliases/>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
-      <defaults/>
-      <constraints/>
-      <constraintExpressions/>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-        </columns>
-      </attributetableconfig>
       <conditionalstyles>
         <rowstyles/>
         <fieldstyles/>
       </conditionalstyles>
-      <editform tolerant="1">.</editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable/>
-      <labelOnTop/>
-      <widgets/>
-      <previewExpression></previewExpression>
-      <mapTip>id</mapTip>
-    </maplayer>
-    <maplayer type="vector" autoRefreshTime="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" refreshOnNotifyEnabled="0" simplifyDrawingHints="0" autoRefreshEnabled="0" refreshOnNotifyMessage="" labelsEnabled="0" simplifyDrawingTol="1" geometry="Point" simplifyAlgorithm="0" readOnly="0" hasScaleBasedVisibilityFlag="0" maxScale="0" minScale="1e+08">
-      <id>trgraph_trgraph_Point20180508200527256</id>
-      <datasource>./trgraph.json|layerid=0|geometrytype=Point</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>trgraph trgraph Point</layername>
-      <srs>
-        <spatialrefsys>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>WGS84</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
-        <links/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent>
-          <spatial dimensions="2" maxz="0" maxy="0" crs="" miny="0" maxx="0" minz="0" minx="0"/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
-      </resourceMetadata>
-      <provider encoding="UTF-8">ogr</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <legend type="default-vector"/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-      </flags>
-      <renderer-v2 type="singleSymbol" forceraster="0" symbollevels="0" enableorderby="0">
-        <symbols>
-          <symbol type="marker" clip_to_extent="1" name="0" alpha="1" force_rhr="0">
-            <layer locked="0" class="SimpleMarker" pass="0" enabled="1">
-              <prop v="0" k="angle"/>
-              <prop v="68,68,141,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="circle" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="2" k="size"/>
-              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
-              <prop v="1" k="vertical_anchor_point"/>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option type="QString" value="" name="name"/>
-                  <Option name="properties"/>
-                  <Option type="QString" value="collection" name="type"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </symbols>
-        <rotation/>
-        <sizescale/>
-      </renderer-v2>
-      <customproperties>
-        <property value="0" key="embeddedWidgets/count"/>
-        <property key="variableNames"/>
-        <property key="variableValues"/>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory backgroundAlpha="255" minimumSize="0" sizeType="MM" height="15" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" penWidth="0" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" diagramOrientation="Up" scaleDependency="Area" barWidth="5" lineSizeType="MM" enabled="0" opacity="1" width="15" penColor="#000000" maxScaleDenominator="1e+08" scaleBasedVisibility="0" backgroundColor="#ffffff">
-          <fontProperties style="" description="Ubuntu,11,-1,5,50,0,0,0,0,0"/>
-          <attribute label="" field="" color="#000000"/>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" showAll="1" placement="0" obstacle="0" linePlacementFlags="2" zIndex="0" dist="0">
-        <properties>
-          <Option type="Map">
-            <Option type="QString" value="" name="name"/>
-            <Option name="properties"/>
-            <Option type="QString" value="collection" name="type"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <fieldConfiguration/>
-      <aliases/>
-      <excludeAttributesWMS/>
-      <excludeAttributesWFS/>
       <defaults/>
-      <constraints/>
-      <constraintExpressions/>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
-        <columns>
-          <column type="actions" width="-1" hidden="1"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <editform tolerant="1">.</editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable/>
-      <labelOnTop/>
-      <widgets/>
       <previewExpression></previewExpression>
-      <mapTip>id</mapTip>
     </maplayer>
   </projectlayers>
-  <layerorder>
-    <layer id="OGRGeoJSON_Point20180203134333739"/>
-    <layer id="OGRGeoJSON_LineString20180203134333975"/>
-    <layer id="OGRGeoJSON_Point20180206114956218"/>
-    <layer id="OGRGeoJSON_LineString20180206114956229"/>
-    <layer id="path20180217155708341"/>
-    <layer id="trgraph_trgraph_LineString20180508200527144"/>
-    <layer id="trgraph_trgraph_Point20180508200527256"/>
-    <layer id="OSM_Transportation20181215024818603"/>
-    <layer id="OpenStreetMap_de20181215024846026"/>
-  </layerorder>
   <properties>
-    <DefaultStyles>
-      <AlphaInt type="int">255</AlphaInt>
-      <Marker type="QString"></Marker>
-      <Fill type="QString"></Fill>
-      <ColorRamp type="QString"></ColorRamp>
-      <Line type="QString"></Line>
-      <RandomColors type="bool">true</RandomColors>
-    </DefaultStyles>
-    <WMSKeywordList type="QStringList">
-      <value></value>
-    </WMSKeywordList>
-    <SpatialRefSys>
-      <ProjectCRSProj4String type="QString">+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs</ProjectCRSProj4String>
-      <ProjectCrs type="QString">EPSG:3857</ProjectCrs>
-      <ProjectCRSID type="int">3857</ProjectCRSID>
-      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
-    </SpatialRefSys>
-    <Measurement>
-      <DistanceUnits type="QString">meters</DistanceUnits>
-      <AreaUnits type="QString">m2</AreaUnits>
-    </Measurement>
-    <Identify>
-      <disabledLayers type="QStringList"/>
-    </Identify>
-    <Paths>
-      <Absolute type="bool">false</Absolute>
-    </Paths>
-    <WFSTLayers>
-      <Delete type="QStringList"/>
-      <Update type="QStringList"/>
-      <Insert type="QStringList"/>
-    </WFSTLayers>
-    <WMSServiceTitle type="QString"></WMSServiceTitle>
-    <WMSContactMail type="QString"></WMSContactMail>
-    <PAL>
-      <CandidatesPolygon type="int">30</CandidatesPolygon>
-      <ShowingCandidates type="bool">false</ShowingCandidates>
-      <ShowingPartialsLabels type="bool">true</ShowingPartialsLabels>
-      <SearchMethod type="int">0</SearchMethod>
-      <ShowingAllLabels type="bool">false</ShowingAllLabels>
-      <TextFormat type="int">0</TextFormat>
-      <CandidatesPoint type="int">16</CandidatesPoint>
-      <CandidatesLine type="int">50</CandidatesLine>
-      <DrawRectOnly type="bool">false</DrawRectOnly>
-    </PAL>
-    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
-    <WMSContactPerson type="QString"></WMSContactPerson>
-    <PositionPrecision>
-      <DecimalPlaces type="int">2</DecimalPlaces>
-      <DegreeFormat type="QString">D</DegreeFormat>
-      <Automatic type="bool">true</Automatic>
-    </PositionPrecision>
-    <WMSContactPhone type="QString"></WMSContactPhone>
-    <WFSUrl type="QString"></WFSUrl>
-    <WMSUrl type="QString"></WMSUrl>
-    <WFSLayers type="QStringList"/>
-    <WMSFees type="QString">conditions unknown</WMSFees>
-    <WCSUrl type="QString"></WCSUrl>
-    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
     <Variables>
       <variableNames type="QStringList"/>
       <variableValues type="QStringList"/>
     </Variables>
-    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
-    <Gui>
-      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
-      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
-      <CanvasColorBluePart type="int">240</CanvasColorBluePart>
-      <SelectionColorBluePart type="int">0</SelectionColorBluePart>
-      <CanvasColorRedPart type="int">240</CanvasColorRedPart>
-      <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
-      <CanvasColorGreenPart type="int">240</CanvasColorGreenPart>
-    </Gui>
-    <WMSImageQuality type="int">90</WMSImageQuality>
+    <WMSContactPerson type="QString"></WMSContactPerson>
     <WMSOnlineResource type="QString"></WMSOnlineResource>
-    <WMSContactPosition type="QString"></WMSContactPosition>
+    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
     <WMSContactOrganization type="QString"></WMSContactOrganization>
-    <WCSLayers type="QStringList"/>
-    <Digitizing>
-      <LayerSnappingToleranceUnitList type="QStringList">
-        <value>2</value>
-        <value>2</value>
-        <value>2</value>
-        <value>2</value>
-        <value>2</value>
-        <value>2</value>
-        <value>2</value>
-      </LayerSnappingToleranceUnitList>
-      <DefaultSnapType type="QString">off</DefaultSnapType>
-      <LayerSnappingList type="QStringList">
-        <value>OGRGeoJSON_LineString20180203134333975</value>
-        <value>OGRGeoJSON_LineString20180206114956229</value>
-        <value>OGRGeoJSON_Point20180203134333739</value>
-        <value>OGRGeoJSON_Point20180206114956218</value>
-        <value>path20180217155708341</value>
-        <value>trgraph_trgraph_LineString20180508200527144</value>
-        <value>trgraph_trgraph_Point20180508200527256</value>
-      </LayerSnappingList>
-      <AvoidIntersectionsList type="QStringList"/>
-      <LayerSnappingToleranceList type="QStringList">
-        <value>0.000000</value>
-        <value>0.000000</value>
-        <value>0.000000</value>
-        <value>0.000000</value>
-        <value>0.000000</value>
-        <value>0.000000</value>
-        <value>0.000000</value>
-      </LayerSnappingToleranceList>
-      <DefaultSnapTolerance type="double">0</DefaultSnapTolerance>
-      <DefaultSnapToleranceUnit type="int">2</DefaultSnapToleranceUnit>
-      <LayerSnapToList type="QStringList">
-        <value>to_vertex</value>
-        <value>to_vertex</value>
-        <value>to_vertex</value>
-        <value>to_vertex</value>
-        <value>to_vertex</value>
-        <value>to_vertex_and_segment</value>
-        <value>to_vertex_and_segment</value>
-      </LayerSnapToList>
-      <LayerSnappingEnabledList type="QStringList">
-        <value>enabled</value>
-        <value>enabled</value>
-        <value>enabled</value>
-        <value>enabled</value>
-        <value>enabled</value>
-        <value>disabled</value>
-        <value>disabled</value>
-      </LayerSnappingEnabledList>
-      <SnappingMode type="QString">current_layer</SnappingMode>
-    </Digitizing>
+    <WMSKeywordList type="QStringList">
+      <value></value>
+    </WMSKeywordList>
+    <WFSUrl type="QString"></WFSUrl>
+    <Paths>
+      <Absolute type="bool">false</Absolute>
+    </Paths>
+    <WMSServiceTitle type="QString"></WMSServiceTitle>
+    <WFSLayers type="QStringList"/>
+    <WMSContactMail type="QString"></WMSContactMail>
+    <PositionPrecision>
+      <DecimalPlaces type="int">2</DecimalPlaces>
+      <Automatic type="bool">true</Automatic>
+      <DegreeFormat type="QString">MU</DegreeFormat>
+    </PositionPrecision>
+    <WCSUrl type="QString"></WCSUrl>
+    <WMSServiceCapabilities type="bool">false</WMSServiceCapabilities>
+    <WMSContactPhone type="QString"></WMSContactPhone>
+    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
+    <WMSContactPosition type="QString"></WMSContactPosition>
+    <WMSAddWktGeometry type="bool">false</WMSAddWktGeometry>
     <Measure>
       <Ellipsoid type="QString">WGS84</Ellipsoid>
     </Measure>
-    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
+    <WMSPrecision type="QString">8</WMSPrecision>
+    <WMSSegmentizeFeatureInfoGeometry type="bool">false</WMSSegmentizeFeatureInfoGeometry>
+    <WFSTLayers>
+      <Insert type="QStringList"/>
+      <Update type="QStringList"/>
+      <Delete type="QStringList"/>
+    </WFSTLayers>
+    <Gui>
+      <SelectionColorBluePart type="int">0</SelectionColorBluePart>
+      <CanvasColorGreenPart type="int">255</CanvasColorGreenPart>
+      <CanvasColorRedPart type="int">255</CanvasColorRedPart>
+      <SelectionColorRedPart type="int">255</SelectionColorRedPart>
+      <SelectionColorAlphaPart type="int">255</SelectionColorAlphaPart>
+      <SelectionColorGreenPart type="int">255</SelectionColorGreenPart>
+      <CanvasColorBluePart type="int">255</CanvasColorBluePart>
+    </Gui>
+    <Identify>
+      <disabledLayers type="QStringList"/>
+    </Identify>
     <Macros>
       <pythonCode type="QString"></pythonCode>
     </Macros>
-    <WMSUseLayerIDs type="bool">false</WMSUseLayerIDs>
-    <WMSServiceAbstract type="QString"></WMSServiceAbstract>
-    <WMSPrecision type="QString">8</WMSPrecision>
+    <WMSAccessConstraints type="QString">None</WMSAccessConstraints>
+    <WCSLayers type="QStringList"/>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
     </Legend>
+    <SpatialRefSys>
+      <ProjectCRSProj4String type="QString">+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs</ProjectCRSProj4String>
+      <ProjectCrs type="QString">EPSG:3395</ProjectCrs>
+      <ProjectCRSID type="int">1353</ProjectCRSID>
+      <ProjectionsEnabled type="int">1</ProjectionsEnabled>
+    </SpatialRefSys>
+    <DefaultStyles>
+      <Fill type="QString"></Fill>
+      <Line type="QString"></Line>
+      <Marker type="QString"></Marker>
+      <RandomColors type="bool">true</RandomColors>
+      <AlphaInt type="int">255</AlphaInt>
+      <ColorRamp type="QString"></ColorRamp>
+    </DefaultStyles>
+    <WMSFees type="QString">conditions unknown</WMSFees>
+    <WMSImageQuality type="int">90</WMSImageQuality>
+    <Measurement>
+      <DistanceUnits type="QString">meters</DistanceUnits>
+      <AreaUnits type="QString">m2</AreaUnits>
+    </Measurement>
+    <WMSUrl type="QString"></WMSUrl>
   </properties>
   <visibility-presets/>
-  <transformContext/>
-  <projectMetadata>
-    <identifier></identifier>
-    <parentidentifier></parentidentifier>
-    <language></language>
-    <type></type>
-    <title></title>
-    <abstract></abstract>
-    <links/>
-    <author></author>
-    <creation></creation>
-  </projectMetadata>
-  <Annotations/>
-  <Layouts/>
 </qgis>
diff --git a/pfaedle.cfg b/pfaedle.cfg
index 8840534..1ec3a62 100644
--- a/pfaedle.cfg
+++ b/pfaedle.cfg
@@ -3,6 +3,10 @@
 # Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 [tram, bus, coach, subway, rail, gondola, funicular, ferry]
+
+routing_transition_penalty_fac:     0.0083
+routing_station_move_penalty_fac:	0.00087
+
 # Regular expressions and station comparision is
 # always case insensitive!
 station_normalize_chain:
@@ -334,22 +338,9 @@ osm_line_relation_tags:
 	from_name=from
 	to_name=to
 
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	[public_transport=stop_area]uic_ref=500
-	[public_transport=stop_area]wikidata=500
-	name=100
-	[public_transport=stop_area]name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 100, 200
+# max distance in meters between a snapped position on an
+# edge and the input GTFS/OSM station
+osm_max_snap_distance:	200
 
 # max edge level to which station will be snapped
 osm_max_snap_level: 2
@@ -372,24 +363,31 @@ osm_track_number_tags:
 	local_ref
 	ref
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.25
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	2
-routing_lvl4_fac:	2.5
-routing_lvl5_fac:	3.5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	7
+# avg speed on segment levels, in km/h
+osm_lvl0_avg_speed:	120  # default level
+osm_lvl1_avg_speed:	90
+osm_lvl2_avg_speed:	65
+osm_lvl3_avg_speed:	50
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	20
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
-# Punishment (in meters) to add to the distance
+# Punishment (in seconds) to add to the distance
 # function if a vehicle performans a full turn
-routing_full_turn_punish:			3000
+routing_full_turn_penalty:		180    # 3 minutes
 
-routing_station_distance_punish_fac: 3.14
+# Penalty added to non-station placements
+routing_non_station_penalty:        0.5
 
-routing_non_osm_station_punish:		100
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
-routing_platform_unmatched_punish:	2000
+# If the platform does not match, add this penalty
+routing_platform_unmatched_penalty: 0.1
+
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
 # Max angle that should be counted as a full turn
 routing_full_turn_angle:			100
@@ -397,24 +395,25 @@ routing_full_turn_angle:			100
 # Max angle in a route from a station to an already reachable neighbar
 routing_snap_full_turn_angle:	100
 
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
+# Factor by which the vehicle slows down in a one way street (factor 5
+# means it will take 5 times longer)
+osm_one_way_speed_penalty_fac: 5
 
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
+# Additional one-time time penalty for entering a one-way segment
+# in seconds
+osm_one_way_entry_cost: 300
 
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  1
+# If a segment has no matching line attributes, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+routing_line_unmatched_time_penalty_fac:            1.5
+routing_line_station_to_unmatched_time_penalty:     1.2
+routing_line_station_from_unmatched_time_penalty:   1.1
 
-# Punishment factor for every meter a vehicle
-# travels through an edge without any line
-# information when no specific line was requested
-# routing_no_lines_punish_fac:  0
+# If a segment has no line attributes at all, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+# routing_no_lines_penalty_fac:  1
 
 # special line normalization for trains
 line_normalize_chain:
@@ -558,6 +557,12 @@ osm_filter_keep:
 	type=restriction:motorcar
 
 osm_filter_lvl1:
+	highway=trunk
+	highway=trunk_link
+	highway=primary
+	highway=primary_link
+
+osm_filter_lvl2:
 	highway=secondary
 	highway=secondary_link
 	bus=yes
@@ -574,22 +579,22 @@ osm_filter_lvl1:
 	trolley_bus=yes
 	psv=designated
 
-osm_filter_lvl2:
+osm_filter_lvl3:
 	highway=tertiary
 	highway=tertiary_link
 
-osm_filter_lvl3:
+osm_filter_lvl4:
 	highway=unclassified
 	highway=residential
 	highway=road
 
-osm_filter_lvl4:
+osm_filter_lvl5:
 	highway=living_street
 	highway=pedestrian
 	highway=service
 	psv=no
 
-osm_filter_lvl5:
+osm_filter_lvl6:
 	bus=no
 	service=siding
 	access=permissive
@@ -597,6 +602,7 @@ osm_filter_lvl5:
 	access=no
 	service=parking_aisle
 	highway=footway
+	highway=track
 
 # OSM entities to drop, as k=v. Applies to nodes, edges and
 # relations.
@@ -714,6 +720,12 @@ osm_filter_station:
 	highway=bus_stop
 	amenity=bus_station
 
+osm_filter_turning_cycle:
+	highway=turning_cycle
+	highway=turning_loop
+	junction=roundabout
+	highway=mini_roundabout
+
 # Relation fields that should be used for catching the lines that
 # occur on an edge. Only relations that have been kept during the
 # filtering above will be checked. The 'linename' will be normalized
@@ -727,26 +739,20 @@ osm_line_relation_tags:
 	line_name=ref,name   # careful, no space after/before comma allowed!
 	from_name=from
 	to_name=to
+	line_color=colour,color
 
+# max distance in meters between a OSM station candidate
+# and the input GTFS station
+osm_max_station_cand_distance: 200
 
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance: 10, 50, 100
-
-osm_max_snap_fallback_distance: 300
+# max distance in meters between a snapped position on an
+# edge and the input GTFS/OSM station
+osm_max_snap_distance: 100
 
 osm_max_snap_level: 5
 
+# max distance between a snapped OSM station and is snap
+# point to still be considered a "OSM station"
 osm_max_osm_station_distance: 8.0
 
 # sorted by priority, first found attr will be taken
@@ -757,22 +763,48 @@ osm_station_name_attrs:
 # the track number tag in stop nodes, first one is taken
 osm_track_number_tags:	local_ref
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.25
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	1.75
-routing_lvl4_fac:	2.25
-routing_lvl5_fac:	3
-routing_lvl6_fac:	4
-routing_lvl7_fac:	5
+# avg speed on segment levels, in km/h
+osm_lvl0_avg_speed:	85  # default level
+osm_lvl1_avg_speed:	70
+osm_lvl2_avg_speed:	55
+osm_lvl3_avg_speed:	40
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	20
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
-# Punishment (in meters) to add to the distance
+# Factor by which the vehicle slows down in a one way street (factor 5
+# means it will take 5 times longer)
+osm_one_way_speed_penalty_fac: 5
+
+# Additional one-time time penalty for entering a one-way segment
+# in seconds
+osm_one_way_entry_cost: 300
+
+# If a segment has no matching line attributes, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+routing_line_unmatched_time_penalty_fac:            1.5
+routing_line_station_to_unmatched_time_penalty:     1.2
+routing_line_station_from_unmatched_time_penalty:   1.1
+
+# If a segment has no line attributes at all, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+# routing_no_lines_penalty_fac:  1
+
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.1
+
+# Punishment (in seconds) to add to the distance
 # function if a vehicle performans a full turn
-routing_full_turn_punish:			500
+routing_full_turn_penalty:		120    # 2 minutes
 
-routing_station_distance_punish_fac: 2.5
+# Penalty added to non-station placements
+routing_non_station_penalty: 0.5
 
-routing_non_osm_station_punish:		500
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
 # Max angle that should be counted as a full turn
 routing_full_turn_angle:			20
@@ -782,26 +814,6 @@ routing_snap_full_turn_angle:	110
 
 osm_max_node_block_distance:	10
 
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   0
-
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:	4
-
-routing_one_way_edge_punish:	5000
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-# routing_line_unmatched_punish_fac:  1.75
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any line
-# information when no specific line was requested
-# routing_no_lines_punish_fac:  0
 
 [coach]
 
@@ -850,14 +862,14 @@ osm_filter_lvl7:
 	service=parking_aisle
 	highway=footway
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.15
-routing_lvl2_fac:	1.5
-routing_lvl3_fac:	1.75
-routing_lvl4_fac:	2.25
-routing_lvl5_fac:	2.5
-routing_lvl6_fac:	3
-routing_lvl7_fac:	4
+osm_lvl0_avg_speed:	120  # default level
+osm_lvl1_avg_speed:	90
+osm_lvl2_avg_speed:	65
+osm_lvl3_avg_speed:	50
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	20
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
 osm_max_snap_level: 5
 
@@ -958,20 +970,9 @@ osm_line_relation_tags:
 	from_name=from
 	to_name=to
 
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 50, 100
+# max distance in meters between a snapped position on an
+# edge and the input GTFS/OSM station
+osm_max_snap_distance:	100
 
 osm_max_snap_level: 4
 
@@ -984,22 +985,25 @@ osm_station_name_attrs:
 # the track number tag in stop nodes, first one is taken
 osm_track_number_tags:	local_ref
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
+# avg speed on segment levels, in km/h
+osm_lvl0_avg_speed:	85  # default level
+osm_lvl1_avg_speed:	70
+osm_lvl2_avg_speed:	55
+osm_lvl3_avg_speed:	40
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	20
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
-# Punishment (in meters) to add to the distance
+# Punishment (in seconds) to add to the distance
 # function if a vehicle performans a full turn
-routing_full_turn_punish:			2000
+routing_full_turn_penalty:		180    # 3 minutes
 
-routing_station_distance_punish_fac: 3.14
+# Penalty added to non-station placements
+routing_non_station_penalty:        0.5
 
-routing_non_osm_station_punish:	235
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
 # Max angle that should be counted as a full turn
 routing_full_turn_angle:			80
@@ -1007,24 +1011,21 @@ routing_full_turn_angle:			80
 # Max angle in a route from a station to an already reachable neighbar
 routing_snap_full_turn_angle:	80
 
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
+# Factor by which the vehicle slows down in a one way street (factor 5
+# means it will take 5 times longer)
+osm_one_way_speed_penalty_fac: 2
 
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
+# If a segment has no matching line attributes, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+routing_line_unmatched_time_penalty_fac:            1.5
+routing_line_station_to_unmatched_time_penalty:     1.2
+routing_line_station_from_unmatched_time_penalty:   1.1
 
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any line
-# information when no specific line was requested
-# routing_no_lines_punish_fac:  0
+# If a segment has no line attributes at all, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+# routing_no_lines_penalty_fac:  1
 
 [gondola]
 
@@ -1104,20 +1105,9 @@ osm_line_relation_tags:
 	from_name=from
 	to_name=to
 
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 50, 100
+# max distance in meters between a snapped position on an
+# edge and the input GTFS/OSM station
+osm_max_snap_distance:	100
 
 osm_max_snap_level: 4
 
@@ -1130,22 +1120,25 @@ osm_station_name_attrs:
 # the track number tag in stop nodes, first one is taken
 osm_track_number_tags:	local_ref
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
+# avg speed on segment levels, in km/h
+osm_lvl0_avg_speed:	85  # default level
+osm_lvl1_avg_speed:	70
+osm_lvl2_avg_speed:	55
+osm_lvl3_avg_speed:	40
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	20
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
-# Punishment (in meters) to add to the distance
+# Punishment (in seconds) to add to the distance
 # function if a vehicle performans a full turn
-routing_full_turn_punish:			2000
+routing_full_turn_penalty:		120    # 2 minutes
 
-routing_station_distance_punish_fac: 3.14
+# Penalty added to non-station placements
+routing_non_station_penalty:        0.5
 
-routing_non_osm_station_punish:	235
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
 # Max angle that should be counted as a full turn
 routing_full_turn_angle:			80
@@ -1153,24 +1146,21 @@ routing_full_turn_angle:			80
 # Max angle in a route from a station to an already reachable neighbar
 routing_snap_full_turn_angle:	80
 
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
+# Factor by which the vehicle slows down in a one way street (factor 5
+# means it will take 5 times longer)
+osm_one_way_speed_penalty_fac: 2
 
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
+# If a segment has no matching line attributes, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+routing_line_unmatched_time_penalty_fac:            1.2
+routing_line_station_to_unmatched_time_penalty:     1.15
+routing_line_station_from_unmatched_time_penalty:   1.1
 
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any line
-# information when no specific line was requested
-# routing_no_lines_punish_fac:  0
+# If a segment has no line attributes at all, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+# routing_no_lines_penalty_fac:  1
 
 [funicular]
 
@@ -1281,20 +1271,9 @@ osm_line_relation_tags:
 	from_name=from
 	to_name=to
 
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 50, 100
+# max distance in meters between a snapped position on an
+# edge and the input GTFS/OSM station
+osm_max_snap_distance:	100
 
 osm_max_snap_level: 4
 
@@ -1307,22 +1286,25 @@ osm_station_name_attrs:
 # the track number tag in stop nodes, first one is taken
 osm_track_number_tags:	local_ref
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
+# avg speed on segment levels, in km/h
+osm_lvl0_avg_speed:	85  # default level
+osm_lvl1_avg_speed:	70
+osm_lvl2_avg_speed:	55
+osm_lvl3_avg_speed:	40
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	20
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
-# Punishment (in meters) to add to the distance
+# Punishment (in seconds) to add to the distance
 # function if a vehicle performans a full turn
-routing_full_turn_punish:			2000
+routing_full_turn_penalty:		120    # 2 minutes
 
-routing_station_distance_punish_fac: 3.14
+# Penalty added to non-station placements
+routing_non_station_penalty:        0.5
 
-routing_non_osm_station_punish:	235
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
 # Max angle that should be counted as a full turn
 routing_full_turn_angle:			80
@@ -1330,24 +1312,21 @@ routing_full_turn_angle:			80
 # Max angle in a route from a station to an already reachable neighbar
 routing_snap_full_turn_angle:	80
 
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   100
+# Factor by which the vehicle slows down in a one way street (factor 5
+# means it will take 5 times longer)
+osm_one_way_speed_penalty_fac: 2
 
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
+# If a segment has no matching line attributes, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+routing_line_unmatched_time_penalty_fac:            1.2
+routing_line_station_to_unmatched_time_penalty:     1.15
+routing_line_station_from_unmatched_time_penalty:   1.1
 
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any line
-# information when no specific line was requested
-# routing_no_lines_punish_fac:  0
+# If a segment has no line attributes at all, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+# routing_no_lines_penalty_fac:  1
 
 [ferry]
 
@@ -1366,7 +1345,10 @@ osm_filter_keep:
 # Only nodes that have been kept during the filtering above will be
 # checked.
 osm_filter_station:
+    ferry=yes
 	public_transport=stop_position
+	amenity=ferry_terminal
+	mooring=ferry
 	station=ferry
 	railway=stop
 	railway=halt
@@ -1387,20 +1369,9 @@ osm_line_relation_tags:
 	from_name=from
 	to_name=to
 
-
-# attr name together with the
-# max distance in meters between any of the groups members and
-# a potential new member
-# first matching rule will be taken
-# only applies to nodes that match osm_filter_station!
-osm_station_group_attrs:
-	uic_ref=500
-	wikidata=500
-	name=100
-
-# max distance in meters between a snapped station position and the
-# original station position
-osm_max_snap_distance:	10, 100, 200
+# max distance in meters between a snapped position on an
+# edge and the input GTFS/OSM station
+osm_max_snap_distance:	500
 
 osm_max_snap_level: 4
 
@@ -1413,22 +1384,25 @@ osm_station_name_attrs:
 # the track number tag in stop nodes, first one is taken
 osm_track_number_tags:	local_ref
 
-routing_lvl0_fac:	1  # default level
-routing_lvl1_fac:	1.5
-routing_lvl2_fac:	2
-routing_lvl3_fac:	2.5
-routing_lvl4_fac:	3.5
-routing_lvl5_fac:	5
-routing_lvl6_fac:	5
-routing_lvl7_fac:	5
+# avg speed on segment levels, in km/h
+osm_lvl0_avg_speed:	70  # default level
+osm_lvl1_avg_speed:	60
+osm_lvl2_avg_speed: 50
+osm_lvl3_avg_speed:	35
+osm_lvl4_avg_speed:	30
+osm_lvl5_avg_speed:	25
+osm_lvl6_avg_speed: 10
+osm_lvl7_avg_speed:	5
 
-# Punishment (in meters) to add to the distance
+# Punishment (in seconds) to add to the distance
 # function if a vehicle performans a full turn
-routing_full_turn_punish:			100
+routing_full_turn_penalty:		120    # 2 minutes
 
-routing_station_distance_punish_fac: 3.14
+# Penalty added to non-station placements
+routing_non_station_penalty:        0.5
 
-routing_non_osm_station_punish:	50
+# If the station name does not match, add this penalty
+routing_station_unmatched_penalty: 0.3
 
 # Max angle that should be counted as a full turn
 routing_full_turn_angle:			45
@@ -1436,22 +1410,18 @@ routing_full_turn_angle:			45
 # Max angle in a route from a station to an already reachable neighbar
 routing_snap_full_turn_angle:	0
 
-# Punishment (in meters) to add to the distance
-# function if a vehicle passes a station node without
-# stopping there
-routing_pass_thru_station_punish:   0
+# Factor by which the vehicle slows down in a one way street (factor 5
+# means it will take 5 times longer)
+osm_one_way_speed_penalty_fac: 2
 
-# Punishment factor for every meter a vehicle
-# travels through a one-way edge
-routing_one_way_meter_punish_fac:   1
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any matching line
-# information
-routing_line_unmatched_punish_fac:  0.5
-
-# Punishment factor for every meter a vehicle
-# travels through an edge without any line
-# information when no specific line was requested
-# routing_no_lines_punish_fac:  0
+# If a segment has no matching line attributes, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+routing_line_unmatched_time_penalty_fac:            1.2
+routing_line_station_to_unmatched_time_penalty:     1.15
+routing_line_station_from_unmatched_time_penalty:   1.1
 
+# If a segment has no line attributes at all, multiply the
+# time needed to traverse it with the given factor (should
+# be > 1 for a punishment, values < 1 will prefer unmatching segments)
+# routing_no_lines_penalty_fac:  1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d54350..fbf3449 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,3 +12,4 @@ add_subdirectory(util)
 add_subdirectory(pfaedle)
 add_subdirectory(cppgtfs)
 add_subdirectory(configparser)
+add_subdirectory(shapevl)
diff --git a/src/configparser b/src/configparser
index b2d0c99..ca166b3 160000
--- a/src/configparser
+++ b/src/configparser
@@ -1 +1 @@
-Subproject commit b2d0c99b9c84f62f5f7b259524e0f4b1c9d38318
+Subproject commit ca166b3446d5bb8b5fb8c6f637ca3f9cb0a8ff3b
diff --git a/src/cppgtfs b/src/cppgtfs
index be682b2..6328d02 160000
--- a/src/cppgtfs
+++ b/src/cppgtfs
@@ -1 +1 @@
-Subproject commit be682b2cc13125147bad9ebe544f0bad25d0bd22
+Subproject commit 6328d026f6fa870c87b18ff93ab6f4b65a869686
diff --git a/src/pfaedle/CMakeLists.txt b/src/pfaedle/CMakeLists.txt
index 22b083a..8adb8d6 100644
--- a/src/pfaedle/CMakeLists.txt
+++ b/src/pfaedle/CMakeLists.txt
@@ -18,3 +18,5 @@ add_library(pfaedle_dep ${pfaedle_SRC})
 
 include_directories(pfaedle_dep PUBLIC ${PROJECT_SOURCE_DIR}/src/cppgtfs/src)
 target_link_libraries(pfaedle pfaedle_dep util configparser ad_cppgtfs -lpthread)
+
+add_subdirectory(tests)
diff --git a/src/pfaedle/Def.h b/src/pfaedle/Def.h
index 7b8e083..9308161 100644
--- a/src/pfaedle/Def.h
+++ b/src/pfaedle/Def.h
@@ -17,17 +17,17 @@
 #define __str_c(s) s ## 1
 #define __str_d(s) __str_c(s)
 
-#if !defined(PFAEDLE_PRECISION) || (__str_d(PFAEDLE_PRECISION) == 1)
-#undef PFAEDLE_PRECISION
-#define PFAEDLE_PRECISION double
+#if !defined(PFDL_PREC) || (__str_d(PFDL_PREC) == 1)
+#undef PFDL_PREC
+#define PFDL_PREC double
 #endif
 
-#define PFAEDLE_PRECISION_STR __str_a(PFAEDLE_PRECISION)
+#define PFDL_PREC_STR __str_a(PFDL_PREC)
 
-#define POINT util::geo::Point<PFAEDLE_PRECISION>
-#define LINE util::geo::Line<PFAEDLE_PRECISION>
-#define BOX util::geo::Box<PFAEDLE_PRECISION>
-#define POLYLINE util::geo::PolyLine<PFAEDLE_PRECISION>
+#define POINT util::geo::Point<PFDL_PREC>
+#define LINE util::geo::Line<PFDL_PREC>
+#define BOX util::geo::Box<PFDL_PREC>
+#define POLYLINE util::geo::PolyLine<PFDL_PREC>
 
 #define BOX_PADDING 2500
 
diff --git a/src/pfaedle/PfaedleMain.cpp b/src/pfaedle/PfaedleMain.cpp
index 55bea77..4082f16 100644
--- a/src/pfaedle/PfaedleMain.cpp
+++ b/src/pfaedle/PfaedleMain.cpp
@@ -18,19 +18,19 @@
 #include "pfaedle/config/ConfigReader.h"
 #include "pfaedle/config/MotConfig.h"
 #include "pfaedle/config/MotConfigReader.h"
-#include "pfaedle/eval/Collector.h"
 #include "pfaedle/gtfs/Feed.h"
 #include "pfaedle/gtfs/Writer.h"
 #include "pfaedle/netgraph/Graph.h"
 #include "pfaedle/osm/OsmIdSet.h"
 #include "pfaedle/router/ShapeBuilder.h"
+#include "pfaedle/router/Stats.h"
+#include "pfaedle/statsimi-classifier/StatsimiClassifier.h"
 #include "pfaedle/trgraph/Graph.h"
-#include "pfaedle/trgraph/StatGroup.h"
+#include "util/Misc.h"
 #include "util/geo/output/GeoGraphJsonOutput.h"
 #include "util/geo/output/GeoJsonOutput.h"
 #include "util/json/Writer.h"
 #include "util/log/Log.h"
-#include "util/Misc.h"
 
 #ifndef CFG_HOME_SUFFIX
 #define CFG_HOME_SUFFIX "/.config"
@@ -42,16 +42,25 @@
 #define CFG_FILE_NAME "pfaedle.cfg"
 #endif
 
-using pfaedle::router::MOTs;
+using configparser::ParseFileExc;
+using pfaedle::config::Config;
+using pfaedle::config::ConfigReader;
+using pfaedle::config::MotConfig;
+using pfaedle::config::MotConfigReader;
 using pfaedle::osm::BBoxIdx;
 using pfaedle::osm::OsmBuilder;
-using pfaedle::config::MotConfig;
-using pfaedle::config::Config;
+using pfaedle::router::DistDiffTransWeight;
+using pfaedle::router::DistDiffTransWeightNoHeur;
+using pfaedle::router::ExpoTransWeight;
+using pfaedle::router::ExpoTransWeightNoHeur;
+using pfaedle::router::MOTs;
+using pfaedle::router::NormDistrTransWeight;
+using pfaedle::router::NormDistrTransWeightNoHeur;
+using pfaedle::router::Router;
+using pfaedle::router::RouterImpl;
 using pfaedle::router::ShapeBuilder;
-using configparser::ParseFileExc;
-using pfaedle::config::MotConfigReader;
-using pfaedle::config::ConfigReader;
-using pfaedle::eval::Collector;
+using pfaedle::router::Stats;
+using pfaedle::statsimiclassifier::JaccardClassifier;
 
 enum class RetCode {
   SUCCESS = 0,
@@ -77,6 +86,11 @@ int main(int argc, char** argv) {
   // initialize randomness
   srand(time(NULL) + rand());  // NOLINT
 
+  // use utf8 locale
+  std::setlocale(LC_ALL, "en_US.utf8");
+
+  T_START(total);
+
   Config cfg;
   MotConfigReader motCfgReader;
 
@@ -84,13 +98,11 @@ int main(int argc, char** argv) {
   cr.read(&cfg, argc, argv);
 
   std::vector<pfaedle::gtfs::Feed> gtfs(cfg.feedPaths.size());
-  // feed containing the shapes in memory for evaluation
-  ad::cppgtfs::gtfs::Feed evalFeed;
 
   std::vector<std::string> cfgPaths = getCfgPaths(cfg);
 
   try {
-    motCfgReader.parse(cfgPaths);
+    motCfgReader.parse(cfgPaths, cfg.motCfgParam);
   } catch (const configparser::ParseExc& ex) {
     LOG(ERROR) << "Could not parse MOT configurations, reason was:";
     std::cerr << ex.what() << std::endl;
@@ -108,27 +120,24 @@ int main(int argc, char** argv) {
     exit(static_cast<int>(RetCode::NO_MOT_CFG));
   }
 
+  T_START(gtfsBuild);
+
   if (cfg.feedPaths.size() == 1) {
     if (cfg.inPlace) cfg.outputPath = cfg.feedPaths[0];
     if (!cfg.writeOverpass)
-      LOG(INFO) << "Reading " << cfg.feedPaths[0] << " ...";
+      LOG(INFO) << "Reading GTFS feed " << cfg.feedPaths[0] << " ...";
     try {
       ad::cppgtfs::Parser p;
       p.parse(&gtfs[0], cfg.feedPaths[0]);
-      if (cfg.evaluate) {
-        // read the shapes and store them in memory
-        p.parseShapes(&evalFeed, cfg.feedPaths[0]);
-      }
     } catch (const ad::cppgtfs::ParserException& ex) {
       LOG(ERROR) << "Could not parse input GTFS feed, reason was:";
       std::cerr << ex.what() << std::endl;
       exit(static_cast<int>(RetCode::GTFS_PARSE_ERR));
     }
-    if (!cfg.writeOverpass) LOG(INFO) << "Done.";
   } else if (cfg.writeOsm.size() || cfg.writeOverpass) {
     for (size_t i = 0; i < cfg.feedPaths.size(); i++) {
       if (!cfg.writeOverpass)
-        LOG(INFO) << "Reading " << cfg.feedPaths[i] << " ...";
+        LOG(INFO) << "Reading GTFS feed " << cfg.feedPaths[i] << " ...";
       ad::cppgtfs::Parser p;
       try {
         p.parse(&gtfs[i], cfg.feedPaths[i]);
@@ -137,13 +146,14 @@ int main(int argc, char** argv) {
         std::cerr << ex.what() << std::endl;
         exit(static_cast<int>(RetCode::GTFS_PARSE_ERR));
       }
-      if (!cfg.writeOverpass) LOG(INFO) << "Done.";
     }
   } else if (cfg.feedPaths.size() > 1) {
     std::cerr << "Multiple feeds only allowed in filter mode." << std::endl;
     exit(static_cast<int>(RetCode::MULT_FEEDS_NOT_ALWD));
   }
 
+  auto tGtfsBuild = T_STOP(gtfsBuild);
+
   LOG(DEBUG) << "Read " << motCfgReader.getConfigs().size()
              << " unique MOT configs.";
   MOTs cmdCfgMots = cfg.mots;
@@ -161,12 +171,20 @@ int main(int argc, char** argv) {
     }
   }
 
+  double maxSpeed = 0;
+  for (const auto& c : motCfgReader.getConfigs()) {
+    if (c.osmBuildOpts.maxSpeed > maxSpeed) {
+      maxSpeed = c.osmBuildOpts.maxSpeed;
+    }
+  }
+
   if (cfg.writeOsm.size()) {
     LOG(INFO) << "Writing filtered XML to " << cfg.writeOsm << " ...";
     BBoxIdx box(BOX_PADDING);
+
     for (size_t i = 0; i < cfg.feedPaths.size(); i++) {
       ShapeBuilder::getGtfsBox(&gtfs[i], cmdCfgMots, cfg.shapeTripId, true,
-                               &box);
+                               &box, maxSpeed);
     }
     OsmBuilder osmBuilder;
     std::vector<pfaedle::osm::OsmReadOpts> opts;
@@ -188,7 +206,7 @@ int main(int argc, char** argv) {
     BBoxIdx box(BOX_PADDING);
     for (size_t i = 0; i < cfg.feedPaths.size(); i++) {
       ShapeBuilder::getGtfsBox(&gtfs[i], cmdCfgMots, cfg.shapeTripId, true,
-                               &box);
+                               &box, maxSpeed);
     }
     OsmBuilder osmBuilder;
     std::vector<pfaedle::osm::OsmReadOpts> opts;
@@ -205,11 +223,6 @@ int main(int argc, char** argv) {
     exit(static_cast<int>(RetCode::NO_INPUT_FEED));
   }
 
-  std::vector<double> dfBins;
-  auto dfBinStrings = util::split(std::string(cfg.evalDfBins), ',');
-  for (auto st : dfBinStrings) dfBins.push_back(atof(st.c_str()));
-  Collector ecoll(cfg.evalPath, dfBins);
-
   for (const auto& motCfg : motCfgReader.getConfigs()) {
     std::string filePost;
     auto usedMots = pfaedle::router::motISect(motCfg.mots, cmdCfgMots);
@@ -220,7 +233,7 @@ int main(int argc, char** argv) {
       filePost = getFileNameMotStr(usedMots);
 
     std::string motStr = pfaedle::router::getMotStr(usedMots);
-    LOG(INFO) << "Calculating shapes for mots " << motStr;
+    LOG(INFO) << "Matching shapes for mots " << motStr;
 
     try {
       pfaedle::router::FeedStops fStops =
@@ -231,62 +244,117 @@ int main(int argc, char** argv) {
       pfaedle::osm::OsmBuilder osmBuilder;
 
       pfaedle::osm::BBoxIdx box(BOX_PADDING);
-      ShapeBuilder::getGtfsBox(&gtfs[0], cmdCfgMots, cfg.shapeTripId,
-                               cfg.dropShapes, &box);
+      ShapeBuilder::getGtfsBox(&gtfs[0], usedMots, cfg.shapeTripId,
+                               cfg.dropShapes, &box,
+                               motCfg.osmBuildOpts.maxSpeed);
+
+      T_START(osmBuild);
 
       if (fStops.size())
         osmBuilder.read(cfg.osmPath, motCfg.osmBuildOpts, &graph, box,
-                        cfg.gridSize, &fStops, &restr);
+                        cfg.gridSize, &restr);
 
-      // TODO(patrick): move this somewhere else
-      for (auto& feedStop : fStops) {
-        if (feedStop.second) {
-          feedStop.second->pl().getSI()->getGroup()->writePens(
-              motCfg.osmBuildOpts.trackNormzer,
-              motCfg.routingOpts.platformUnmatchedPen,
-              motCfg.routingOpts.stationDistPenFactor,
-              motCfg.routingOpts.nonOsmPen);
-        }
+      auto tOsmBuild = T_STOP(osmBuild);
+
+      JaccardClassifier statsimiClassifier;
+
+      Router* router = 0;
+
+      if (motCfg.routingOpts.transPenMethod == "exp") {
+        if (cfg.noAStar)
+          router = new RouterImpl<ExpoTransWeightNoHeur>();
+        else
+          router = new RouterImpl<ExpoTransWeight>();
+      } else if (motCfg.routingOpts.transPenMethod == "distdiff") {
+        if (cfg.noAStar)
+          router = new RouterImpl<DistDiffTransWeightNoHeur>();
+        else
+          router = new RouterImpl<DistDiffTransWeight>();
+      } else if (motCfg.routingOpts.transPenMethod == "timenorm") {
+        if (cfg.noAStar)
+          router = new RouterImpl<NormDistrTransWeightNoHeur>();
+        else
+          router = new RouterImpl<NormDistrTransWeight>();
+      } else {
+        LOG(ERROR) << "Unknown routing method "
+                   << motCfg.routingOpts.transPenMethod;
+        exit(1);
       }
 
-      ShapeBuilder shapeBuilder(&gtfs[0], &evalFeed, cmdCfgMots, motCfg, &ecoll,
-                                &graph, &fStops, &restr, cfg);
+      ShapeBuilder shapeBuilder(&gtfs[0], usedMots, motCfg, &graph, &fStops,
+                                &restr, &statsimiClassifier, router, cfg);
+
+      pfaedle::netgraph::Graph ng;
+      Stats stats;
+
+      if (singleTrip) {
+        mkdir(cfg.dbgOutputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
+        std::ofstream pstr(cfg.dbgOutputPath + "/path.json");
+        util::geo::output::GeoJsonOutput o(pstr);
+
+        auto l = shapeBuilder.shapeL(singleTrip);
+        stats = l.second;
+
+        LOG(INFO) << "Outputting path.json...";
+        // reproject to WGS84 to match RFC 7946
+        o.print(l.first, {});
+
+        o.flush();
+        pstr.close();
+      } else {
+        stats = shapeBuilder.shapeify(&ng);
+      }
+
+      // outputting stats
+
+      if (cfg.writeStats) {
+        size_t numEdgs = 0;
+        for (const auto& nd : graph.getNds()) {
+          numEdgs += nd->getAdjListOut().size();
+        }
+        util::json::Dict jsonStats = {
+            {"statistics",
+             util::json::Dict{
+                 {"gtfs_num_stations", gtfs[0].getStops().size()},
+                 {"gtfs_num_trips", gtfs[0].getTrips().size()},
+                 {"graph_nds", graph.getNds().size()},
+                 {"graph_edgs", numEdgs},
+                 {"num_tries", stats.numTries},
+                 {"num_trie_leafs", stats.numTrieLeafs},
+                 {"dijkstra_iters", stats.dijkstraIters},
+                 {"time_solve", stats.solveTime},
+                 {"time_read_osm", tOsmBuild},
+                 {"time_read_gtfs", tGtfsBuild},
+                 {"time_tot", T_STOP(total)},
+                 {"peak-memory", util::readableSize(util::getPeakRSS())},
+                 {"peak-memory-bytes", util::getPeakRSS()}}}};
+
+        std::ofstream ofs;
+        ofs.open("stats" + filePost + ".json");
+        util::json::Writer wr(&ofs, 10, true);
+        wr.val(jsonStats);
+        wr.closeAll();
+      }
+
+      if (router) delete router;
 
       if (cfg.writeGraph) {
         LOG(INFO) << "Outputting graph.json...";
         util::geo::output::GeoGraphJsonOutput out;
         mkdir(cfg.dbgOutputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
         std::ofstream fstr(cfg.dbgOutputPath + "/graph.json");
-        out.printLatLng(*shapeBuilder.getGraph(), fstr);
+        out.print(*shapeBuilder.getGraph(), fstr);
         fstr.close();
       }
 
-      if (singleTrip) {
-        LOG(INFO) << "Outputting path.json...";
-        mkdir(cfg.dbgOutputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-        std::ofstream pstr(cfg.dbgOutputPath + "/path.json");
-        util::geo::output::GeoJsonOutput o(pstr);
-
-        auto l = shapeBuilder.shapeL(singleTrip);
-
-        // reproject to WGS84 to match RFC 7946
-        o.printLatLng(l, {});
-
-        o.flush();
-        pstr.close();
-
-        exit(static_cast<int>(RetCode::SUCCESS));
-      }
-
-      pfaedle::netgraph::Graph ng;
-      shapeBuilder.shape(&ng);
+      if (singleTrip) exit(static_cast<int>(RetCode::SUCCESS));
 
       if (cfg.buildTransitGraph) {
         util::geo::output::GeoGraphJsonOutput out;
         LOG(INFO) << "Outputting trgraph" + filePost + ".json...";
         mkdir(cfg.dbgOutputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
         std::ofstream fstr(cfg.dbgOutputPath + "/trgraph" + filePost + ".json");
-        out.printLatLng(ng, fstr);
+        out.print(ng, fstr);
         fstr.close();
       }
     } catch (const pfxml::parse_exc& ex) {
@@ -296,8 +364,6 @@ int main(int argc, char** argv) {
     }
   }
 
-  if (cfg.evaluate) ecoll.printStats(&std::cout);
-
   if (cfg.feedPaths.size()) {
     try {
       mkdir(cfg.outputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
@@ -305,7 +371,7 @@ int main(int argc, char** argv) {
       pfaedle::gtfs::Writer w;
       w.write(&gtfs[0], cfg.outputPath);
     } catch (const ad::cppgtfs::WriterException& ex) {
-      LOG(ERROR) << "Could not write final GTFS feed, reason was:";
+      LOG(ERROR) << "Could not write output GTFS feed, reason was:";
       std::cerr << ex.what() << std::endl;
       exit(static_cast<int>(RetCode::GTFS_WRITE_ERR));
     }
@@ -329,12 +395,10 @@ std::vector<std::string> getCfgPaths(const Config& cfg) {
   if (cfg.configPaths.size()) return cfg.configPaths;
   std::vector<std::string> ret;
 
-
   // install prefix global configuration path, if available
   {
-    auto path = std::string(INSTALL_PREFIX) +
-                std::string(CFG_DIR) + "/" + "pfaedle" + "/" +
-                CFG_FILE_NAME;
+    auto path = std::string(INSTALL_PREFIX) + std::string(CFG_DIR) + "/" +
+                "pfaedle" + "/" + CFG_FILE_NAME;
     std::ifstream is(path);
 
     LOG(DEBUG) << "Testing for config file at " << path;
@@ -346,8 +410,8 @@ std::vector<std::string> getCfgPaths(const Config& cfg) {
 
   // local user configuration path, if available
   {
-    auto path = util::getHomeDir() + CFG_HOME_SUFFIX + "/" +
-                "pfaedle" + "/" + CFG_FILE_NAME;
+    auto path = util::getHomeDir() + CFG_HOME_SUFFIX + "/" + "pfaedle" + "/" +
+                CFG_FILE_NAME;
     std::ifstream is(path);
 
     LOG(DEBUG) << "Testing for config file at " << path;
diff --git a/src/pfaedle/config/ConfigReader.cpp b/src/pfaedle/config/ConfigReader.cpp
index c9ef614..1d351e6 100644
--- a/src/pfaedle/config/ConfigReader.cpp
+++ b/src/pfaedle/config/ConfigReader.cpp
@@ -11,6 +11,7 @@
 #include "pfaedle/_config.h"
 #include "pfaedle/config/ConfigReader.h"
 #include "util/String.h"
+#include "util/geo/Geo.h"
 #include "util/log/Log.h"
 
 using pfaedle::config::ConfigReader;
@@ -19,7 +20,7 @@ using std::string;
 using std::exception;
 using std::vector;
 
-static const char* YEAR = __DATE__ + 7;
+static const char* YEAR = &__DATE__[7];
 static const char* COPY =
     "University of Freiburg - Chair of Algorithms and Data Structures";
 static const char* AUTHORS = "Patrick Brosi <brosi@informatik.uni-freiburg.de>";
@@ -28,7 +29,7 @@ static const char* AUTHORS = "Patrick Brosi <brosi@informatik.uni-freiburg.de>";
 void ConfigReader::help(const char* bin) {
   std::cout << std::setfill(' ') << std::left << "pfaedle GTFS map matcher "
             << VERSION_FULL << "\n(built " << __DATE__ << " " << __TIME__
-            << " with geometry precision <" << PFAEDLE_PRECISION_STR << ">)\n\n"
+            << " with geometry precision <" << PFDL_PREC_STR << ">)\n\n"
             << "(C) " << YEAR << " " << COPY << "\n"
             << "Authors: " << AUTHORS << "\n\n"
             << "Usage: " << bin
@@ -43,6 +44,8 @@ void ConfigReader::help(const char* bin) {
             << "drop shapes already present in the feed and\n"
             << std::setw(35) << " "
             << "  recalculate them\n"
+            << std::setw(35) << "  --write-colors"
+            << "write matched route line colors, where missing\n"
             << "\nInput:\n"
             << std::setw(35) << "  -c [ --config ] arg"
             << "pfaedle config file\n"
@@ -83,26 +86,6 @@ void ConfigReader::help(const char* bin) {
             << "write routing graph as GeoJSON to\n"
             << std::setw(35) << " "
             << "  <dbg-path>/graph.json\n"
-            << std::setw(35) << "  --write-cgraph"
-            << "if -T is set, write combination graph as\n"
-            << std::setw(35) << " "
-            << "  GeoJSON to "
-               "<dbg-path>/combgraph.json\n"
-            << std::setw(35) << "  --method arg (=global)"
-            << "matching method to use, either 'global'\n"
-            << std::setw(35) << " "
-            << "  (based on HMM), 'greedy' or "
-               "'greedy2'\n"
-            << std::setw(35) << "  --eval"
-            << "evaluate existing shapes against matched\n"
-            << std::setw(35) << " "
-            << "  shapes and print results\n"
-            << std::setw(35) << "  --eval-path arg (=.)"
-            << "path for eval file output\n"
-            << std::setw(35) << "  --eval-df-bins arg (= )"
-            << "bins to use for d_f histogram, comma sep.\n"
-            << std::setw(35) << " "
-            << "  (e.g. 10,20,30,40)\n"
             << "\nMisc:\n"
             << std::setw(35) << "  -T [ --trip-id ] arg"
             << "Do routing only for trip <arg>, write result \n"
@@ -111,11 +94,19 @@ void ConfigReader::help(const char* bin) {
             << std::setw(35) << "  --overpass"
             << "Output overpass query for matching OSM data\n"
             << std::setw(35) << "  --grid-size arg (=2000)"
-            << "Grid cell size\n"
-            << std::setw(35) << "  --use-route-cache"
-            << "(experimental) cache intermediate routing\n"
-            << std::setw(35) << " "
-            << "  results\n";
+            << "Approx. grid cell size in meters\n"
+            << std::setw(35) << "  --no-fast-hops"
+            << "Disable fast hops technique\n"
+            << std::setw(35) << "  --no-a-star"
+            << "Disable A* heuristic \n"
+            << std::setw(35) << "  --no-trie"
+            << "Disable trip tries \n"
+            << std::setw(35) << "  --no-hop-cache"
+            << "Disable hop cache \n"
+            << std::setw(35) << "  --stats"
+            << "write stats to stats.json\n"
+            << std::setw(35) << "  -P"
+            << "additional parameter string (in cfg file format)\n";
 }
 
 // _____________________________________________________________________________
@@ -134,46 +125,37 @@ void ConfigReader::read(Config* cfg, int argc, char** argv) {
                          {"osm-out", required_argument, 0, 'X'},
                          {"trip-id", required_argument, 0, 'T'},
                          {"write-graph", no_argument, 0, 1},
-                         {"write-cgraph", no_argument, 0, 2},
                          {"write-trgraph", no_argument, 0, 4},
-                         {"method", required_argument, 0, 5},
-                         {"eval", no_argument, 0, 3},
-                         {"eval-path", required_argument, 0, 6},
-                         {"eval-df-bins", required_argument, 0, 7},
                          {"dbg-path", required_argument, 0, 'd'},
                          {"version", no_argument, 0, 'v'},
                          {"help", no_argument, 0, 'h'},
                          {"inplace", no_argument, 0, 9},
-                         {"use-route-cache", no_argument, 0, 8},
+                         {"no-fast-hops", no_argument, 0, 10},
+                         {"no-a-star", no_argument, 0, 11},
+                         {"no-trie", no_argument, 0, 12},
+                         {"write-colors", no_argument, 0, 13},
+                         {"stats", no_argument, 0, 14},
+                         {"no-hop-cache", no_argument, 0, 15},
                          {0, 0, 0, 0}};
 
   char c;
-  while ((c = getopt_long(argc, argv, ":o:hvi:c:x:Dm:g:X:T:d:p", ops, 0)) !=
+  while ((c = getopt_long(argc, argv, ":o:hvi:c:x:Dm:g:X:T:d:pP:", ops, 0)) !=
          -1) {
     switch (c) {
       case 1:
         cfg->writeGraph = true;
         break;
-      case 2:
-        cfg->writeCombGraph = true;
-        break;
-      case 3:
-        cfg->evaluate = true;
-        break;
       case 4:
         cfg->buildTransitGraph = true;
         break;
-      case 5:
-        cfg->solveMethod = optarg;
+      case 10:
+        cfg->noFastHops = true;
         break;
-      case 6:
-        cfg->evalPath = optarg;
+      case 11:
+        cfg->noAStar = true;
         break;
-      case 7:
-        cfg->evalDfBins = optarg;
-        break;
-      case 8:
-        cfg->useCaching = true;
+      case 12:
+        cfg->noTrie = true;
         break;
       case 'o':
         cfg->outputPath = optarg;
@@ -194,7 +176,7 @@ void ConfigReader::read(Config* cfg, int argc, char** argv) {
         motStr = optarg;
         break;
       case 'g':
-        cfg->gridSize = atof(optarg);
+        cfg->gridSize = atof(optarg) / util::geo::M_PER_DEG;
         break;
       case 'X':
         cfg->writeOsm = optarg;
@@ -202,6 +184,9 @@ void ConfigReader::read(Config* cfg, int argc, char** argv) {
       case 'T':
         cfg->shapeTripId = optarg;
         break;
+      case 'P':
+        cfg->motCfgParam += std::string("\n") + optarg;
+        break;
       case 'd':
         cfg->dbgOutputPath = optarg;
         break;
@@ -211,10 +196,19 @@ void ConfigReader::read(Config* cfg, int argc, char** argv) {
       case 9:
         cfg->inPlace = true;
         break;
+      case 13:
+        cfg->writeColors = true;
+        break;
+      case 14:
+        cfg->writeStats = true;
+        break;
+      case 15:
+        cfg->noHopCache = true;
+        break;
       case 'v':
         std::cout << "pfaedle " << VERSION_FULL << " (built " << __DATE__ << " "
                   << __TIME__ << " with geometry precision <"
-                  << PFAEDLE_PRECISION_STR << ">)\n"
+                  << PFDL_PREC_STR << ">)\n"
                   << "(C) " << YEAR << " " << COPY << "\n"
                   << "Authors: " << AUTHORS << "\nGNU General Public "
                                                "License v3.0\n";
diff --git a/src/pfaedle/config/MotConfig.h b/src/pfaedle/config/MotConfig.h
index 3b7ab48..f99f4eb 100644
--- a/src/pfaedle/config/MotConfig.h
+++ b/src/pfaedle/config/MotConfig.h
@@ -17,20 +17,11 @@ struct MotConfig {
   router::MOTs mots;
   osm::OsmReadOpts osmBuildOpts;
   router::RoutingOpts routingOpts;
-  std::map<std::string, std::string> unproced;
+  std::string transWeight;
 };
 
 inline bool operator==(const MotConfig& a, const MotConfig& b) {
-  bool unprocedEq = a.unproced.size() == b.unproced.size();
-  for (const auto& kv : a.unproced) {
-    if (!b.unproced.count(kv.first) ||
-        b.unproced.find(kv.first)->second != kv.second) {
-      unprocedEq = false;
-      break;
-    }
-  }
-  return a.osmBuildOpts == b.osmBuildOpts && a.routingOpts == b.routingOpts &&
-         unprocedEq;
+  return a.osmBuildOpts == b.osmBuildOpts && a.routingOpts == b.routingOpts;
 }
 
 }  // namespace config
diff --git a/src/pfaedle/config/MotConfigReader.cpp b/src/pfaedle/config/MotConfigReader.cpp
index 96fce0e..bf1b0cd 100644
--- a/src/pfaedle/config/MotConfigReader.cpp
+++ b/src/pfaedle/config/MotConfigReader.cpp
@@ -2,28 +2,33 @@
 // Chair of Algorithms and Data Structures.
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
+#include <limits>
 #include <set>
 #include <string>
 #include "pfaedle/config/MotConfigReader.h"
+#include "pfaedle/osm/OsmReadOpts.h"
 #include "util/Misc.h"
 #include "util/String.h"
 #include "util/log/Log.h"
 
-using pfaedle::config::MotConfigReader;
-using pfaedle::config::MotConfig;
-using pfaedle::osm::FilterRule;
-using pfaedle::osm::KeyVal;
+using ad::cppgtfs::gtfs::Route;
 using configparser::ConfigFileParser;
 using configparser::ParseExc;
+using pfaedle::config::MotConfig;
+using pfaedle::config::MotConfigReader;
 using pfaedle::osm::DeepAttrRule;
+using pfaedle::osm::FilterRule;
+using pfaedle::osm::KeyVal;
 using pfaedle::trgraph::ReplRules;
-using ad::cppgtfs::gtfs::Route;
+
+double DEF_TRANS_PEN = 0.0083;
 
 // _____________________________________________________________________________
 MotConfigReader::MotConfigReader() {}
 
 // _____________________________________________________________________________
-void MotConfigReader::parse(const std::vector<std::string>& paths) {
+void MotConfigReader::parse(const std::vector<std::string>& paths,
+                            const std::string& literal) {
   ConfigFileParser p;
 
   // parse explicitely given paths
@@ -32,17 +37,33 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
     p.parse(s);
   }
 
+  if (literal.size()) p.parseStr(literal);
+
   for (const auto& sec : p.getSecs()) {
-    MotConfig curCfg;
+    MotConfig cfg;
+
+    cfg.transWeight = "expo";
+
     std::string secStr = sec.first;
     if (secStr.empty()) continue;
-    std::set<std::string> procedKeys;
+
+    if (p.hasKey(secStr, "routing_transition_method")) {
+      cfg.routingOpts.transPenMethod =
+          p.getStr(secStr, "routing_transition_method");
+    } else {
+      cfg.routingOpts.transPenMethod = "exp";
+    }
+
+    if (p.hasKey(secStr, "routing_use_stations")) {
+      cfg.routingOpts.useStations = p.getBool(secStr, "routing_use_stations");
+    } else {
+      cfg.routingOpts.useStations = true;
+    }
 
     if (p.hasKey(secStr, "osm_filter_keep")) {
-      procedKeys.insert("osm_filter_keep");
       for (const auto& kvs : p.getStrArr(sec.first, "osm_filter_keep", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.keepFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.keepFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
@@ -50,321 +71,471 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
     for (uint8_t i = 0; i < 8; i++) {
       std::string name = std::string("osm_filter_lvl") + std::to_string(i);
       if (p.hasKey(secStr, name)) {
-        procedKeys.insert(name);
         for (const auto& kvs : p.getStrArr(sec.first, name, ' ')) {
           auto fRule = getFRule(kvs);
-          curCfg.osmBuildOpts.levelFilters[i][fRule.kv.first].insert(
+          cfg.osmBuildOpts.levelFilters[i][fRule.kv.first].insert(
               osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
         }
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_drop")) {
-      procedKeys.insert("osm_filter_drop");
       for (const auto& kvs : p.getStrArr(sec.first, "osm_filter_drop", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.dropFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.dropFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_max_snap_level")) {
-      procedKeys.insert("osm_max_snap_level");
-      curCfg.osmBuildOpts.maxSnapLevel =
-          p.getInt(sec.first, "osm_max_snap_level");
+      cfg.osmBuildOpts.maxSnapLevel = p.getInt(sec.first, "osm_max_snap_level");
     } else {
-      curCfg.osmBuildOpts.maxSnapLevel = 7;
+      cfg.osmBuildOpts.maxSnapLevel = 7;
     }
 
     if (p.hasKey(secStr, "osm_filter_nohup")) {
-      procedKeys.insert("osm_filter_nohup");
       for (const auto& kvs : p.getStrArr(sec.first, "osm_filter_nohup", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.noHupFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.noHupFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_oneway")) {
-      procedKeys.insert("osm_filter_oneway");
       for (const auto& kvs : p.getStrArr(sec.first, "osm_filter_oneway", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.oneWayFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.oneWayFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_oneway_reverse")) {
-      procedKeys.insert("osm_filter_oneway_reverse");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_filter_oneway_reverse", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.oneWayFilterRev[fRule.kv.first].insert(
+        cfg.osmBuildOpts.oneWayFilterRev[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_undirected")) {
-      procedKeys.insert("osm_filter_undirected");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_filter_undirected", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.twoWayFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.twoWayFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_station")) {
-      procedKeys.insert("osm_filter_station");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_filter_station", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.stationFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.stationFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_station_blocker")) {
-      procedKeys.insert("osm_filter_station_blocker");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_filter_station_blocker", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.stationBlockerFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.stationBlockerFilter[fRule.kv.first].insert(
+            osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
+      }
+    }
+
+    if (p.hasKey(secStr, "osm_filter_turning_cycle")) {
+      for (const auto& kvs :
+           p.getStrArr(sec.first, "osm_filter_turning_cycle", ' ')) {
+        auto fRule = getFRule(kvs);
+        cfg.osmBuildOpts.turnCycleFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_node_positive_restriction")) {
-      procedKeys.insert("osm_node_positive_restriction");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_node_positive_restriction", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.restrPosRestr[fRule.kv.first].insert(
+        cfg.osmBuildOpts.restrPosRestr[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_node_negative_restriction")) {
-      procedKeys.insert("osm_node_negative_restriction");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_node_negative_restriction", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.restrNegRestr[fRule.kv.first].insert(
+        cfg.osmBuildOpts.restrNegRestr[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_filter_no_restriction")) {
-      procedKeys.insert("osm_filter_no_restriction");
       for (const auto& kvs :
            p.getStrArr(sec.first, "osm_filter_no_restriction", ' ')) {
         auto fRule = getFRule(kvs);
-        curCfg.osmBuildOpts.noRestrFilter[fRule.kv.first].insert(
+        cfg.osmBuildOpts.noRestrFilter[fRule.kv.first].insert(
             osm::AttrFlagPair(fRule.kv.second, getFlags(fRule.flags)));
       }
     }
 
     if (p.hasKey(secStr, "osm_station_name_attrs")) {
-      procedKeys.insert("osm_station_name_attrs");
       for (const std::string& r :
            p.getStrArr(sec.first, "osm_station_name_attrs", ' ')) {
-        curCfg.osmBuildOpts.statAttrRules.nameRule.push_back(
-            getDeepAttrRule(r));
+        cfg.osmBuildOpts.statAttrRules.nameRule.push_back(getDeepAttrRule(r));
       }
     }
 
     if (p.hasKey(secStr, "osm_track_number_tags")) {
-      procedKeys.insert("osm_track_number_tags");
       for (const std::string& r :
            p.getStrArr(sec.first, "osm_track_number_tags", ' ')) {
-        curCfg.osmBuildOpts.statAttrRules.platformRule.push_back(
+        cfg.osmBuildOpts.statAttrRules.platformRule.push_back(
             getDeepAttrRule(r));
       }
     }
 
     if (p.hasKey(secStr, "osm_station_id_attrs")) {
-      procedKeys.insert("osm_station_id_attrs");
       for (const std::string& r :
            p.getStrArr(sec.first, "osm_station_id_attrs", ' ')) {
-        curCfg.osmBuildOpts.statAttrRules.idRule.push_back(getDeepAttrRule(r));
+        cfg.osmBuildOpts.statAttrRules.idRule.push_back(getDeepAttrRule(r));
       }
     }
 
     if (p.hasKey(secStr, "osm_edge_track_number_tags")) {
-      procedKeys.insert("osm_edge_track_number_tags");
       for (const std::string& r :
            p.getStrArr(sec.first, "osm_edge_track_number_tags", ' ')) {
-        curCfg.osmBuildOpts.edgePlatformRules.push_back(getDeepAttrRule(r));
+        cfg.osmBuildOpts.edgePlatformRules.push_back(getDeepAttrRule(r));
       }
     }
 
     if (p.hasKey(secStr, "osm_station_group_attrs")) {
-      procedKeys.insert("osm_station_group_attrs");
-      auto arr = p.getStrArr(secStr, "osm_station_group_attrs", ' ');
-
-      for (const auto& ruleStr : arr) {
-        auto deep = getDeepAttrRule(ruleStr);
-        // TODO(patrick): getKv is misused here as a a=b parser
-        auto attrD = getKv(deep.attr);
-        deep.attr = attrD.first;
-        double dist = atof(attrD.second.c_str());
-        curCfg.osmBuildOpts.statGroupNAttrRules.push_back({deep, dist});
-      }
+      LOG(WARN) << "Option osm_station_group_attrs has been removed.";
     }
 
+    // default value, to enable color writing on old configs
+    cfg.osmBuildOpts.relLinerules.colorRule = {"colour", "color"};
+
     if (p.hasKey(secStr, "osm_line_relation_tags")) {
-      procedKeys.insert("osm_line_relation_tags");
       auto arr = p.getStrArr(secStr, "osm_line_relation_tags", ' ');
 
       for (const auto& ruleStr : arr) {
         auto rule = getKv(ruleStr);
         auto tags = util::split(rule.second, ',');
         if (rule.first == "from_name")
-          curCfg.osmBuildOpts.relLinerules.fromNameRule = tags;
+          cfg.osmBuildOpts.relLinerules.fromNameRule = tags;
         else if (rule.first == "to_name")
-          curCfg.osmBuildOpts.relLinerules.toNameRule = tags;
+          cfg.osmBuildOpts.relLinerules.toNameRule = tags;
         else if (rule.first == "line_name")
-          curCfg.osmBuildOpts.relLinerules.sNameRule = tags;
+          cfg.osmBuildOpts.relLinerules.sNameRule = tags;
+        else if (rule.first == "line_color")
+          cfg.osmBuildOpts.relLinerules.colorRule = tags;
       }
     }
 
+    cfg.osmBuildOpts.maxSnapDistance = 50;
     if (p.hasKey(secStr, "osm_max_snap_distance")) {
-      procedKeys.insert("osm_max_snap_distance");
-      curCfg.osmBuildOpts.maxSnapDistances =
-          p.getDoubleArr(secStr, "osm_max_snap_distance", ',');
-    } else {
-      curCfg.osmBuildOpts.maxSnapDistances.push_back(50);
+      auto v = p.getDoubleArr(secStr, "osm_max_snap_distance", ',');
+      if (v.size()) cfg.osmBuildOpts.maxSnapDistance = v.back();
+    }
+
+    cfg.osmBuildOpts.maxStationCandDistance =
+        cfg.osmBuildOpts.maxSnapDistance * 2;
+    if (p.hasKey(secStr, "osm_max_station_cand_distance")) {
+      auto v = p.getDouble(secStr, "osm_max_station_cand_distance");
+      cfg.osmBuildOpts.maxStationCandDistance = v;
     }
 
     if (p.hasKey(secStr, "osm_max_snap_fallback_distance")) {
-      procedKeys.insert("osm_max_snap_fallback_distance");
-      curCfg.osmBuildOpts.maxSnapFallbackHeurDistance =
-          p.getDouble(secStr, "osm_max_snap_fallback_distance");
-    } else {
-      curCfg.osmBuildOpts.maxSnapFallbackHeurDistance =
-          *std::max_element(curCfg.osmBuildOpts.maxSnapDistances.begin(),
-                            curCfg.osmBuildOpts.maxSnapDistances.end()) *
-          2;
+      LOG(WARN) << "Option osm_max_snap_fallback_distance has been removed.";
     }
 
     if (p.hasKey(secStr, "osm_max_osm_station_distance")) {
-      procedKeys.insert("osm_max_osm_station_distance");
-      curCfg.osmBuildOpts.maxOsmStationDistance =
-          p.getDouble(secStr, "osm_max_osm_station_distance");
+      double ref = p.getDouble(secStr, "osm_max_osm_station_distance");
+      cfg.osmBuildOpts.maxOsmStationDistances.push_back(fmin(5, ref));
+      for (double i = 10; i < ref + 1; i += 10) {
+        cfg.osmBuildOpts.maxOsmStationDistances.push_back(i);
+      }
     } else {
-      curCfg.osmBuildOpts.maxOsmStationDistance = 5;
+      cfg.osmBuildOpts.maxOsmStationDistances.push_back(5);
     }
 
     if (p.hasKey(secStr, "osm_max_node_block_distance")) {
-      procedKeys.insert("osm_max_node_block_distance");
-      curCfg.osmBuildOpts.maxBlockDistance =
+      cfg.osmBuildOpts.maxBlockDistance =
           p.getDouble(secStr, "osm_max_node_block_distance");
     } else {
-      curCfg.osmBuildOpts.maxBlockDistance =
-          *std::max_element(curCfg.osmBuildOpts.maxSnapDistances.begin(),
-                            curCfg.osmBuildOpts.maxSnapDistances.end()) /
+      cfg.osmBuildOpts.maxBlockDistance =
+          *std::max_element(cfg.osmBuildOpts.maxOsmStationDistances.begin(),
+                            cfg.osmBuildOpts.maxOsmStationDistances.end()) /
           8;
     }
 
+    double DEF_SPEED = 85;
     for (uint8_t i = 0; i < 8; i++) {
       std::string name =
           std::string("routing_lvl") + std::to_string(i) + "_fac";
       if (p.hasKey(secStr, name)) {
-        procedKeys.insert(name);
-        double v = p.getDouble(sec.first, name);
-        curCfg.routingOpts.levelPunish[i] = v;
-      } else {
-        curCfg.routingOpts.levelPunish[i] = 1;
+        double f = p.getPosDouble(sec.first, name);
+        LOG(WARN) << "Option " << name << " is deprecated, use osm_lvl"
+                  << std::to_string(i) << "_avg_speed instead.";
+        double v = DEF_SPEED / f;
+        LOG(DEBUG) << " (using osm_lvl" << std::to_string(i) << "_avg_speed of "
+                   << v << " instead)";
+        cfg.osmBuildOpts.levelDefSpeed[i] = v * 0.2777;  // store in m/s
       }
     }
 
-    if (p.hasKey(secStr, "routing_full_turn_punish")) {
-      procedKeys.insert("routing_full_turn_punish");
-      curCfg.routingOpts.fullTurnPunishFac =
-          p.getDouble(secStr, "routing_full_turn_punish");
-    }
-
-    if (p.hasKey(secStr, "routing_no_self_hops")) {
-      procedKeys.insert("routing_no_self_hops");
-      curCfg.routingOpts.noSelfHops = p.getBool(secStr, "routing_no_self_hops");
-    }
-
-    if (p.hasKey(secStr, "routing_full_turn_angle")) {
-      procedKeys.insert("routing_full_turn_angle");
-      double ang = p.getDouble(secStr, "routing_full_turn_angle");
-      curCfg.routingOpts.fullTurnAngle = ang;
-      curCfg.osmBuildOpts.fullTurnAngle = ang;
-    } else {
-      curCfg.routingOpts.fullTurnAngle = 5;
-      curCfg.osmBuildOpts.fullTurnAngle = 5;
-    }
-
-    if (p.hasKey(secStr, "routing_snap_full_turn_angle")) {
-      procedKeys.insert("routing_snap_full_turn_angle");
-      double ang = p.getDouble(secStr, "routing_snap_full_turn_angle");
-      curCfg.osmBuildOpts.maxAngleSnapReach = ang;
-    } else {
-      curCfg.osmBuildOpts.maxAngleSnapReach = curCfg.routingOpts.fullTurnAngle;
-    }
-
-    if (p.hasKey(secStr, "routing_pass_thru_station_punish")) {
-      procedKeys.insert("routing_pass_thru_station_punish");
-      curCfg.routingOpts.passThruStationsPunish =
-          p.getDouble(secStr, "routing_pass_thru_station_punish");
+    for (uint8_t i = 0; i < 8; i++) {
+      std::string name =
+          std::string("osm_lvl") + std::to_string(i) + "_avg_speed";
+      if (p.hasKey(secStr, name)) {
+        double v = p.getPosDouble(sec.first, name);
+        cfg.osmBuildOpts.levelDefSpeed[i] = v * 0.2777;  // store in m/s
+      }
     }
 
     if (p.hasKey(secStr, "routing_one_way_meter_punish_fac")) {
-      procedKeys.insert("routing_one_way_meter_punish_fac");
-      curCfg.routingOpts.oneWayPunishFac =
-          p.getDouble(secStr, "routing_one_way_meter_punish_fac");
+      LOG(WARN) << "Option routing_one_way_meter_punish_fac is deprecated, use "
+                   "osm_one_way_speed_penalty_fac instead.";
+      cfg.osmBuildOpts.oneWaySpeedPen =
+          1 + p.getPosDouble(secStr, "routing_one_way_meter_punish_fac");
+      LOG(DEBUG) << " (using osm_one_way_speed_penalty_fac of "
+                 << cfg.osmBuildOpts.oneWaySpeedPen << " instead)";
+    } else {
+      cfg.osmBuildOpts.oneWaySpeedPen = 1;
     }
 
-    if (p.hasKey(secStr, "routing_one_way_edge_punish")) {
-      procedKeys.insert("routing_one_way_edge_punish");
-      curCfg.routingOpts.oneWayEdgePunish =
-          p.getDouble(secStr, "routing_one_way_edge_punish");
+    if (p.hasKey(secStr, "osm_one_way_speed_penalty_fac")) {
+      cfg.osmBuildOpts.oneWaySpeedPen =
+          p.getPosDouble(secStr, "osm_one_way_speed_penalty_fac");
+    } else {
+      // def already set above
     }
 
-    if (p.hasKey(secStr, "routing_line_unmatched_punish_fac")) {
-      procedKeys.insert("routing_line_unmatched_punish_fac");
-      curCfg.routingOpts.lineUnmatchedPunishFact =
-          p.getDouble(secStr, "routing_line_unmatched_punish_fac");
+    if (p.hasKey(secStr, "osm_one_way_entry_cost")) {
+      cfg.osmBuildOpts.oneWayEntryCost =
+          p.getPosDouble(secStr, "osm_one_way_entry_cost");
+
+    } else {
+      cfg.osmBuildOpts.oneWayEntryCost = 0;
     }
 
+    // take the same cost for taking restricted turns to keep
+    // configuration simple
+    double val = cfg.osmBuildOpts.oneWayEntryCost * 10.0;
+    if (val > std::numeric_limits<uint32_t>::max()) {
+      val = std::numeric_limits<uint32_t>::max();
+    }
+
+    cfg.routingOpts.turnRestrCost = val;
+
+    if (p.hasKey(secStr, "routing_full_turn_punish")) {
+      double val = p.getPosDouble(secStr, "routing_full_turn_punish");
+
+      LOG(WARN) << "Option routing_full_turn_punish is deprecated, use "
+                   "routing_full_turn_penalty instead.";
+
+      val /= cfg.osmBuildOpts.levelDefSpeed[0];
+
+      LOG(DEBUG) << " (using routing_full_turn_penalty of " << val
+                 << " instead)";
+
+      val *= 10.0;
+
+      if (val > std::numeric_limits<uint32_t>::max()) {
+        val = std::numeric_limits<uint32_t>::max();
+      }
+
+      cfg.routingOpts.fullTurnPunishFac = val;
+    }
+
+    if (p.hasKey(secStr, "routing_full_turn_penalty")) {
+      double val = p.getPosDouble(secStr, "routing_full_turn_penalty") * 10.0;
+
+      if (val > std::numeric_limits<uint32_t>::max()) {
+        val = std::numeric_limits<uint32_t>::max();
+      }
+
+      cfg.routingOpts.fullTurnPunishFac = val;
+    }
+
+    if (p.hasKey(secStr, "routing_no_self_hops")) {
+      cfg.routingOpts.noSelfHops = p.getBool(secStr, "routing_no_self_hops");
+    }
+
+    if (p.hasKey(secStr, "routing_full_turn_angle")) {
+      double ang = p.getPosDouble(secStr, "routing_full_turn_angle");
+      cfg.routingOpts.fullTurnAngle = ang;
+      cfg.osmBuildOpts.fullTurnAngle = ang;
+    } else {
+      cfg.routingOpts.fullTurnAngle = 5;
+      cfg.osmBuildOpts.fullTurnAngle = 5;
+    }
+
+    if (p.hasKey(secStr, "routing_snap_full_turn_angle")) {
+      double ang = p.getPosDouble(secStr, "routing_snap_full_turn_angle");
+      cfg.osmBuildOpts.maxAngleSnapReach = ang;
+    } else {
+      cfg.osmBuildOpts.maxAngleSnapReach = cfg.routingOpts.fullTurnAngle;
+    }
+
+    if (p.hasKey(secStr, "routing_pass_thru_station_punish")) {
+      LOG(WARN) << "Option routing_pass_thru_station_punish has been removed.";
+    }
+
+    cfg.routingOpts.turnRestrCost *= 10.0;
+
     if (p.hasKey(secStr, "routing_no_lines_punish_fac")) {
-      procedKeys.insert("routing_no_lines_punish_fac");
-      curCfg.routingOpts.noLinesPunishFact =
-          p.getDouble(secStr, "routing_no_lines_punish_fac");
+      LOG(WARN) << "Option routing_no_lines_punish_fac is deprecated, use "
+                   "routing_no_lines_penalty_fac instead.";
+
+      cfg.routingOpts.noLinesPunishFact =
+          1 + p.getPosDouble(secStr, "routing_no_lines_punish_fac");
+
+      LOG(DEBUG) << " (using routing_no_lines_penalty_fac of "
+                 << cfg.routingOpts.noLinesPunishFact << " instead)";
+    } else {
+      cfg.routingOpts.noLinesPunishFact = 1;
+    }
+
+    if (p.hasKey(secStr, "routing_no_lines_penalty_fac")) {
+      cfg.routingOpts.noLinesPunishFact =
+          p.getPosDouble(secStr, "routing_no_lines_penalty_fac");
+    } else {
+      // default already set above
+    }
+
+    // store this at two places, as we are writing the punishment into the graph
+    cfg.osmBuildOpts.noLinesPunishFact = cfg.routingOpts.noLinesPunishFact;
+
+    if (p.hasKey(secStr, "routing_line_unmatched_punish_fac")) {
+      LOG(WARN)
+          << "Option routing_line_unmatched_punish_fac is deprecated, use "
+             "routing_line_unmatched_time_penalty_fac, "
+             "routing_line_station_from_unmatched_time_penalty, and "
+             "routing_line_station_to_unmatched_time_penalty instead.";
+
+      cfg.routingOpts.lineUnmatchedPunishFact =
+          1 + p.getPosDouble(secStr, "routing_line_unmatched_punish_fac") / 3;
+
+      cfg.routingOpts.lineNameFromUnmatchedPunishFact =
+          1 + p.getPosDouble(secStr, "routing_line_unmatched_punish_fac") / 3;
+
+      cfg.routingOpts.lineNameToUnmatchedPunishFact =
+          1 + p.getPosDouble(secStr, "routing_line_unmatched_punish_fac") / 3;
+
+      LOG(DEBUG) << " (using routing_line_unmatched_punish_fac of "
+                 << cfg.routingOpts.lineUnmatchedPunishFact << " instead)";
+      LOG(DEBUG)
+          << " (using routing_line_station_from_unmatched_time_penalty of "
+          << cfg.routingOpts.lineNameFromUnmatchedPunishFact << " instead)";
+      LOG(DEBUG) << " (using routing_line_station_to_unmatched_time_penalty of "
+                 << cfg.routingOpts.lineNameToUnmatchedPunishFact
+                 << " instead)";
+    }
+
+    if (p.hasKey(secStr, "routing_line_unmatched_time_penalty_fac")) {
+      cfg.routingOpts.lineUnmatchedPunishFact =
+          p.getPosDouble(secStr, "routing_line_unmatched_time_penalty_fac");
+    }
+
+    if (p.hasKey(secStr, "routing_line_station_from_unmatched_time_penalty")) {
+      cfg.routingOpts.lineNameFromUnmatchedPunishFact = p.getPosDouble(
+          secStr, "routing_line_station_from_unmatched_time_penalty");
+    }
+
+    if (p.hasKey(secStr, "routing_line_station_to_unmatched_time_penalty")) {
+      cfg.routingOpts.lineNameToUnmatchedPunishFact = p.getPosDouble(
+          secStr, "routing_line_station_to_unmatched_time_penalty");
     }
 
     if (p.hasKey(secStr, "routing_platform_unmatched_punish")) {
-      procedKeys.insert("routing_platform_unmatched_punish");
-      curCfg.routingOpts.platformUnmatchedPen =
-          p.getDouble(secStr, "routing_platform_unmatched_punish");
+      LOG(WARN)
+          << "Option routing_platform_unmatched_punish is deprecated, use "
+             "routing_platform_unmatched_penalty instead.";
+      cfg.routingOpts.platformUnmatchedPen =
+          p.getPosDouble(secStr, "routing_platform_unmatched_punish");
+
+      cfg.routingOpts.platformUnmatchedPen =
+          cfg.routingOpts.platformUnmatchedPen *
+          (DEF_TRANS_PEN / cfg.osmBuildOpts.levelDefSpeed[0]);
+
+      LOG(DEBUG) << " (using routing_platform_unmatched_penalty of "
+                 << cfg.routingOpts.platformUnmatchedPen << " instead)";
+    } else {
+      cfg.routingOpts.platformUnmatchedPen = 0;
     }
 
-    if (p.hasKey(secStr, "routing_non_osm_station_punish")) {
-      procedKeys.insert("routing_non_osm_station_punish");
-      curCfg.routingOpts.nonOsmPen =
-          p.getDouble(secStr, "routing_non_osm_station_punish");
+    if (p.hasKey(secStr, "routing_platform_unmatched_penalty")) {
+      cfg.routingOpts.platformUnmatchedPen =
+          p.getPosDouble(secStr, "routing_platform_unmatched_penalty");
     } else {
-      curCfg.routingOpts.nonOsmPen = 0;
+      // default already set above
+    }
+
+    if (p.hasKey(secStr, "routing_transition_penalty_fac")) {
+      cfg.routingOpts.transitionPen =
+          p.getPosDouble(secStr, "routing_transition_penalty_fac");
+    } else {
+      cfg.routingOpts.transitionPen = DEF_TRANS_PEN;
     }
 
     if (p.hasKey(secStr, "routing_station_distance_punish_fac")) {
-      procedKeys.insert("routing_station_distance_punish_fac");
-      curCfg.routingOpts.stationDistPenFactor =
-          p.getDouble(secStr, "routing_station_distance_punish_fac");
+      cfg.routingOpts.stationDistPenFactor =
+          p.getPosDouble(secStr, "routing_station_distance_punish_fac");
+      LOG(WARN) << "Option routing_station_distance_punish_fac is deprecated, "
+                   "use routing_station_move_penalty_fac instead.";
+      cfg.routingOpts.stationDistPenFactor =
+          cfg.routingOpts.stationDistPenFactor *
+          (DEF_TRANS_PEN / cfg.osmBuildOpts.levelDefSpeed[0]);
+      LOG(DEBUG) << " (using routing_station_move_penalty_fac of "
+                 << cfg.routingOpts.stationDistPenFactor << " instead)";
     } else {
-      curCfg.routingOpts.stationDistPenFactor = 1;
+      cfg.routingOpts.stationDistPenFactor =
+          cfg.routingOpts.stationDistPenFactor *
+          (DEF_TRANS_PEN / cfg.osmBuildOpts.levelDefSpeed[0]);
+    }
+
+    if (p.hasKey(secStr, "routing_station_move_penalty_fac")) {
+      cfg.routingOpts.stationDistPenFactor =
+          p.getPosDouble(secStr, "routing_station_move_penalty_fac");
+    } else {
+      // the default value was already set above
+    }
+
+    if (p.hasKey(secStr, "routing_non_osm_station_punish")) {
+      cfg.routingOpts.nonStationPen =
+          p.getPosDouble(secStr, "routing_non_osm_station_punish");
+      LOG(WARN) << "Option routing_non_osm_station_punish is deprecated, use "
+                   "routing_non_station_penalty instead.";
+      cfg.routingOpts.nonStationPen =
+          cfg.routingOpts.nonStationPen *
+          (DEF_TRANS_PEN / cfg.osmBuildOpts.levelDefSpeed[0]);
+      LOG(DEBUG) << " (using routing_non_station_penalty of "
+                 << cfg.routingOpts.nonStationPen << " instead)";
+    } else {
+      cfg.routingOpts.nonStationPen = 0;
+    }
+
+    if (p.hasKey(secStr, "routing_non_station_penalty")) {
+      cfg.routingOpts.nonStationPen =
+          p.getPosDouble(secStr, "routing_non_station_penalty");
+    } else {
+      // default was already set above
+    }
+
+    if (p.hasKey(secStr, "routing_station_unmatched_penalty")) {
+      cfg.routingOpts.stationUnmatchedPen =
+          p.getPosDouble(secStr, "routing_station_unmatched_penalty");
+    } else {
+      cfg.routingOpts.stationUnmatchedPen = cfg.routingOpts.nonStationPen / 2;
     }
 
     if (p.hasKey(secStr, "station_normalize_chain")) {
-      procedKeys.insert("station_normalize_chain");
       try {
         auto arr = p.getStrArr(secStr, "station_normalize_chain", ';');
-        curCfg.osmBuildOpts.statNormzer =
-            trgraph::Normalizer(getNormRules(arr));
+        cfg.osmBuildOpts.statNormzer = trgraph::Normalizer(getNormRules(arr));
       } catch (const std::exception& e) {
         throw ParseExc(p.getVal(secStr, "station_normalize_chain").line,
                        p.getVal(secStr, "station_normalize_chain").pos,
@@ -375,11 +546,9 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
     }
 
     if (p.hasKey(secStr, "track_normalize_chain")) {
-      procedKeys.insert("track_normalize_chain");
       try {
         auto arr = p.getStrArr(secStr, "track_normalize_chain", ';');
-        curCfg.osmBuildOpts.trackNormzer =
-            trgraph::Normalizer(getNormRules(arr));
+        cfg.osmBuildOpts.trackNormzer = trgraph::Normalizer(getNormRules(arr));
       } catch (const std::exception& e) {
         throw ParseExc(p.getVal(secStr, "track_normalize_chain").line,
                        p.getVal(secStr, "track_normalize_chain").pos,
@@ -390,11 +559,9 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
     }
 
     if (p.hasKey(secStr, "line_normalize_chain")) {
-      procedKeys.insert("line_normalize_chain");
       try {
         auto arr = p.getStrArr(secStr, "line_normalize_chain", ';');
-        curCfg.osmBuildOpts.lineNormzer =
-            trgraph::Normalizer(getNormRules(arr));
+        cfg.osmBuildOpts.lineNormzer = trgraph::Normalizer(getNormRules(arr));
       } catch (const std::exception& e) {
         throw ParseExc(p.getVal(secStr, "line_normalize_chain").line,
                        p.getVal(secStr, "line_normalize_chain").pos,
@@ -405,10 +572,9 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
     }
 
     if (p.hasKey(secStr, "station_id_normalize_chain")) {
-      procedKeys.insert("station_id_normalize_chain");
       try {
         auto arr = p.getStrArr(secStr, "station_id_normalize_chain", ';');
-        curCfg.osmBuildOpts.idNormzer = trgraph::Normalizer(getNormRules(arr));
+        cfg.osmBuildOpts.idNormzer = trgraph::Normalizer(getNormRules(arr));
       } catch (const std::exception& e) {
         throw ParseExc(p.getVal(secStr, "station_id_normalize_chain").line,
                        p.getVal(secStr, "station_id_normalize_chain").pos,
@@ -418,18 +584,41 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
       }
     }
 
-    for (const auto& kv : p.getKeyVals(secStr)) {
-      if (!procedKeys.count(kv.first))
-        curCfg.unproced[kv.first] = kv.second.val;
+    // determine the maximum possible speed for this config, this is later
+    // used to filter out station which are so far out of reach we don't
+    // have to consider them for the bounding box calculation
+    cfg.osmBuildOpts.maxSpeed = 0;
+    cfg.osmBuildOpts.maxSpeedCorFac = 1;
+    for (size_t i = 0; i < 8; i++) {
+      if (cfg.osmBuildOpts.levelDefSpeed[i] > cfg.osmBuildOpts.maxSpeed)
+        cfg.osmBuildOpts.maxSpeed = cfg.osmBuildOpts.levelDefSpeed[i];
     }
 
+    if (cfg.routingOpts.lineUnmatchedPunishFact < 1)
+      cfg.osmBuildOpts.maxSpeedCorFac *=
+          cfg.routingOpts.lineUnmatchedPunishFact;
+    if (cfg.routingOpts.lineNameFromUnmatchedPunishFact < 1)
+      cfg.osmBuildOpts.maxSpeedCorFac *=
+          cfg.routingOpts.lineNameFromUnmatchedPunishFact;
+    if (cfg.routingOpts.lineNameToUnmatchedPunishFact < 1)
+      cfg.osmBuildOpts.maxSpeedCorFac *=
+          cfg.routingOpts.lineNameToUnmatchedPunishFact;
+
+    if (cfg.routingOpts.noLinesPunishFact < 1)
+      cfg.osmBuildOpts.maxSpeedCorFac *= cfg.routingOpts.noLinesPunishFact;
+
+    if (cfg.osmBuildOpts.oneWaySpeedPen < 1)
+      cfg.osmBuildOpts.maxSpeedCorFac *= cfg.osmBuildOpts.oneWaySpeedPen;
+
+    cfg.osmBuildOpts.maxSpeed /= cfg.osmBuildOpts.maxSpeedCorFac;
+
     bool found = false;
 
-    for (auto& cfg : _cfgs) {
-      if (cfg == curCfg) {
+    for (auto& exCfg : _cfgs) {
+      if (cfg == exCfg) {
         for (auto mot :
              ad::cppgtfs::gtfs::flat::Route::getTypesFromString(secStr)) {
-          cfg.mots.insert(mot);
+          exCfg.mots.insert(mot);
         }
         found = true;
         break;
@@ -437,8 +626,8 @@ void MotConfigReader::parse(const std::vector<std::string>& paths) {
     }
 
     if (!found) {
-      curCfg.mots = ad::cppgtfs::gtfs::flat::Route::getTypesFromString(secStr);
-      _cfgs.push_back(curCfg);
+      cfg.mots = ad::cppgtfs::gtfs::flat::Route::getTypesFromString(secStr);
+      _cfgs.push_back(cfg);
     }
   }
 }
diff --git a/src/pfaedle/config/MotConfigReader.h b/src/pfaedle/config/MotConfigReader.h
index 51716ff..86e3ffb 100644
--- a/src/pfaedle/config/MotConfigReader.h
+++ b/src/pfaedle/config/MotConfigReader.h
@@ -23,7 +23,7 @@ using ad::cppgtfs::gtfs::Route;
 class MotConfigReader {
  public:
   MotConfigReader();
-  void parse(const std::vector<std::string>& paths);
+  void parse(const std::vector<std::string>& paths, const std::string& literal);
 
   const std::vector<MotConfig>& getConfigs() const;
 
diff --git a/src/pfaedle/config/PfaedleConfig.h b/src/pfaedle/config/PfaedleConfig.h
index e5bc41a..feaa645 100644
--- a/src/pfaedle/config/PfaedleConfig.h
+++ b/src/pfaedle/config/PfaedleConfig.h
@@ -5,10 +5,11 @@
 #ifndef PFAEDLE_CONFIG_PFAEDLECONFIG_H_
 #define PFAEDLE_CONFIG_PFAEDLECONFIG_H_
 
+#include <set>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <set>
+#include "util/geo/Geo.h"
 #include "ad/cppgtfs/gtfs/Route.h"
 
 namespace pfaedle {
@@ -20,38 +21,44 @@ struct Config {
   Config()
       : dbgOutputPath("."),
         solveMethod("global"),
-        evalPath("."),
         outputPath("gtfs-out"),
         dropShapes(false),
         useHMM(false),
         writeGraph(false),
-        writeCombGraph(false),
-        evaluate(false),
         buildTransitGraph(false),
         useCaching(false),
         writeOverpass(false),
         inPlace(false),
-        gridSize(2000) {}
+        writeColors(false),
+        noFastHops(false),
+        noAStar(false),
+        noTrie(false),
+        noHopCache(false),
+        writeStats(false),
+        gridSize(2000 / util::geo::M_PER_DEG) {}
   std::string dbgOutputPath;
   std::string solveMethod;
-  std::string evalPath;
   std::string shapeTripId;
   std::string outputPath;
   std::string writeOsm;
   std::string osmPath;
-  std::string evalDfBins;
+  std::string motCfgParam;
   std::vector<std::string> feedPaths;
   std::vector<std::string> configPaths;
   std::set<Route::TYPE> mots;
   bool dropShapes;
   bool useHMM;
   bool writeGraph;
-  bool writeCombGraph;
-  bool evaluate;
   bool buildTransitGraph;
   bool useCaching;
   bool writeOverpass;
   bool inPlace;
+  bool writeColors;
+  bool noFastHops;
+  bool noAStar;
+  bool noTrie;
+  bool noHopCache;
+  bool writeStats;
   double gridSize;
 
   std::string toString() {
@@ -64,10 +71,16 @@ struct Config {
        << "drop-shapes: " << dropShapes << "\n"
        << "use-hmm: " << useHMM << "\n"
        << "write-graph: " << writeGraph << "\n"
-       << "write-cgraph: " << writeCombGraph << "\n"
        << "grid-size: " << gridSize << "\n"
        << "use-cache: " << useCaching << "\n"
        << "write-overpass: " << writeOverpass << "\n"
+       << "inplace: " << inPlace << "\n"
+       << "write-colors: " << writeColors << "\n"
+       << "no-fast-hops: " << noFastHops << "\n"
+       << "no-a-star: " << noAStar << "\n"
+       << "no-trie: " << noTrie << "\n"
+       << "no-hop-cache: " << noHopCache << "\n"
+       << "write-stats: " << writeStats << "\n"
        << "feed-paths: ";
 
     for (const auto& p : feedPaths) {
diff --git a/src/pfaedle/eval/Collector.cpp b/src/pfaedle/eval/Collector.cpp
deleted file mode 100644
index 709830b..0000000
--- a/src/pfaedle/eval/Collector.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#include <csignal>
-#include <fstream>
-#include <set>
-#include <string>
-#include <utility>
-#include "ad/cppgtfs/gtfs/Feed.h"
-#include "pfaedle/Def.h"
-#include "pfaedle/eval/Collector.h"
-#include "pfaedle/eval/Result.h"
-#include "util/geo/Geo.h"
-#include "util/geo/PolyLine.h"
-#include "util/geo/output/GeoJsonOutput.h"
-#include "util/log/Log.h"
-
-using util::geo::PolyLine;
-
-using pfaedle::gtfs::Trip;
-using ad::cppgtfs::gtfs::Shape;
-using pfaedle::eval::Collector;
-using pfaedle::eval::Result;
-using util::geo::output::GeoJsonOutput;
-
-// _____________________________________________________________________________
-double Collector::add(const Trip* t, const Shape* oldS, const Shape& newS,
-                      const std::vector<double>& newTripDists) {
-  if (!oldS) {
-    _noOrigShp++;
-    return 0;
-  }
-
-  for (auto st : t->getStopTimes()) {
-    if (st.getShapeDistanceTravelled() < 0) {
-      // we cannot safely compare trips without shape dist travelled
-      // info
-      _noOrigShp++;
-      return 0;
-    }
-  }
-
-  double fd = 0;
-  size_t unmatchedSegments;
-  double unmatchedSegmentsLength;
-
-  std::vector<double> oldDists;
-  LINE oldL = getWebMercLine(
-      oldS, t->getStopTimes().begin()->getShapeDistanceTravelled(),
-      (--t->getStopTimes().end())->getShapeDistanceTravelled(), &oldDists);
-
-  std::vector<double> newDists;
-  LINE newL = getWebMercLine(&newS, -1, -1, &newDists);
-
-  std::ofstream fstr(_evalOutPath + "/trip-" + t->getId() + ".json");
-  GeoJsonOutput gjout(fstr);
-
-  auto oldSegs = segmentize(t, oldL, oldDists, 0);
-  auto newSegs = segmentize(t, newL, newDists, &newTripDists);
-
-  // cut both result at the beginning and end to clear evaluation from
-  // loops at the end
-  POLYLINE oldStart = oldSegs[0];
-  POLYLINE newStart = newSegs[0];
-  auto oldStartNew =
-      oldStart.getSegment(oldStart.projectOn(newSegs[0][0]).totalPos, 1);
-  auto newStartNew =
-      newStart.getSegment(newStart.projectOn(oldSegs[0][0]).totalPos, 1);
-  if (fabs(oldStartNew.getLength() - oldStart.getLength()) /
-              oldStart.getLength() <
-          0.5 &&
-      fabs(newStartNew.getLength() - newStart.getLength()) /
-              newStart.getLength() <
-          0.5) {
-    oldSegs[0] = oldStartNew.getLine();
-    newSegs[0] = newStartNew.getLine();
-  }
-
-  POLYLINE oldEnd = oldSegs[oldSegs.size() - 1];
-  POLYLINE newEnd = newSegs[oldSegs.size() - 1];
-  auto oldEndNew =
-      oldEnd.getSegment(0, oldEnd.projectOn(newSegs.back().back()).totalPos);
-  auto newEndNew =
-      newEnd.getSegment(0, newEnd.projectOn(oldSegs.back().back()).totalPos);
-  if (fabs(oldEndNew.getLength() - oldEnd.getLength()) / oldEnd.getLength() <
-          0.5 &&
-      fabs(newEndNew.getLength() - newEnd.getLength()) / newEnd.getLength() <
-          0.5) {
-    oldSegs[oldSegs.size() - 1] = oldEndNew.getLine();
-    newSegs[newSegs.size() - 1] = newEndNew.getLine();
-  }
-
-  // check for suspicious (most likely erroneous) lines in the
-  // ground truth data which have a long straight-line segment
-
-  for (auto oldL : oldSegs) {
-    for (size_t i = 1; i < oldL.size(); i++) {
-      if (util::geo::webMercMeterDist(oldL[i - 1], oldL[i]) > 500) {
-        // return 0;
-      }
-    }
-  }
-
-  // new lines build from cleaned-up shapes
-  LINE oldLCut;
-  LINE newLCut;
-
-  for (auto oldL : oldSegs) {
-    gjout.printLatLng(oldL, util::json::Dict{{"ver", "old"}});
-    oldLCut.insert(oldLCut.end(), oldL.begin(), oldL.end());
-  }
-
-  for (auto newL : newSegs) {
-    gjout.printLatLng(newL, util::json::Dict{{"ver", "new"}});
-    newLCut.insert(newLCut.end(), newL.begin(), newL.end());
-  }
-
-  gjout.flush();
-  fstr.close();
-
-  double fac = cos(2 * atan(exp((oldSegs.front().front().getY() +
-                                 oldSegs.back().back().getY()) /
-                                6378137.0)) -
-                   1.5707965);
-
-  if (_dCache.count(oldS) && _dCache.find(oldS)->second.count(newS.getId())) {
-    fd = _dCache[oldS][newS.getId()];
-  } else {
-    fd = util::geo::accFrechetDistC(oldLCut, newLCut, 5 / fac) * fac;
-    _dCache[oldS][newS.getId()] = fd;
-  }
-
-  if (_dACache.count(oldS) && _dACache.find(oldS)->second.count(newS.getId())) {
-    unmatchedSegments = _dACache[oldS][newS.getId()].first;
-    unmatchedSegmentsLength = _dACache[oldS][newS.getId()].second;
-  } else {
-    auto dA = getDa(oldSegs, newSegs);
-    _dACache[oldS][newS.getId()] = dA;
-    unmatchedSegments = dA.first;
-    unmatchedSegmentsLength = dA.second;
-  }
-
-  double totL = 0;
-  for (auto l : oldSegs) totL += util::geo::len(l) * fac;
-
-  // filter out shapes with a lenght of under 5 meters - they are most likely
-  // artifacts
-  if (totL < 5) {
-    _noOrigShp++;
-    return 0;
-  }
-
-  _fdSum += fd / totL;
-  _unmatchedSegSum += unmatchedSegments;
-  _unmatchedSegLengthSum += unmatchedSegmentsLength;
-  _results.insert(Result(t, fd / totL));
-  _resultsAN.insert(Result(t, static_cast<double>(unmatchedSegments) /
-                                  static_cast<double>(oldSegs.size())));
-  _resultsAL.insert(Result(t, unmatchedSegmentsLength / totL));
-
-  LOG(DEBUG) << "This result (" << t->getId()
-             << "): A_N/N = " << unmatchedSegments << "/" << oldSegs.size()
-             << " = "
-             << static_cast<double>(unmatchedSegments) /
-                    static_cast<double>(oldSegs.size())
-             << " A_L/L = " << unmatchedSegmentsLength << "/" << totL << " = "
-             << unmatchedSegmentsLength / totL << " d_f = " << fd;
-
-  return fd;
-}
-
-// _____________________________________________________________________________
-std::vector<LINE> Collector::segmentize(
-    const Trip* t, const LINE& shape, const std::vector<double>& dists,
-    const std::vector<double>* newTripDists) {
-  std::vector<LINE> ret;
-
-  if (t->getStopTimes().size() < 2) return ret;
-
-  POLYLINE pl(shape);
-  std::vector<std::pair<POINT, double> > cuts;
-
-  size_t i = 0;
-  for (auto st : t->getStopTimes()) {
-    if (newTripDists) {
-      cuts.push_back(std::pair<POINT, double>(
-          util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(st.getStop()->getLat(),
-                                                        st.getStop()->getLng()),
-          (*newTripDists)[i]));
-    } else {
-      cuts.push_back(std::pair<POINT, double>(
-          util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(st.getStop()->getLat(),
-                                                        st.getStop()->getLng()),
-          st.getShapeDistanceTravelled()));
-    }
-    i++;
-  }
-
-  // get first half of geometry, and search for start point there!
-  size_t before = std::upper_bound(dists.begin(), dists.end(), cuts[1].second) -
-                  dists.begin();
-  if (before + 1 > shape.size()) before = shape.size() - 1;
-  assert(shape.begin() + before + 1 <= shape.end());
-  POLYLINE l(LINE(shape.begin(), shape.begin() + before + 1));
-  auto lastLp = l.projectOn(cuts.front().first);
-
-  for (size_t i = 1; i < cuts.size(); i++) {
-    size_t before = shape.size();
-    if (i < cuts.size() - 1 && cuts[i + 1].second > -0.5) {
-      before =
-          std::upper_bound(dists.begin(), dists.end(), cuts[i + 1].second) -
-          dists.begin();
-    }
-
-    POLYLINE beforePl(LINE(shape.begin(), shape.begin() + before));
-
-    auto curLp = beforePl.projectOnAfter(cuts[i].first, lastLp.lastIndex);
-
-    ret.push_back(pl.getSegment(lastLp, curLp).getLine());
-    lastLp = curLp;
-  }
-
-  // std::raise(SIGABRT);
-  return ret;
-}
-
-// _____________________________________________________________________________
-LINE Collector::getWebMercLine(const Shape* s, double from, double t) {
-  return getWebMercLine(s, from, t, 0);
-}
-
-// _____________________________________________________________________________
-LINE Collector::getWebMercLine(const Shape* s, double from, double to,
-                               std::vector<double>* dists) {
-  LINE ret;
-
-  auto i = s->getPoints().begin();
-
-  for (; i != s->getPoints().end(); i++) {
-    auto p = *i;
-
-    if ((from < 0 || (p.travelDist - from) > -0.01)) {
-      if (to >= 0 && (p.travelDist - to) > 0.01) break;
-
-      POINT mercP = util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(p.lat, p.lng);
-
-      ret.push_back(mercP);
-      if (dists) dists->push_back(p.travelDist);
-    }
-  }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-const std::set<Result>& Collector::getResults() const { return _results; }
-
-// _____________________________________________________________________________
-double Collector::getAvgDist() const { return _fdSum / _results.size(); }
-
-// _____________________________________________________________________________
-void Collector::printHisto(std::ostream* os, const std::set<Result>& result,
-                           const std::vector<double>& bins) const {
-  size_t W = 60;
-
-  auto it = result.begin();
-  std::vector<std::pair<double, size_t> > res;
-  std::vector<const Trip*> examples;
-  size_t maxC = 0;
-
-  for (size_t i = 0; i < bins.size(); i++) {
-    size_t c = 0;
-    const Trip* trip = 0;
-
-    while (it != result.end() && it->getDist() <= (bins[i] + 0.001)) {
-      if (!trip) trip = it->getTrip();
-      c++;
-      it++;
-    }
-
-    if (c > maxC) maxC = c;
-
-    examples.push_back(trip);
-    res.push_back(std::pair<double, size_t>(bins[i], c));
-  }
-
-  size_t j = 0;
-  for (auto r : res) {
-    std::string range = util::toString(r.first);
-    (*os) << "  < " << std::setfill(' ') << std::setw(10) << range << ": ";
-    size_t i = 0;
-
-    for (; i < W * (static_cast<double>(r.second) / static_cast<double>(maxC));
-         i++) {
-      (*os) << "|";
-    }
-
-    if (r.second)
-      (*os) << " (" << r.second << ", e.g. #" << examples[j]->getId() << ")";
-    (*os) << std::endl;
-    j++;
-  }
-}
-
-// _____________________________________________________________________________
-std::vector<double> Collector::getBins(double mind, double maxd, size_t steps) {
-  double bin = (maxd - mind) / steps;
-  double curE = mind + bin;
-
-  std::vector<double> ret;
-  while (curE <= maxd) {
-    ret.push_back(curE);
-    curE += bin;
-  }
-  return ret;
-}
-
-// _____________________________________________________________________________
-void Collector::printCsv(std::ostream* os, const std::set<Result>& result,
-                         const std::vector<double>& bins) const {
-  auto it = result.begin();
-  std::vector<std::pair<double, size_t> > res;
-
-  for (size_t i = 0; i < bins.size(); i++) {
-    size_t c = 0;
-    const Trip* trip = 0;
-
-    while (it != result.end() && it->getDist() <= (bins[i] + 0.001)) {
-      if (!trip) trip = it->getTrip();
-      c++;
-      it++;
-    }
-
-    res.push_back(std::pair<double, size_t>(bins[i], c));
-  }
-
-  (*os) << "range, count\n";
-  for (auto r : res) {
-    (*os) << r.first << "," << r.second << "\n";
-  }
-}
-
-// _____________________________________________________________________________
-void Collector::printStats(std::ostream* os) const {
-  size_t buckets = 10;
-  (*os) << "\n ===== Evalution results =====\n\n";
-
-  (*os) << std::setfill(' ') << std::setw(30)
-        << "  # of trips new shapes were matched for: " << _results.size()
-        << "\n";
-  (*os) << std::setw(30) << "  # of trips without input shapes: " << _noOrigShp
-        << "\n";
-
-  if (_results.size()) {
-    (*os) << std::setw(30) << "  highest distance to input shapes: "
-          << (--_results.end())->getDist() << " (on trip #"
-          << (--_results.end())->getTrip()->getId() << ")\n";
-    (*os) << std::setw(30) << "  lowest distance to input shapes: "
-          << (_results.begin())->getDist() << " (on trip #"
-          << (_results.begin())->getTrip()->getId() << ")\n";
-    (*os) << std::setw(30) << "  avg total frechet distance: " << getAvgDist()
-          << "\n";
-
-    std::vector<double> dfBins = getBins(
-        (_results.begin())->getDist(), (--_results.end())->getDist(), buckets);
-
-    if (_dfBins.size()) dfBins = _dfBins;
-
-    (*os) << "\n  -- Histogram of d_f for this run -- " << std::endl;
-    printHisto(os, _results, dfBins);
-
-    std::ofstream fstr1(_evalOutPath + "/eval-frechet.csv");
-    printCsv(&fstr1, _results, dfBins);
-
-    (*os) << "\n\n\n  -- Histogram of A_N/N for this run -- " << std::endl;
-    printHisto(os, _resultsAN,
-               getBins((_resultsAN.begin())->getDist(),
-                       (--_resultsAN.end())->getDist(), buckets));
-    std::ofstream fstr2(_evalOutPath + "/eval-AN.csv");
-    printCsv(&fstr2, _resultsAN, getBins(0, 1, 20));
-
-    (*os) << "\n\n\n  -- Histogram of A_L/L for this run -- " << std::endl;
-    printHisto(os, _resultsAL,
-               getBins((_resultsAL.begin())->getDist(),
-                       (--_resultsAL.end())->getDist(), buckets));
-    std::ofstream fstr3(_evalOutPath + "/eval-AL.csv");
-    printCsv(&fstr3, _resultsAL, getBins(0, 1, 20));
-  }
-
-  (*os) << "\n ===== End of evaluation results =====\n";
-  (*os) << std::endl;
-}
-
-// _____________________________________________________________________________
-std::pair<size_t, double> Collector::getDa(const std::vector<LINE>& a,
-                                           const std::vector<LINE>& b) {
-  assert(a.size() == b.size());
-  std::pair<size_t, double> ret{0, 0};
-
-  // euclidean distance on web mercator is in meters on equator,
-  // and proportional to cos(lat) in both y directions
-  double fac =
-      cos(2 * atan(exp((a.front().front().getY() + a.back().back().getY()) /
-                       6378137.0)) -
-          1.5707965);
-
-  for (size_t i = 0; i < a.size(); i++) {
-    double fd = util::geo::frechetDist(a[i], b[i], 3 / fac) * fac;
-    if (fd >= 20) {
-      ret.first++;
-      ret.second += util::geo::len(a[i]) * fac;
-    }
-  }
-
-  return ret;
-}
diff --git a/src/pfaedle/gtfs/Feed.h b/src/pfaedle/gtfs/Feed.h
index 8e5cc7b..dd4abdd 100644
--- a/src/pfaedle/gtfs/Feed.h
+++ b/src/pfaedle/gtfs/Feed.h
@@ -6,7 +6,6 @@
 #define PFAEDLE_GTFS_FEED_H_
 
 #include <string>
-#include "Route.h"
 #include "Service.h"
 #include "ShapeContainer.h"
 #include "StopTime.h"
@@ -21,14 +20,15 @@ namespace pfaedle {
 namespace gtfs {
 
 typedef ad::cppgtfs::gtfs::FeedB<
-    ad::cppgtfs::gtfs::Agency, Route, ad::cppgtfs::gtfs::Stop, Service,
-    StopTime, Shape, ad::cppgtfs::gtfs::Fare, ad::cppgtfs::gtfs::Container,
-    ad::cppgtfs::gtfs::ContContainer, ad::cppgtfs::gtfs::NullContainer,
-    ad::cppgtfs::gtfs::ContContainer, ad::cppgtfs::gtfs::ContContainer,
-    ShapeContainer, ad::cppgtfs::gtfs::NullContainer>
+    ad::cppgtfs::gtfs::Agency, ad::cppgtfs::gtfs::Route,
+    ad::cppgtfs::gtfs::Stop, Service, StopTime, Shape, ad::cppgtfs::gtfs::Fare,
+    ad::cppgtfs::gtfs::Container, ad::cppgtfs::gtfs::Container,
+    ad::cppgtfs::gtfs::NullContainer, ad::cppgtfs::gtfs::ContContainer,
+    ad::cppgtfs::gtfs::ContContainer, ShapeContainer,
+    ad::cppgtfs::gtfs::Container>
     Feed;
 typedef ad::cppgtfs::gtfs::TripB<StopTime<ad::cppgtfs::gtfs::Stop>, Service,
-                                 Route, Shape>
+                                 ad::cppgtfs::gtfs::Route, Shape>
     Trip;
 
 }  // namespace gtfs
diff --git a/src/pfaedle/gtfs/Route.h b/src/pfaedle/gtfs/Route.h
deleted file mode 100644
index 15ba7f0..0000000
--- a/src/pfaedle/gtfs/Route.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2016, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#ifndef PFAEDLE_GTFS_ROUTE_H_
-#define PFAEDLE_GTFS_ROUTE_H_
-
-#include <stdint.h>
-#include <algorithm>
-#include <iomanip>
-#include <set>
-#include <sstream>
-#include <string>
-#include "ad/cppgtfs/gtfs/Agency.h"
-#include "ad/cppgtfs/gtfs/Route.h"
-#include "util/Misc.h"
-
-using std::exception;
-using std::string;
-
-namespace pfaedle {
-namespace gtfs {
-
-class Route {
- public:
-  typedef Route* Ref;
-  static std::string getId(Ref r) { return r->getId(); }
-
-  Route() {}
-
-  Route(const string& id, ad::cppgtfs::gtfs::Agency* agency,
-        const string& short_name, const string& long_name, const string& desc,
-        ad::cppgtfs::gtfs::flat::Route::TYPE type, const string& url,
-        uint32_t color, uint32_t text_color)
-      : _id(id), _short_name(short_name), _long_name(long_name), _type(type) {
-    UNUSED(agency);
-    UNUSED(desc);
-    UNUSED(url);
-    UNUSED(color);
-    UNUSED(text_color);
-  }
-
-  const std::string& getId() const { return _id; }
-
-  const std::string& getShortName() const { return _short_name; }
-
-  const std::string& getLongName() const { return _long_name; }
-
-  ad::cppgtfs::gtfs::flat::Route::TYPE getType() const { return _type; }
-
- private:
-  string _id;
-  string _short_name;
-  string _long_name;
-  ad::cppgtfs::gtfs::flat::Route::TYPE _type;
-};
-
-}  // namespace gtfs
-}  // namespace pfaedle
-
-#endif  // PFAEDLE_GTFS_ROUTE_H_
diff --git a/src/pfaedle/gtfs/ShapeContainer.tpp b/src/pfaedle/gtfs/ShapeContainer.tpp
index 60f2b61..9366028 100644
--- a/src/pfaedle/gtfs/ShapeContainer.tpp
+++ b/src/pfaedle/gtfs/ShapeContainer.tpp
@@ -45,15 +45,15 @@ bool ShapeContainer<T>::remove(const std::string& id) {
 // ____________________________________________________________________________
 template <typename T>
 T* ShapeContainer<T>::get(const std::string& id) {
-  if (!has(id)) return 0;
-  return reinterpret_cast<T*>(1);
+  UNUSED(id);
+  return reinterpret_cast<T*>(0);
 }
 
 // ____________________________________________________________________________
 template <typename T>
 const T* ShapeContainer<T>::get(const std::string& id) const {
-  if (!has(id)) return 0;
-  return reinterpret_cast<T*>(1);
+  UNUSED(id);
+  return reinterpret_cast<T*>(0);
 }
 
 // ____________________________________________________________________________
diff --git a/src/pfaedle/gtfs/StopTime.h b/src/pfaedle/gtfs/StopTime.h
index fe18a52..b8a45b1 100644
--- a/src/pfaedle/gtfs/StopTime.h
+++ b/src/pfaedle/gtfs/StopTime.h
@@ -27,14 +27,11 @@ class StopTime {
            ad::cppgtfs::gtfs::flat::StopTime::PU_DO_TYPE put,
            ad::cppgtfs::gtfs::flat::StopTime::PU_DO_TYPE dot, float distTrav,
            bool isTp)
-      : _s(s), _sequence(seq), _dist(distTrav) {
-    UNUSED(at);
-    UNUSED(dt);
+      : _s(s), _sequence(seq), _dist(distTrav), _at(at), _dt(dt), _isTp(isTp) {
     UNUSED(hs);
     UNUSED(put);
     UNUSED(dot);
     UNUSED(distTrav);
-    UNUSED(isTp);
   }
 
   const typename StopT::Ref getStop() const { return _s; }
@@ -42,20 +39,23 @@ class StopTime {
   void setShapeDistanceTravelled(double d) { _dist = d; }
 
   ad::cppgtfs::gtfs::Time getArrivalTime() const {
-    return ad::cppgtfs::gtfs::Time(0, 0, 0);
+    return _at;
   }
   ad::cppgtfs::gtfs::Time getDepartureTime() const {
-    return ad::cppgtfs::gtfs::Time(0, 0, 0);
+    return _dt;
   }
 
   float getShapeDistanceTravelled() const { return _dist; }
 
   uint16_t getSeq() const { return _sequence; }
+  bool isTp() const { return _isTp; }
 
  private:
   typename StopT::Ref _s;
   uint32_t _sequence;
   float _dist;
+  ad::cppgtfs::gtfs::Time _at, _dt;
+  bool _isTp;
 };
 
 template <typename StopTimeT>
diff --git a/src/pfaedle/gtfs/Writer.cpp b/src/pfaedle/gtfs/Writer.cpp
index 7a0c5b3..26dd51d 100644
--- a/src/pfaedle/gtfs/Writer.cpp
+++ b/src/pfaedle/gtfs/Writer.cpp
@@ -13,13 +13,13 @@
 #include "ad/util/CsvWriter.h"
 #include "pfaedle/gtfs/Writer.h"
 
-using ad::util::CsvWriter;
 using ad::cppgtfs::Parser;
-using pfaedle::gtfs::Writer;
+using ad::util::CsvWriter;
 using pfaedle::getTmpFName;
+using pfaedle::gtfs::Writer;
 
 // ____________________________________________________________________________
-bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
+void Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
   std::ofstream fs;
   std::ifstream is;
   std::string gtfsPath(path);
@@ -59,8 +59,7 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeCalendar(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
 
   is.open((sourceFeed->getPath() + "/calendar_dates.txt").c_str());
@@ -72,8 +71,7 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeCalendarDates(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
 
   is.open((sourceFeed->getPath() + "/transfers.txt").c_str());
@@ -85,8 +83,7 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeTransfers(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
 
   is.open((sourceFeed->getPath() + "/fare_attributes.txt").c_str());
@@ -98,8 +95,7 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeFares(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
 
   is.open((sourceFeed->getPath() + "/fare_rules.txt").c_str());
@@ -111,8 +107,7 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeFareRules(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
 
   is.close();
@@ -142,14 +137,14 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeFrequencies(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
 
   is.close();
   curFile = getTmpFName(gtfsPath, "stop_times.txt");
   curFileTg = gtfsPath + "/stop_times.txt";
   fs.open(curFile.c_str());
+
   if (!fs.good()) cannotWrite(curFile, curFileTg);
   writeStopTimes(sourceFeed, &fs);
   fs.close();
@@ -163,15 +158,12 @@ bool Writer::write(gtfs::Feed* sourceFeed, const std::string& path) const {
     if (!fs.good()) cannotWrite(curFile, curFileTg);
     writeFeedInfo(sourceFeed, &fs);
     fs.close();
-    if (std::rename(curFile.c_str(), curFileTg.c_str()))
-      cannotWrite(curFileTg);
+    if (std::rename(curFile.c_str(), curFileTg.c_str())) cannotWrite(curFileTg);
   }
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeFeedInfo(gtfs::Feed* f, std::ostream* os) const {
+void Writer::writeFeedInfo(gtfs::Feed* f, std::ostream* os) const {
   auto csvw = ad::cppgtfs::Writer::getFeedInfoCsvw(os);
   csvw.flushLine();
   csvw.writeString(f->getPublisherName());
@@ -187,12 +179,10 @@ bool Writer::writeFeedInfo(gtfs::Feed* f, std::ostream* os) const {
     csvw.skip();
   csvw.writeString(f->getVersion());
   csvw.flushLine();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeAgency(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeAgency(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/agency.txt").c_str());
 
@@ -210,12 +200,10 @@ bool Writer::writeAgency(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeAgency(fa, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeStops(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeStops(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/stops.txt").c_str());
 
@@ -233,35 +221,22 @@ bool Writer::writeStops(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeStop(s, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeRoutes(gtfs::Feed* sourceFeed, std::ostream* os) const {
-  std::ifstream fs;
-  fs.open((sourceFeed->getPath() + "/routes.txt").c_str());
-
-  CsvParser csvp(&fs);
-  Parser p;
+void Writer::writeRoutes(gtfs::Feed* sourceFeed, std::ostream* os) const {
   ad::cppgtfs::Writer w;
 
   CsvWriter csvw = ad::cppgtfs::Writer::getRoutesCsvw(os);
   csvw.flushLine();
 
-  ad::cppgtfs::gtfs::flat::Route s;
-  auto flds = Parser::getRouteFlds(&csvp);
-
-  while (p.nextRoute(&csvp, &s, flds)) {
-    w.writeRoute(s, &csvw);
+  for (auto r : sourceFeed->getRoutes()) {
+    w.writeRoute(r.second->getFlat(), &csvw);
   }
-  fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeCalendar(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeCalendar(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/calendar.txt").c_str());
 
@@ -279,12 +254,10 @@ bool Writer::writeCalendar(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeCalendar(c, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeCalendarDates(gtfs::Feed* sourceFeed,
+void Writer::writeCalendarDates(gtfs::Feed* sourceFeed,
                                 std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/calendar_dates.txt").c_str());
@@ -303,12 +276,10 @@ bool Writer::writeCalendarDates(gtfs::Feed* sourceFeed,
     w.writeCalendarDate(c, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeFrequencies(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeFrequencies(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/frequencies.txt").c_str());
 
@@ -326,12 +297,10 @@ bool Writer::writeFrequencies(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeFrequency(f, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeTransfers(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeTransfers(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/transfers.txt").c_str());
 
@@ -349,12 +318,10 @@ bool Writer::writeTransfers(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeTransfer(t, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeFares(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeFares(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/fare_attributes.txt").c_str());
 
@@ -372,12 +339,10 @@ bool Writer::writeFares(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeFare(f, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeFareRules(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeFareRules(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/fare_rules.txt").c_str());
 
@@ -395,12 +360,10 @@ bool Writer::writeFareRules(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeFareRule(f, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
-bool Writer::writeShapes(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeShapes(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/shapes.txt").c_str());
 
@@ -439,8 +402,6 @@ bool Writer::writeShapes(gtfs::Feed* sourceFeed, std::ostream* os) const {
   }
 
   fs.close();
-
-  return true;
 }
 
 // ____________________________________________________________________________
@@ -460,7 +421,7 @@ bool Writer::writeTrips(gtfs::Feed* sourceFeed, std::ostream* os) const {
 }
 
 // ____________________________________________________________________________
-bool Writer::writeStopTimes(gtfs::Feed* sourceFeed, std::ostream* os) const {
+void Writer::writeStopTimes(gtfs::Feed* sourceFeed, std::ostream* os) const {
   std::ifstream fs;
   fs.open((sourceFeed->getPath() + "/stop_times.txt").c_str());
 
@@ -491,8 +452,6 @@ bool Writer::writeStopTimes(gtfs::Feed* sourceFeed, std::ostream* os) const {
     w.writeStopTime(st, &csvw);
   }
   fs.close();
-
-  return true;
 }
 
 // ___________________________________________________________________________
@@ -508,4 +467,3 @@ void Writer::cannotWrite(const std::string& file, const std::string& file2) {
   ss << "(temporary file for " << file2 << ") Could not write to file";
   throw ad::cppgtfs::WriterException(ss.str(), file);
 }
-
diff --git a/src/pfaedle/gtfs/Writer.h b/src/pfaedle/gtfs/Writer.h
index 917195d..9b894c9 100644
--- a/src/pfaedle/gtfs/Writer.h
+++ b/src/pfaedle/gtfs/Writer.h
@@ -16,22 +16,22 @@ class Writer {
  public:
   Writer() {}
 
-  bool write(Feed* sourceFeed, const std::string& path) const;
+  void write(Feed* sourceFeed, const std::string& path) const;
 
  private:
-  bool writeFeedInfo(Feed* f, std::ostream* os) const;
-  bool writeAgency(Feed* f, std::ostream* os) const;
-  bool writeStops(Feed* f, std::ostream* os) const;
-  bool writeRoutes(Feed* f, std::ostream* os) const;
-  bool writeCalendar(Feed* f, std::ostream* os) const;
-  bool writeCalendarDates(Feed* f, std::ostream* os) const;
-  bool writeFrequencies(Feed* f, std::ostream* os) const;
-  bool writeTransfers(Feed* f, std::ostream* os) const;
-  bool writeFares(Feed* f, std::ostream* os) const;
-  bool writeFareRules(Feed* f, std::ostream* os) const;
-  bool writeShapes(Feed* f, std::ostream* os) const;
+  void writeFeedInfo(Feed* f, std::ostream* os) const;
+  void writeAgency(Feed* f, std::ostream* os) const;
+  void writeStops(Feed* f, std::ostream* os) const;
+  void writeRoutes(Feed* f, std::ostream* os) const;
+  void writeCalendar(Feed* f, std::ostream* os) const;
+  void writeCalendarDates(Feed* f, std::ostream* os) const;
+  void writeFrequencies(Feed* f, std::ostream* os) const;
+  void writeTransfers(Feed* f, std::ostream* os) const;
+  void writeFares(Feed* f, std::ostream* os) const;
+  void writeFareRules(Feed* f, std::ostream* os) const;
+  void writeShapes(Feed* f, std::ostream* os) const;
   bool writeTrips(Feed* f, std::ostream* os) const;
-  bool writeStopTimes(Feed* f, std::ostream* os) const;
+  void writeStopTimes(Feed* f, std::ostream* os) const;
 
   static void cannotWrite(const std::string& file, const std::string& file2);
   static void cannotWrite(const std::string& file);
diff --git a/src/pfaedle/netgraph/EdgePL.h b/src/pfaedle/netgraph/EdgePL.h
index 58b767f..c6803ea 100644
--- a/src/pfaedle/netgraph/EdgePL.h
+++ b/src/pfaedle/netgraph/EdgePL.h
@@ -26,7 +26,7 @@ namespace netgraph {
 class EdgePL {
  public:
   EdgePL() {}
-  EdgePL(const LINE& l, const std::set<const Trip*>& trips)
+  EdgePL(const LINE& l, const std::vector<const Trip*>& trips)
       : _l(l), _trips(trips) {
     for (const auto t : _trips) {
       _routeShortNames.insert(t->getRoute()->getShortName());
@@ -46,7 +46,7 @@ class EdgePL {
 
  private:
   LINE _l;
-  std::set<const Trip*> _trips;
+  std::vector<const Trip*> _trips;
   std::set<std::string> _routeShortNames;
   std::set<std::string> _tripShortNames;
 };
diff --git a/src/pfaedle/osm/BBoxIdx.cpp b/src/pfaedle/osm/BBoxIdx.cpp
index c25d378..c841d47 100644
--- a/src/pfaedle/osm/BBoxIdx.cpp
+++ b/src/pfaedle/osm/BBoxIdx.cpp
@@ -31,10 +31,10 @@ bool BBoxIdx::contains(const Point<double>& p) const {
 // _____________________________________________________________________________
 BOX BBoxIdx::getFullWebMercBox() const {
   return BOX(
-      util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(
-          _root.box.getLowerLeft().getY(), _root.box.getLowerLeft().getX()),
-      util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(
-          _root.box.getUpperRight().getY(), _root.box.getUpperRight().getX()));
+      util::geo::latLngToWebMerc<PFDL_PREC>(_root.box.getLowerLeft().getY(),
+                                            _root.box.getLowerLeft().getX()),
+      util::geo::latLngToWebMerc<PFDL_PREC>(_root.box.getUpperRight().getY(),
+                                            _root.box.getUpperRight().getX()));
 }
 
 // _____________________________________________________________________________
diff --git a/src/pfaedle/osm/OsmBuilder.cpp b/src/pfaedle/osm/OsmBuilder.cpp
index 3da48df..6b9e488 100644
--- a/src/pfaedle/osm/OsmBuilder.cpp
+++ b/src/pfaedle/osm/OsmBuilder.cpp
@@ -18,7 +18,6 @@
 #include "pfaedle/osm/OsmBuilder.h"
 #include "pfaedle/osm/OsmFilter.h"
 #include "pfaedle/osm/Restrictor.h"
-#include "pfaedle/trgraph/StatGroup.h"
 #include "util/Misc.h"
 #include "util/Nullable.h"
 #include "util/log/Log.h"
@@ -40,20 +39,14 @@ using pfaedle::trgraph::Graph;
 using pfaedle::trgraph::Node;
 using pfaedle::trgraph::NodePL;
 using pfaedle::trgraph::Normalizer;
-using pfaedle::trgraph::StatGroup;
 using pfaedle::trgraph::StatInfo;
 using pfaedle::trgraph::TransitEdgeLine;
 using util::Nullable;
 using util::geo::Box;
-using util::geo::webMercMeterDist;
+using util::geo::M_PER_DEG;
 
 // _____________________________________________________________________________
 bool EqSearch::operator()(const Node* cand, const StatInfo* si) const {
-  if (orphanSnap && cand->pl().getSI() &&
-      (!cand->pl().getSI()->getGroup() ||
-       cand->pl().getSI()->getGroup()->getStops().size() == 0)) {
-    return true;
-  }
   return cand->pl().getSI() && cand->pl().getSI()->simi(si) > minSimi;
 }
 
@@ -62,8 +55,8 @@ OsmBuilder::OsmBuilder() {}
 
 // _____________________________________________________________________________
 void OsmBuilder::read(const std::string& path, const OsmReadOpts& opts,
-                      Graph* g, const BBoxIdx& bbox, size_t gridSize,
-                      router::FeedStops* fs, Restrictor* res) {
+                      Graph* g, const BBoxIdx& bbox, double gridSize,
+                      Restrictor* res) {
   if (!bbox.size()) return;
 
   LOG(INFO) << "Reading OSM file " << path << " ... ";
@@ -101,85 +94,93 @@ void OsmBuilder::read(const std::string& path, const OsmReadOpts& opts,
     //    * match the filter criteria
     //    * have been used in a way in pass 3
 
-    LOG(VDEBUG) << "Reading bounding box nodes...";
+    LOG(DEBUG) << "Reading bounding box nodes...";
     skipUntil(&xml, "node");
     pfxml::parser_state nodeBeg = xml.state();
     pfxml::parser_state edgesBeg =
         readBBoxNds(&xml, &bboxNodes, &noHupNodes, filter, bbox);
 
-    LOG(VDEBUG) << "Reading relations...";
+    LOG(DEBUG) << "Reading relations...";
     skipUntil(&xml, "relation");
     readRels(&xml, &intmRels, &nodeRels, &wayRels, filter, attrKeys[2],
              &rawRests);
 
-    LOG(VDEBUG) << "Reading edges...";
+    LOG(DEBUG) << "Reading edges...";
     xml.set_state(edgesBeg);
     readEdges(&xml, g, intmRels, wayRels, filter, bboxNodes, &nodes, &multNodes,
               noHupNodes, attrKeys[1], rawRests, res, intmRels.flat, &eTracks,
               opts);
 
-    LOG(VDEBUG) << "Reading kept nodes...";
+    LOG(DEBUG) << "Reading kept nodes...";
     xml.set_state(nodeBeg);
     readNodes(&xml, g, intmRels, nodeRels, filter, bboxNodes, &nodes,
               &multNodes, &orphanStations, attrKeys[0], intmRels.flat, opts);
   }
 
-  LOG(VDEBUG) << "OSM ID set lookups: " << osm::OsmIdSet::LOOKUPS
-              << ", file lookups: " << osm::OsmIdSet::FLOOKUPS;
+  LOG(DEBUG) << "OSM ID set lookups: " << osm::OsmIdSet::LOOKUPS
+             << ", file lookups: " << osm::OsmIdSet::FLOOKUPS;
 
-  LOG(VDEBUG) << "Applying edge track numbers...";
+  LOG(DEBUG) << "Applying edge track numbers...";
   writeEdgeTracks(eTracks);
   eTracks.clear();
 
   {
-    LOG(VDEBUG) << "Fixing gaps...";
-    NodeGrid ng = buildNodeIdx(g, gridSize, bbox.getFullWebMercBox(), false);
+    LOG(DEBUG) << "Fixing gaps...";
+    NodeGrid ng = buildNodeIdx(g, gridSize, bbox.getFullBox(), false);
+    LOG(DEBUG) << "Grid size of " << ng.getXWidth() << "x" << ng.getYHeight();
     fixGaps(g, &ng);
   }
 
-  LOG(VDEBUG) << "Writing edge geoms...";
-  writeGeoms(g);
+  LOG(DEBUG) << "Snapping stations...";
+  snapStats(opts, g, bbox, gridSize, res, orphanStations);
 
-  LOG(VDEBUG) << "Snapping stations...";
-  snapStats(opts, g, bbox, gridSize, fs, res, orphanStations);
-
-  LOG(VDEBUG) << "Deleting orphan nodes...";
-  deleteOrphNds(g);
-
-  LOG(VDEBUG) << "Deleting orphan edges...";
+  LOG(DEBUG) << "Deleting orphan edges...";
   deleteOrphEdgs(g, opts);
 
-  LOG(VDEBUG) << "Collapsing edges...";
+  LOG(DEBUG) << "Collapsing edges...";
   collapseEdges(g);
 
-  LOG(VDEBUG) << "Deleting orphan nodes...";
-  deleteOrphNds(g);
+  LOG(DEBUG) << "Writing edge geoms...";
+  writeGeoms(g, opts);
 
-  LOG(VDEBUG) << "Deleting orphan edges...";
+  LOG(DEBUG) << "Deleting orphan edges...";
   deleteOrphEdgs(g, opts);
 
-  LOG(VDEBUG) << "Writing graph components...";
+  LOG(DEBUG) << "Deleting orphan nodes...";
+  deleteOrphNds(g, opts);
+
+  LOG(DEBUG) << "Writing graph components...";
   // the restrictor is needed here to prevent connections in the graph
   // which are not possible in reality
-  uint32_t comps = writeComps(g);
+  uint32_t comps = writeComps(g, opts);
 
-  LOG(VDEBUG) << "Simplifying geometries...";
+  LOG(DEBUG) << "Simplifying geometries...";
   simplifyGeoms(g);
 
-  LOG(VDEBUG) << "Writing other-direction edges...";
+  LOG(DEBUG) << "Writing other-direction edges...";
   writeODirEdgs(g, res);
 
-  LOG(VDEBUG) << "Write dummy node self-edges...";
+  LOG(DEBUG) << "Write wrong-direction costs...";
+  writeOneWayPens(g, opts);
+
+  if (opts.noLinesPunishFact != 1.0) {
+    LOG(DEBUG) << "Write no-line pens...";
+    writeNoLinePens(g, opts);
+  }
+
+  LOG(DEBUG) << "Write dummy node self-edges...";
   writeSelfEdgs(g);
 
   size_t numEdges = 0;
 
-  for (auto* n : *g->getNds()) {
+  for (auto* n : g->getNds()) {
     numEdges += n->getAdjListOut().size();
   }
 
-  LOG(DEBUG) << "Graph has " << g->getNds()->size() << " nodes, " << numEdges
-             << " edges and " << comps << " connected component(s)";
+  LOG(DEBUG) << "Graph has " << g->getNds().size() << " nodes, " << numEdges
+             << " edges and " << comps
+             << " connected component(s) with more than 1 node";
+  LOG(DEBUG) << _lines.size() << " transit lines have been read.";
 }
 
 // _____________________________________________________________________________
@@ -423,10 +424,9 @@ void OsmBuilder::readWriteWays(pfxml::file* i, util::xml::XmlWriter* o,
 
 // _____________________________________________________________________________
 NodePL OsmBuilder::plFromGtfs(const Stop* s, const OsmReadOpts& ops) {
-  NodePL ret(
-      util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(s->getLat(), s->getLng()),
-      StatInfo(ops.statNormzer.norm(s->getName()),
-               ops.trackNormzer.norm(s->getPlatformCode()), false));
+  NodePL ret({s->getLat(), s->getLng()},
+             StatInfo(ops.statNormzer.norm(s->getName()),
+                      ops.trackNormzer.norm(s->getPlatformCode())));
 
 #ifdef PFAEDLE_STATION_IDS
   // debug feature, store station id from GTFS
@@ -454,8 +454,7 @@ pfxml::parser_state OsmBuilder::readBBoxNds(pfxml::file* xml, OsmIdSet* nodes,
 
     if (inNodeBlock && xml->level() == 3 && curId &&
         strcmp(cur.name, "tag") == 0) {
-      if (filter.nohup(cur.attrs.find("k")->second,
-                       cur.attrs.find("v")->second)) {
+      if (filter.nohup(cur.attr("k"), cur.attr("v"))) {
         nohupNodes->add(curId);
       }
     }
@@ -466,12 +465,15 @@ pfxml::parser_state OsmBuilder::readBBoxNds(pfxml::file* xml, OsmIdSet* nodes,
     if (inNodeBlock) {
       // block ended
       if (strcmp(cur.name, "node")) return xml->state();
-      double y = util::atof(cur.attrs.find("lat")->second, 7);
-      double x = util::atof(cur.attrs.find("lon")->second, 7);
+      double y = util::atof(cur.attr("lat"), 7);
+      double x = util::atof(cur.attr("lon"), 7);
+
+      curId = util::atoul(cur.attr("id"));
 
       if (bbox.contains(Point<double>(x, y))) {
-        curId = util::atoul(cur.attrs.find("id")->second);
         nodes->add(curId);
+      } else {
+        nodes->nadd(curId);
       }
     }
   } while (xml->next());
@@ -489,16 +491,16 @@ OsmWay OsmBuilder::nextWayWithId(pfxml::file* xml, osmid wid,
     if (xml->level() == 2 || xml->level() == 0) {
       if (w.id || strcmp(cur.name, "way")) return w;
 
-      osmid id = util::atoul(cur.attrs.find("id")->second);
+      osmid id = util::atoul(cur.attr("id"));
       if (id == wid) w.id = id;
     }
 
     if (w.id && xml->level() == 3) {
       if (strcmp(cur.name, "nd") == 0) {
-        w.nodes.push_back(util::atoul(cur.attrs.find("ref")->second));
+        w.nodes.push_back(util::atoul(cur.attr("ref")));
       } else if (strcmp(cur.name, "tag") == 0) {
-        if (keepAttrs.count(cur.attrs.find("k")->second))
-          w.attrs[cur.attrs.find("k")->second] = cur.attrs.find("v")->second;
+        if (keepAttrs.count(cur.attr("k")))
+          w.attrs[cur.attr("k")] = cur.attr("v");
       }
     }
   } while (xml->next());
@@ -542,18 +544,18 @@ OsmWay OsmBuilder::nextWay(pfxml::file* xml, const RelMap& wayRels,
       if (keepWay(w, wayRels, filter, bBoxNodes, fl)) return w;
       if (strcmp(cur.name, "way")) return OsmWay();
 
-      w.id = util::atoul(cur.attrs.find("id")->second);
+      w.id = util::atoul(cur.attr("id"));
       w.nodes.clear();
       w.attrs.clear();
     }
 
     if (w.id && xml->level() == 3) {
       if (strcmp(cur.name, "nd") == 0) {
-        osmid nid = util::atoul(cur.attrs.find("ref")->second);
+        osmid nid = util::atoul(cur.attr("ref"));
         w.nodes.push_back(nid);
       } else if (strcmp(cur.name, "tag") == 0) {
-        if (keepAttrs.count(cur.attrs.find("k")->second))
-          w.attrs[cur.attrs.find("k")->second] = cur.attrs.find("v")->second;
+        if (keepAttrs.count(cur.attr("k")))
+          w.attrs[cur.attr("k")] = cur.attr("v");
       }
     }
   } while (xml->next());
@@ -626,6 +628,7 @@ void OsmBuilder::readEdges(pfxml::file* xml, Graph* g, const RelLst& rels,
       } else {
         n = (*nodes)[nid];
       }
+
       if (last) {
         auto e = g->addEdg(last, n, EdgePL());
         if (!e) continue;
@@ -692,14 +695,14 @@ OsmNode OsmBuilder::nextNode(pfxml::file* xml, NIdMap* nodes,
       if (strcmp(cur.name, "node")) return OsmNode();
 
       n.attrs.clear();
-      n.lat = util::atof(cur.attrs.find("lat")->second, 7);
-      n.lng = util::atof(cur.attrs.find("lon")->second, 7);
-      n.id = util::atoul(cur.attrs.find("id")->second);
+      n.lat = util::atof(cur.attr("lat"), 7);
+      n.lng = util::atof(cur.attr("lon"), 7);
+      n.id = util::atoul(cur.attr("id"));
     }
 
     if (xml->level() == 3 && n.id && strcmp(cur.name, "tag") == 0) {
-      if (keepAttrs.count(cur.attrs.find("k")->second))
-        n.attrs[cur.attrs.find("k")->second] = cur.attrs.find("v")->second;
+      if (keepAttrs.count(cur.attr("k")))
+        n.attrs[cur.attr("k")] = cur.attr("v");
     }
   } while (xml->next());
 
@@ -755,44 +758,42 @@ void OsmBuilder::readNodes(pfxml::file* xml, Graph* g, const RelLst& rels,
                            NIdMultMap* multNodes, NodeSet* orphanStations,
                            const AttrKeySet& keepAttrs, const FlatRels& fl,
                            const OsmReadOpts& opts) const {
-  StAttrGroups attrGroups;
-
   OsmNode nd;
   while ((nd = nextNode(xml, nodes, multNodes, nodeRels, filter, bBoxNodes,
                         keepAttrs, fl))
              .id) {
     Node* n = 0;
-    auto pos = util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(nd.lat, nd.lng);
+    POINT pos = {nd.lng, nd.lat};
     if (nodes->count(nd.id)) {
       n = (*nodes)[nd.id];
       n->pl().setGeom(pos);
       if (filter.station(nd.attrs)) {
-        auto si = getStatInfo(n, nd.id, pos, nd.attrs, &attrGroups, nodeRels,
-                              rels, opts);
+        auto si = getStatInfo(nd.id, nd.attrs, nodeRels, rels, opts);
         if (!si.isNull()) n->pl().setSI(si);
       } else if (filter.blocker(nd.attrs)) {
         n->pl().setBlocker();
+      } else if (filter.turnCycle(nd.attrs)) {
+        n->pl().setTurnCycle();
       }
     } else if ((*multNodes).count(nd.id)) {
       for (auto* n : (*multNodes)[nd.id]) {
         n->pl().setGeom(pos);
         if (filter.station(nd.attrs)) {
-          auto si = getStatInfo(n, nd.id, pos, nd.attrs, &attrGroups, nodeRels,
-                                rels, opts);
+          auto si = getStatInfo(nd.id, nd.attrs, nodeRels, rels, opts);
           if (!si.isNull()) n->pl().setSI(si);
         } else if (filter.blocker(nd.attrs)) {
           n->pl().setBlocker();
+        } else if (filter.turnCycle(nd.attrs)) {
+          n->pl().setTurnCycle();
         }
       }
     } else {
       // these are nodes without any connected edges
       if (filter.station(nd.attrs)) {
         auto tmp = g->addNd(NodePL(pos));
-        auto si = getStatInfo(tmp, nd.id, pos, nd.attrs, &attrGroups, nodeRels,
-                              rels, opts);
+        auto si = getStatInfo(nd.id, nd.attrs, nodeRels, rels, opts);
         if (!si.isNull()) tmp->pl().setSI(si);
         if (tmp->pl().getSI()) {
-          tmp->pl().getSI()->setIsFromOsm(false);
           orphanStations->insert(tmp);
         }
       }
@@ -828,34 +829,34 @@ OsmRel OsmBuilder::nextRel(pfxml::file* xml, const OsmFilter& filter,
       rel.wayRoles.clear();
       rel.keepFlags = 0;
       rel.dropFlags = 0;
-      rel.id = util::atoul(cur.attrs.find("id")->second);
+      rel.id = util::atoul(cur.attr("id"));
     }
 
     if (xml->level() == 3 && rel.id) {
       if (strcmp(cur.name, "member") == 0) {
-        if (strcmp(cur.attrs.find("type")->second, "node") == 0) {
-          osmid id = util::atoul(cur.attrs.find("ref")->second);
+        if (strcmp(cur.attr("type"), "node") == 0) {
+          osmid id = util::atoul(cur.attr("ref"));
           // TODO(patrick): no need to push IDs that have been filtered out by
           // the bounding box!!!!
           rel.nodes.push_back(id);
-          if (cur.attrs.count("role")) {
-            rel.nodeRoles.push_back(cur.attrs.find("role")->second);
+          if (cur.attr("role")) {
+            rel.nodeRoles.push_back(cur.attr("role"));
           } else {
             rel.nodeRoles.push_back("");
           }
         }
-        if (strcmp(cur.attrs.find("type")->second, "way") == 0) {
-          osmid id = util::atoul(cur.attrs.find("ref")->second);
+        if (strcmp(cur.attr("type"), "way") == 0) {
+          osmid id = util::atoul(cur.attr("ref"));
           rel.ways.push_back(id);
-          if (cur.attrs.count("role")) {
-            rel.wayRoles.push_back(cur.attrs.find("role")->second);
+          if (cur.attr("role")) {
+            rel.wayRoles.push_back(cur.attr("role"));
           } else {
             rel.wayRoles.push_back("");
           }
         }
       } else if (strcmp(cur.name, "tag") == 0) {
-        if (keepAttrs.count(cur.attrs.find("k")->second))
-          rel.attrs[cur.attrs.find("k")->second] = cur.attrs.find("v")->second;
+        if (keepAttrs.count(cur.attr("k")))
+          rel.attrs[cur.attr("k")] = cur.attr("v");
       }
     }
   } while (xml->next());
@@ -936,14 +937,13 @@ void OsmBuilder::readRestr(const OsmRel& rel, Restrictions* rests,
 
 // _____________________________________________________________________________
 std::string OsmBuilder::getAttrByFirstMatch(const DeepAttrLst& rule, osmid id,
-                                            const AttrMap& attrs,
+                                            const AttrMap& am,
                                             const RelMap& entRels,
                                             const RelLst& rels,
                                             const Normalizer& normzer) const {
   std::string ret;
   for (const auto& s : rule) {
-    ret =
-        normzer.norm(pfxml::file::decode(getAttr(s, id, attrs, entRels, rels)));
+    ret = normzer.norm(pfxml::file::decode(getAttr(s, id, am, entRels, rels)));
     if (!ret.empty()) return ret;
   }
 
@@ -952,13 +952,12 @@ std::string OsmBuilder::getAttrByFirstMatch(const DeepAttrLst& rule, osmid id,
 
 // _____________________________________________________________________________
 std::vector<std::string> OsmBuilder::getAttrMatchRanked(
-    const DeepAttrLst& rule, osmid id, const AttrMap& attrs,
-    const RelMap& entRels, const RelLst& rels,
-    const Normalizer& normzer) const {
+    const DeepAttrLst& rule, osmid id, const AttrMap& am, const RelMap& entRels,
+    const RelLst& rels, const Normalizer& norm) const {
   std::vector<std::string> ret;
   for (const auto& s : rule) {
     std::string tmp =
-        normzer.norm(pfxml::file::decode(getAttr(s, id, attrs, entRels, rels)));
+        norm.norm(pfxml::file::decode(getAttr(s, id, am, entRels, rels)));
     if (!tmp.empty()) ret.push_back(tmp);
   }
 
@@ -967,11 +966,11 @@ std::vector<std::string> OsmBuilder::getAttrMatchRanked(
 
 // _____________________________________________________________________________
 std::string OsmBuilder::getAttr(const DeepAttrRule& s, osmid id,
-                                const AttrMap& attrs, const RelMap& entRels,
+                                const AttrMap& am, const RelMap& entRels,
                                 const RelLst& rels) const {
   if (s.relRule.kv.first.empty()) {
-    if (attrs.find(s.attr) != attrs.end()) {
-      return attrs.find(s.attr)->second;
+    if (am.find(s.attr) != am.end()) {
+      return am.find(s.attr)->second;
     }
   } else {
     if (entRels.count(id)) {
@@ -988,9 +987,7 @@ std::string OsmBuilder::getAttr(const DeepAttrRule& s, osmid id,
 }
 
 // _____________________________________________________________________________
-Nullable<StatInfo> OsmBuilder::getStatInfo(Node* node, osmid nid,
-                                           const POINT& pos, const AttrMap& m,
-                                           StAttrGroups* groups,
+Nullable<StatInfo> OsmBuilder::getStatInfo(osmid nid, const AttrMap& m,
                                            const RelMap& nodeRels,
                                            const RelLst& rels,
                                            const OsmReadOpts& ops) const {
@@ -1004,7 +1001,7 @@ Nullable<StatInfo> OsmBuilder::getStatInfo(Node* node, osmid nid,
 
   if (!names.size()) return Nullable<StatInfo>();
 
-  auto ret = StatInfo(names[0], platform, true);
+  auto ret = StatInfo(names[0], platform);
 
 #ifdef PFAEDLE_STATION_IDS
   ret.setId(getAttrByFirstMatch(ops.statAttrRules.idRule, nid, m, nodeRels,
@@ -1013,62 +1010,25 @@ Nullable<StatInfo> OsmBuilder::getStatInfo(Node* node, osmid nid,
 
   for (size_t i = 1; i < names.size(); i++) ret.addAltName(names[i]);
 
-  bool groupFound = false;
-
-  for (const auto& rule : ops.statGroupNAttrRules) {
-    if (groupFound) break;
-    std::string ruleVal = getAttr(rule.attr, nid, m, nodeRels, rels);
-    if (!ruleVal.empty()) {
-      // check if a matching group exists
-      for (auto* group : (*groups)[rule.attr.attr][ruleVal]) {
-        if (groupFound) break;
-        for (const auto* member : group->getNodes()) {
-          if (webMercMeterDist(*member->pl().getGeom(), pos) <= rule.maxDist) {
-            // ok, group is matching
-            groupFound = true;
-            if (node) group->addNode(node);
-            ret.setGroup(group);
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  if (!groupFound) {
-    for (const auto& rule : ops.statGroupNAttrRules) {
-      std::string ruleVal = getAttr(rule.attr, nid, m, nodeRels, rels);
-      if (!ruleVal.empty()) {
-        // add new group
-        StatGroup* g = new StatGroup();
-        if (node) g->addNode(node);
-        ret.setGroup(g);
-        (*groups)[rule.attr.attr][ruleVal].push_back(g);
-        break;
-      }
-    }
-  }
-
   return ret;
 }
 
 // _____________________________________________________________________________
 double OsmBuilder::dist(const Node* a, const Node* b) {
-  return webMercMeterDist(*a->pl().getGeom(), *b->pl().getGeom());
+  return util::geo::haversine(*(a->pl().getGeom()), *(b->pl().getGeom()));
 }
 
 // _____________________________________________________________________________
-double OsmBuilder::webMercDist(const Node* a, const Node* b) {
-  return webMercMeterDist(*a->pl().getGeom(), *b->pl().getGeom());
-}
-
-// _____________________________________________________________________________
-void OsmBuilder::writeGeoms(Graph* g) {
-  for (auto* n : *g->getNds()) {
+void OsmBuilder::writeGeoms(Graph* g, const OsmReadOpts& opts) {
+  for (auto* n : g->getNds()) {
     for (auto* e : n->getAdjListOut()) {
-      e->pl().addPoint(*e->getFrom()->pl().getGeom());
-      e->pl().setLength(dist(e->getFrom(), e->getTo()));
-      e->pl().addPoint(*e->getTo()->pl().getGeom());
+      if (!e->pl().getGeom()) {
+        e->pl().addPoint(*e->getFrom()->pl().getGeom());
+        e->pl().addPoint(*e->getTo()->pl().getGeom());
+      }
+
+      e->pl().setCost(costToInt(dist(e->getFrom(), e->getTo()) /
+                                opts.levelDefSpeed[e->pl().lvl()]));
     }
   }
 }
@@ -1076,18 +1036,18 @@ void OsmBuilder::writeGeoms(Graph* g) {
 // _____________________________________________________________________________
 void OsmBuilder::fixGaps(Graph* g, NodeGrid* ng) {
   double METER = 1;
-  for (auto* n : *g->getNds()) {
+  for (auto* n : g->getNds()) {
     if (n->getInDeg() + n->getOutDeg() == 1) {
       // get all nodes in distance
       std::set<Node*> ret;
-      double distor = util::geo::webMercDistFactor(*n->pl().getGeom());
+      double distor = util::geo::latLngDistFactor(*n->pl().getGeom());
       ng->get(util::geo::pad(util::geo::getBoundingBox(*n->pl().getGeom()),
-                             METER / distor),
+                             (METER / M_PER_DEG) / distor),
               &ret);
       for (auto* nb : ret) {
         if (nb != n && (nb->getInDeg() + nb->getOutDeg()) == 1 &&
-            webMercDist(nb, n) <= METER / distor) {
-          // special case: both node are non-stations, move
+            dist(nb, n) <= METER) {
+          // special case: both nodes are non-stations, move
           // the end point nb to n and delete nb
           if (!nb->pl().getSI() && !n->pl().getSI()) {
             Node* otherN;
@@ -1095,9 +1055,6 @@ void OsmBuilder::fixGaps(Graph* g, NodeGrid* ng) {
               otherN = (*nb->getAdjListOut().begin())->getOtherNd(nb);
             else
               otherN = (*nb->getAdjListIn().begin())->getOtherNd(nb);
-            LINE l;
-            l.push_back(*otherN->pl().getGeom());
-            l.push_back(*n->pl().getGeom());
 
             Edge* e;
             if (nb->getOutDeg())
@@ -1105,7 +1062,6 @@ void OsmBuilder::fixGaps(Graph* g, NodeGrid* ng) {
             else
               e = g->addEdg(otherN, n, (*nb->getAdjListIn().begin())->pl());
             if (e) {
-              *e->pl().getGeom() = l;
               g->delNd(nb);
               ng->remove(nb);
             }
@@ -1123,25 +1079,27 @@ void OsmBuilder::fixGaps(Graph* g, NodeGrid* ng) {
 }
 
 // _____________________________________________________________________________
-EdgeGrid OsmBuilder::buildEdgeIdx(Graph* g, size_t size,
-                                  const BOX& webMercBox) {
-  EdgeGrid ret(size, size, webMercBox, false);
-  for (auto* n : *g->getNds()) {
+EdgeGrid OsmBuilder::buildEdgeIdx(Graph* g, double size, const BOX& box) {
+  EdgeGrid ret(size, size, box, false);
+  for (auto* n : g->getNds()) {
     for (auto* e : n->getAdjListOut()) {
-      assert(e->pl().getGeom());
-      ret.add(*e->pl().getGeom(), e);
+      auto llGeom =
+          LINE{*e->getFrom()->pl().getGeom(), *e->getTo()->pl().getGeom()};
+      ret.add(llGeom, e);
     }
   }
   return ret;
 }
 
 // _____________________________________________________________________________
-NodeGrid OsmBuilder::buildNodeIdx(Graph* g, size_t size, const BOX& webMercBox,
+NodeGrid OsmBuilder::buildNodeIdx(Graph* g, double size, const BOX& box,
                                   bool which) {
-  NodeGrid ret(size, size, webMercBox, false);
-  for (auto* n : *g->getNds()) {
+  NodeGrid ret(size, size, box, false);
+  for (auto* n : g->getNds()) {
+    // only orphan nodes
     if (!which && n->getInDeg() + n->getOutDeg() == 1)
       ret.add(*n->pl().getGeom(), n);
+    // only station nodes
     else if (which && n->pl().getSI())
       ret.add(*n->pl().getGeom(), n);
   }
@@ -1153,8 +1111,8 @@ Node* OsmBuilder::depthSearch(const Edge* e, const StatInfo* si, const POINT& p,
                               double maxD, int maxFullTurns, double minAngle,
                               const SearchFunc& sfunc) {
   // shortcuts
-  double dFrom = webMercMeterDist(*e->getFrom()->pl().getGeom(), p);
-  double dTo = webMercMeterDist(*e->getTo()->pl().getGeom(), p);
+  double dFrom = haversine(*e->getFrom()->pl().getGeom(), p);
+  double dTo = haversine(*e->getTo()->pl().getGeom(), p);
   if (dFrom > maxD && dTo > maxD) return 0;
 
   if (dFrom <= maxD && sfunc(e->getFrom(), si)) return e->getFrom();
@@ -1197,13 +1155,15 @@ Node* OsmBuilder::depthSearch(const Edge* e, const StatInfo* si, const POINT& p,
         if (util::geo::innerProd(nodeP, fromP, toP) < minAngle) fullTurn = 1;
       }
 
+      double eLen = dist(edg->getFrom(), edg->getTo());
+
       if ((maxFullTurns < 0 || cur.fullTurns + fullTurn <= maxFullTurns) &&
-          cur.dist + edg->pl().getLength() < maxD && !closed.count(cand)) {
+          cur.dist + eLen < maxD && !closed.count(cand)) {
         if (sfunc(cand, si)) {
           return cand;
         } else {
-          pq.push(NodeCand{cur.dist + edg->pl().getLength(), cand, edg,
-                           cur.fullTurns + fullTurn});
+          pq.push(
+              NodeCand{cur.dist + eLen, cand, edg, cur.fullTurns + fullTurn});
         }
       }
     }
@@ -1220,96 +1180,39 @@ bool OsmBuilder::isBlocked(const Edge* e, const StatInfo* si, const POINT& p,
 
 // _____________________________________________________________________________
 Node* OsmBuilder::eqStatReach(const Edge* e, const StatInfo* si, const POINT& p,
-                              double maxD, int maxFullTurns, double minAngle,
-                              bool orphanSnap) {
-  return depthSearch(e, si, p, maxD, maxFullTurns, minAngle,
-                     EqSearch(orphanSnap));
+                              double maxD, int maxFullTurns, double minAngle) {
+  return depthSearch(e, si, p, maxD, maxFullTurns, minAngle, EqSearch());
 }
 
 // _____________________________________________________________________________
 void OsmBuilder::getEdgCands(const POINT& geom, EdgeCandPQ* ret, EdgeGrid* eg,
                              double d) {
-  double distor = util::geo::webMercDistFactor(geom);
+  double distor = util::geo::latLngDistFactor(geom);
   std::set<Edge*> neighs;
-  BOX box = util::geo::pad(util::geo::getBoundingBox(geom), d / distor);
+  BOX box =
+      util::geo::pad(util::geo::getBoundingBox(geom), (d / M_PER_DEG) / distor);
   eg->get(box, &neighs);
 
   for (auto* e : neighs) {
     double dist = util::geo::distToSegment(*e->getFrom()->pl().getGeom(),
                                            *e->getTo()->pl().getGeom(), geom);
 
-    if (dist * distor <= d) {
+    if (dist * distor * M_PER_DEG <= d) {
       ret->push(EdgeCand(-dist, e));
     }
   }
 }
 
 // _____________________________________________________________________________
-std::set<Node*> OsmBuilder::getMatchingNds(const NodePL& s, NodeGrid* ng,
-                                           double d) {
-  std::set<Node*> ret;
-  double distor = util::geo::webMercDistFactor(*s.getGeom());
-  std::set<Node*> neighs;
-  BOX box = util::geo::pad(util::geo::getBoundingBox(*s.getGeom()), d / distor);
-  ng->get(box, &neighs);
-
-  for (auto* n : neighs) {
-    if (n->pl().getSI() && n->pl().getSI()->simi(s.getSI()) > 0.5) {
-      double dist = webMercMeterDist(*n->pl().getGeom(), *s.getGeom());
-      if (dist < d) ret.insert(n);
-    }
-  }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-Node* OsmBuilder::getMatchingNd(const NodePL& s, NodeGrid* ng, double d) {
-  double distor = util::geo::webMercDistFactor(*s.getGeom());
-  std::set<Node*> neighs;
-  BOX box = util::geo::pad(util::geo::getBoundingBox(*s.getGeom()), d / distor);
-  ng->get(box, &neighs);
-
-  Node* ret = 0;
-  double bestD = std::numeric_limits<double>::max();
-
-  for (auto* n : neighs) {
-    if (n->pl().getSI() && n->pl().getSI()->simi(s.getSI()) > 0.5) {
-      double dist = webMercMeterDist(*n->pl().getGeom(), *s.getGeom());
-      if (dist < d && dist < bestD) {
-        bestD = dist;
-        ret = n;
-      }
-    }
-  }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-std::set<Node*> OsmBuilder::snapStation(Graph* g, NodePL* s, EdgeGrid* eg,
-                                        NodeGrid* sng, const OsmReadOpts& opts,
-                                        Restrictor* restor, bool surrHeur,
-                                        bool orphSnap, double d) {
+void OsmBuilder::snapStation(Graph* g, NodePL* s, EdgeGrid* eg, NodeGrid* sng,
+                             const OsmReadOpts& opts, Restrictor* restor,
+                             double d) {
   assert(s->getSI());
-  std::set<Node*> ret;
 
   EdgeCandPQ pq;
 
   getEdgCands(*s->getGeom(), &pq, eg, d);
 
-  if (pq.empty() && surrHeur) {
-    // no station found in the first round, try again with the nearest
-    // surrounding station with matching name
-    const Node* best = getMatchingNd(*s, sng, opts.maxSnapFallbackHeurDistance);
-    if (best) {
-      getEdgCands(*best->pl().getGeom(), &pq, eg, d);
-    } else {
-      // if still no luck, get edge cands in fallback snap distance
-      getEdgCands(*s->getGeom(), &pq, eg, opts.maxSnapFallbackHeurDistance);
-    }
-  }
-
   while (!pq.empty()) {
     auto* e = pq.top().second;
     pq.pop();
@@ -1319,96 +1222,51 @@ std::set<Node*> OsmBuilder::snapStation(Graph* g, NodePL* s, EdgeGrid* eg,
 
     Node* eq = 0;
     if (!(eq = eqStatReach(e, s->getSI(), geom, 2 * d, 0,
-                           opts.maxAngleSnapReach, orphSnap))) {
+                           opts.maxAngleSnapReach))) {
       if (e->pl().lvl() > opts.maxSnapLevel) continue;
       if (isBlocked(e, s->getSI(), geom, opts.maxBlockDistance, 0,
                     opts.maxAngleSnapReach)) {
         continue;
       }
 
-      // if the projected position is near (< 2 meters) the end point of this
+      // if the projected position is near (< 0.5 meters) the end point of this
       // way and the endpoint is not already a station, place the station there.
       if (!e->getFrom()->pl().getSI() &&
-          webMercMeterDist(geom, *e->getFrom()->pl().getGeom()) < 2) {
+          haversine(geom, *e->getFrom()->pl().getGeom()) < .5) {
         e->getFrom()->pl().setSI(*s->getSI());
-        if (s->getSI()->getGroup())
-          s->getSI()->getGroup()->addNode(e->getFrom());
-        ret.insert(e->getFrom());
       } else if (!e->getTo()->pl().getSI() &&
-                 webMercMeterDist(geom, *e->getTo()->pl().getGeom()) < 2) {
+                 haversine(geom, *e->getTo()->pl().getGeom()) < .5) {
         e->getTo()->pl().setSI(*s->getSI());
-        if (s->getSI()->getGroup()) s->getSI()->getGroup()->addNode(e->getTo());
-        ret.insert(e->getTo());
       } else {
         s->setGeom(geom);
         Node* n = g->addNd(*s);
-        if (n->pl().getSI()->getGroup())
-          n->pl().getSI()->getGroup()->addNode(n);
         sng->add(geom, n);
 
         auto ne = g->addEdg(e->getFrom(), n, e->pl());
-        ne->pl().setLength(webMercDist(n, e->getFrom()));
-        LINE l;
-        l.push_back(*e->getFrom()->pl().getGeom());
-        l.push_back(*n->pl().getGeom());
-        *ne->pl().getGeom() = l;
-        eg->add(l, ne);
+        ne->pl().setCost(costToInt(dist(e->getFrom(), n) /
+                                   opts.levelDefSpeed[ne->pl().lvl()]));
+        eg->add({*e->getFrom()->pl().getGeom(), *n->pl().getGeom()}, ne);
 
         auto nf = g->addEdg(n, e->getTo(), e->pl());
-        nf->pl().setLength(webMercDist(n, e->getTo()));
-        LINE ll;
-        ll.push_back(*n->pl().getGeom());
-        ll.push_back(*e->getTo()->pl().getGeom());
-        *nf->pl().getGeom() = ll;
-        eg->add(ll, nf);
+        nf->pl().setCost(costToInt(dist(n, e->getTo()) /
+                                   opts.levelDefSpeed[nf->pl().lvl()]));
+        eg->add({*n->pl().getGeom(), *e->getTo()->pl().getGeom()}, nf);
 
         // replace edge in restrictor
         restor->replaceEdge(e, ne, nf);
 
         g->delEdg(e->getFrom(), e->getTo());
         eg->remove(e);
-        ret.insert(n);
       }
     } else {
       // if the snapped station is very near to the original OSM station
       // write additional info from this snap station to the equivalent stat
-      if (webMercMeterDist(*s->getGeom(), *eq->pl().getGeom()) <
-          opts.maxOsmStationDistance) {
+      if (haversine(*s->getGeom(), *eq->pl().getGeom()) < 5) {
         if (eq->pl().getSI()->getTrack().empty())
           eq->pl().getSI()->setTrack(s->getSI()->getTrack());
       }
-      ret.insert(eq);
     }
   }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-StatGroup* OsmBuilder::groupStats(const NodeSet& s) {
-  if (!s.size()) return 0;
-  // reference group
-  StatGroup* ret = new StatGroup();
-  bool used = false;
-
-  for (auto* n : s) {
-    if (!n->pl().getSI()) continue;
-    used = true;
-    if (n->pl().getSI()->getGroup()) {
-      // this node is already in a group - merge this group with this one
-      ret->merge(n->pl().getSI()->getGroup());
-    } else {
-      ret->addNode(n);
-      n->pl().getSI()->setGroup(ret);
-    }
-  }
-
-  if (!used) {
-    delete ret;
-    return 0;
-  }
-
-  return ret;
 }
 
 // _____________________________________________________________________________
@@ -1423,6 +1281,7 @@ std::vector<TransitEdgeLine*> OsmBuilder::getLines(
       elp = _relLines[relId];
     } else {
       TransitEdgeLine el;
+      el.color = ad::cppgtfs::gtfs::NO_COLOR;
 
       bool found = false;
       for (const auto& r : ops.relLinerules.sNameRule) {
@@ -1460,6 +1319,23 @@ std::vector<TransitEdgeLine*> OsmBuilder::getLines(
         if (found) break;
       }
 
+      found = false;
+      for (const auto& r : ops.relLinerules.colorRule) {
+        for (const auto& relAttr : rels.rels[relId]) {
+          if (relAttr.first == r) {
+            auto dec = pfxml::file::decode(relAttr.second);
+            auto color = parseHexColor(dec);
+            if (color == ad::cppgtfs::gtfs::NO_COLOR)
+              color = parseHexColor(std::string("#") + dec);
+            if (color != ad::cppgtfs::gtfs::NO_COLOR) {
+              found = true;
+              el.color = color;
+            }
+          }
+        }
+        if (found) break;
+      }
+
       if (!el.shortName.size() && !el.fromStr.size() && !el.toStr.size())
         continue;
 
@@ -1481,15 +1357,6 @@ std::vector<TransitEdgeLine*> OsmBuilder::getLines(
 // _____________________________________________________________________________
 void OsmBuilder::getKeptAttrKeys(const OsmReadOpts& opts,
                                  AttrKeySet sets[3]) const {
-  for (const auto& i : opts.statGroupNAttrRules) {
-    if (i.attr.relRule.kv.first.empty()) {
-      sets[0].insert(i.attr.attr);
-    } else {
-      sets[2].insert(i.attr.relRule.kv.first);
-      sets[2].insert(i.attr.attr);
-    }
-  }
-
   for (const auto& i : opts.keepFilter) {
     for (size_t j = 0; j < 3; j++) sets[j].insert(i.first);
   }
@@ -1523,6 +1390,10 @@ void OsmBuilder::getKeptAttrKeys(const OsmReadOpts& opts,
     sets[0].insert(i.first);
   }
 
+  for (const auto& i : opts.turnCycleFilter) {
+    sets[0].insert(i.first);
+  }
+
   for (uint8_t j = 0; j < 7; j++) {
     for (const auto& kv : *(opts.levelFilters + j)) {
       sets[1].insert(kv.first);
@@ -1550,6 +1421,8 @@ void OsmBuilder::getKeptAttrKeys(const OsmReadOpts& opts,
                  opts.relLinerules.fromNameRule.end());
   sets[2].insert(opts.relLinerules.sNameRule.begin(),
                  opts.relLinerules.sNameRule.end());
+  sets[2].insert(opts.relLinerules.colorRule.begin(),
+                 opts.relLinerules.colorRule.end());
 
   for (const auto& i : opts.statAttrRules.nameRule) {
     if (i.relRule.kv.first.empty()) {
@@ -1588,12 +1461,26 @@ void OsmBuilder::getKeptAttrKeys(const OsmReadOpts& opts,
   }
 }
 
+// _____________________________________________________________________________
+void OsmBuilder::deleteOrphNds(Graph* g, const OsmReadOpts& opts) {
+  UNUSED(opts);
+  for (auto i = g->getNds().begin(); i != g->getNds().end();) {
+    if ((*i)->getInDeg() + (*i)->getOutDeg() != 0 || (*i)->pl().getSI()) {
+      ++i;
+      continue;
+    }
+
+    i = g->delNd(*i);
+  }
+}
+
 // _____________________________________________________________________________
 void OsmBuilder::deleteOrphEdgs(Graph* g, const OsmReadOpts& opts) {
   size_t ROUNDS = 3;
   for (size_t c = 0; c < ROUNDS; c++) {
-    for (auto i = g->getNds()->begin(); i != g->getNds()->end();) {
-      if ((*i)->getInDeg() + (*i)->getOutDeg() != 1 || (*i)->pl().getSI()) {
+    for (auto i = g->getNds().begin(); i != g->getNds().end();) {
+      if ((*i)->getInDeg() + (*i)->getOutDeg() != 1 || (*i)->pl().getSI() ||
+          (*i)->pl().isTurnCycle()) {
         ++i;
         continue;
       }
@@ -1607,21 +1494,6 @@ void OsmBuilder::deleteOrphEdgs(Graph* g, const OsmReadOpts& opts) {
       }
 
       i = g->delNd(*i);
-      continue;
-      i++;
-    }
-  }
-}
-
-// _____________________________________________________________________________
-void OsmBuilder::deleteOrphNds(Graph* g) {
-  for (auto i = g->getNds()->begin(); i != g->getNds()->end();) {
-    if ((*i)->getInDeg() + (*i)->getOutDeg() == 0 &&
-        !((*i)->pl().getSI() && (*i)->pl().getSI()->getGroup())) {
-      i = g->delNd(i);
-      // TODO(patrick): maybe delete from node grid?
-    } else {
-      i++;
     }
   }
 }
@@ -1632,11 +1504,11 @@ bool OsmBuilder::edgesSim(const Edge* a, const Edge* b) {
     return false;
   if (a->pl().lvl() != b->pl().lvl()) return false;
   if (a->pl().getLines().size() != b->pl().getLines().size()) return false;
-  if (a->pl().getLines() != b->pl().getLines()) return false;
   if (a->pl().oneWay() && b->pl().oneWay()) {
     if (a->getFrom() != b->getTo() && a->getTo() != b->getFrom()) return false;
   }
   if (a->pl().isRestricted() || b->pl().isRestricted()) return false;
+  if (a->pl().getLines() != b->pl().getLines()) return false;
 
   return true;
 }
@@ -1651,39 +1523,60 @@ const EdgePL& OsmBuilder::mergeEdgePL(Edge* a, Edge* b) {
   else
     n = a->getTo();
 
+  if (a->pl().getGeom() == 0) {
+    a->pl().addPoint(*a->getFrom()->pl().getGeom());
+    a->pl().addPoint(*a->getTo()->pl().getGeom());
+  }
+
   if (a->getTo() == n && b->getTo() == n) {
     // --> n <--
-    a->pl().getGeom()->insert(a->pl().getGeom()->end(),
-                              b->pl().getGeom()->rbegin(),
-                              b->pl().getGeom()->rend());
+    if (b->pl().getGeom()) {
+      a->pl().getGeom()->insert(a->pl().getGeom()->end(),
+                                b->pl().getGeom()->rbegin(),
+                                b->pl().getGeom()->rend());
+    } else {
+      a->pl().getGeom()->push_back(*b->getFrom()->pl().getGeom());
+    }
   } else if (a->getTo() == n && b->getFrom() == n) {
     // --> n -->
-    a->pl().getGeom()->insert(a->pl().getGeom()->end(),
-                              b->pl().getGeom()->begin(),
-                              b->pl().getGeom()->end());
+    if (b->pl().getGeom()) {
+      a->pl().getGeom()->insert(a->pl().getGeom()->end(),
+                                b->pl().getGeom()->begin(),
+                                b->pl().getGeom()->end());
+    } else {
+      a->pl().getGeom()->push_back(*b->getTo()->pl().getGeom());
+    }
   } else if (a->getFrom() == n && b->getTo() == n) {
     // <-- n <--
     std::reverse(a->pl().getGeom()->begin(), a->pl().getGeom()->end());
-    a->pl().getGeom()->insert(a->pl().getGeom()->end(),
-                              b->pl().getGeom()->rbegin(),
-                              b->pl().getGeom()->rend());
+    if (b->pl().getGeom()) {
+      a->pl().getGeom()->insert(a->pl().getGeom()->end(),
+                                b->pl().getGeom()->rbegin(),
+                                b->pl().getGeom()->rend());
+    } else {
+      a->pl().getGeom()->push_back(*b->getFrom()->pl().getGeom());
+    }
   } else {
     // <-- n -->
     std::reverse(a->pl().getGeom()->begin(), a->pl().getGeom()->end());
-    a->pl().getGeom()->insert(a->pl().getGeom()->end(),
-                              b->pl().getGeom()->begin(),
-                              b->pl().getGeom()->end());
+    if (b->pl().getGeom()) {
+      a->pl().getGeom()->insert(a->pl().getGeom()->end(),
+                                b->pl().getGeom()->begin(),
+                                b->pl().getGeom()->end());
+    } else {
+      a->pl().getGeom()->push_back(*b->getTo()->pl().getGeom());
+    }
   }
 
-  a->pl().setLength(a->pl().getLength() + b->pl().getLength());
-
   return a->pl();
 }
 
 // _____________________________________________________________________________
 void OsmBuilder::collapseEdges(Graph* g) {
-  for (auto* n : *g->getNds()) {
-    if (n->getOutDeg() + n->getInDeg() != 2 || n->pl().getSI()) continue;
+  for (auto n : g->getNds()) {
+    if (n->getOutDeg() + n->getInDeg() != 2 || n->pl().getSI() ||
+        n->pl().isTurnCycle())
+      continue;
 
     Edge* ea;
     Edge* eb;
@@ -1699,7 +1592,7 @@ void OsmBuilder::collapseEdges(Graph* g) {
     }
 
     // important, we don't have a multigraph! if the same edge
-    // will already exist, leave this node
+    // already exists, leave this node
     if (g->getEdg(ea->getOtherNd(n), eb->getOtherNd(n))) continue;
     if (g->getEdg(eb->getOtherNd(n), ea->getOtherNd(n))) continue;
 
@@ -1709,6 +1602,7 @@ void OsmBuilder::collapseEdges(Graph* g) {
       } else {
         g->addEdg(ea->getOtherNd(n), eb->getOtherNd(n), mergeEdgePL(ea, eb));
       }
+
       g->delEdg(ea->getFrom(), ea->getTo());
       g->delEdg(eb->getFrom(), eb->getTo());
     }
@@ -1717,49 +1611,55 @@ void OsmBuilder::collapseEdges(Graph* g) {
 
 // _____________________________________________________________________________
 void OsmBuilder::simplifyGeoms(Graph* g) {
-  for (auto* n : *g->getNds()) {
+  for (auto* n : g->getNds()) {
     for (auto* e : n->getAdjListOut()) {
-      (*e->pl().getGeom()) = util::geo::simplify(*e->pl().getGeom(), 0.5);
+      (*e->pl().getGeom()) =
+          util::geo::simplify(*e->pl().getGeom(), 0.5 / M_PER_DEG);
     }
   }
 }
 
 // _____________________________________________________________________________
-uint32_t OsmBuilder::writeComps(Graph* g) {
-  Component* comp = new Component{7};
+uint32_t OsmBuilder::writeComps(Graph* g, const OsmReadOpts& opts) {
+  NodePL::comps.clear();
+  NodePL::comps.emplace_back(Component{0});
   uint32_t numC = 0;
+  uint64_t numNds = 0;
 
-  for (auto* n : *g->getNds()) {
-    if (!n->pl().getComp()) {
+  double fac = opts.maxSpeedCorFac;
+
+  for (auto* n : g->getNds()) {
+    if (!n->pl().getCompId()) {
       std::stack<std::pair<Node*, Edge*>> q;
       q.push(std::pair<Node*, Edge*>(n, 0));
       while (!q.empty()) {
         std::pair<Node*, Edge*> cur = q.top();
         q.pop();
 
-        cur.first->pl().setComp(comp);
+        cur.first->pl().setComp(NodePL::comps.size());
+        numNds++;
         for (auto* e : cur.first->getAdjListOut()) {
-          if (e->pl().lvl() < comp->minEdgeLvl)
-            comp->minEdgeLvl = e->pl().lvl();
-          if (!e->getOtherNd(cur.first)->pl().getComp())
+          double speed = opts.levelDefSpeed[e->pl().lvl()] / fac;
+          if (speed > NodePL::comps.back().maxSpeed)
+            NodePL::comps.back().maxSpeed = speed;
+          if (!e->getOtherNd(cur.first)->pl().getCompId())
             q.push(std::pair<Node*, Edge*>(e->getOtherNd(cur.first), e));
         }
         for (auto* e : cur.first->getAdjListIn()) {
-          if (e->pl().lvl() < comp->minEdgeLvl)
-            comp->minEdgeLvl = e->pl().lvl();
-          if (!e->getOtherNd(cur.first)->pl().getComp())
+          double speed = opts.levelDefSpeed[e->pl().lvl()] / fac;
+          if (speed > NodePL::comps.back().maxSpeed)
+            NodePL::comps.back().maxSpeed = speed;
+          if (!e->getOtherNd(cur.first)->pl().getCompId())
             q.push(std::pair<Node*, Edge*>(e->getOtherNd(cur.first), e));
         }
       }
 
-      numC++;
-      comp = new Component{7};
+      if (numNds > 1) numC++;
+      NodePL::comps.emplace_back(Component{0});
+      numNds = 0;
     }
   }
 
-  // the last comp was not used
-  delete comp;
-
   return numC;
 }
 
@@ -1779,10 +1679,11 @@ void OsmBuilder::writeEdgeTracks(const EdgTracks& tracks) {
 
 // _____________________________________________________________________________
 void OsmBuilder::writeODirEdgs(Graph* g, Restrictor* restor) {
-  for (auto* n : *g->getNds()) {
+  for (auto* n : g->getNds()) {
     for (auto* e : n->getAdjListOut()) {
       if (g->getEdg(e->getTo(), e->getFrom())) continue;
       auto newE = g->addEdg(e->getTo(), e->getFrom(), e->pl().revCopy());
+      assert(newE->pl().getGeom());
       if (e->pl().isRestricted()) restor->duplicateEdge(e, newE);
     }
   }
@@ -1790,9 +1691,45 @@ void OsmBuilder::writeODirEdgs(Graph* g, Restrictor* restor) {
 
 // _____________________________________________________________________________
 void OsmBuilder::writeSelfEdgs(Graph* g) {
-  for (auto* n : *g->getNds()) {
-    if (n->pl().getSI() && n->getAdjListOut().size() == 0) {
-      g->addEdg(n, n);
+  // if a station only has degree 1, there is no way to arrive at this station
+  // without doing a full turn (because the outgoing candidate edge is always
+  // the incoming edge). This is a problem at end-stations. We solve this by
+  // adding self-edges with infinite costs - this still allows usage as
+  // arrivals, does not punish bends (because the node degree is still only 2)
+  // and prevents the usage of the edge to circumvent turn penalties
+  for (auto* n : g->getNds()) {
+    if (n->pl().getSI() && n->getAdjListOut().size() == 1) {
+      auto e = g->addEdg(n, n);
+      e->pl().setCost(std::numeric_limits<uint32_t>::max());
+      e->pl().addPoint(*e->getFrom()->pl().getGeom());
+      e->pl().addPoint(*e->getTo()->pl().getGeom());
+    }
+  }
+}
+
+// _____________________________________________________________________________
+void OsmBuilder::writeNoLinePens(Graph* g, const OsmReadOpts& opts) {
+  for (auto* n : g->getNds()) {
+    for (auto* e : n->getAdjListOut()) {
+      if (e->pl().getLines().size() == 0) {
+        double c = e->pl().getCost();
+        c = c / 10.0;  // convert into seconds
+        e->pl().setCost(costToInt(c * opts.noLinesPunishFact));
+      }
+    }
+  }
+}
+
+// _____________________________________________________________________________
+void OsmBuilder::writeOneWayPens(Graph* g, const OsmReadOpts& opts) {
+  for (auto* n : g->getNds()) {
+    for (auto* e : n->getAdjListOut()) {
+      if (e->pl().oneWay() == 2) {
+        double c = e->pl().getCost();
+        c = c / 10.0;  // convert into seconds
+        e->pl().setCost(
+            costToInt(c * opts.oneWaySpeedPen + opts.oneWayEntryCost));
+      }
     }
   }
 }
@@ -1826,12 +1763,23 @@ bool OsmBuilder::keepFullTurn(const trgraph::Node* n, double ang) {
         b = f;
     }
 
-    auto ap = a->pl().backHop();
-    auto bp = b->pl().backHop();
-    if (a->getTo() != other) ap = a->pl().frontHop();
-    if (b->getTo() != other) bp = b->pl().frontHop();
+    POINT ap, bp;
 
-    return router::angSmaller(ap, *other->pl().getGeom(), bp, ang);
+    if (a->pl().getGeom() && b->pl().getGeom()) {
+      ap = a->pl().backHop();
+      bp = b->pl().backHop();
+      if (a->getTo() != other) ap = a->pl().frontHop();
+      if (b->getTo() != other) bp = b->pl().frontHop();
+    } else {
+      assert(!a->pl().getGeom());
+      assert(!b->pl().getGeom());
+      ap = *a->getTo()->pl().getGeom();
+      bp = *b->getTo()->pl().getGeom();
+      if (a->getTo() != other) ap = *a->getFrom()->pl().getGeom();
+      if (b->getTo() != other) bp = *b->getFrom()->pl().getGeom();
+    }
+
+    return util::geo::innerProd(*other->pl().getGeom(), ap, bp) > ang;
   }
 
   return false;
@@ -1839,121 +1787,88 @@ bool OsmBuilder::keepFullTurn(const trgraph::Node* n, double ang) {
 
 // _____________________________________________________________________________
 void OsmBuilder::snapStats(const OsmReadOpts& opts, Graph* g,
-                           const BBoxIdx& bbox, size_t gridSize,
-                           router::FeedStops* fs, Restrictor* res,
-                           const NodeSet& orphanStations) {
-  NodeGrid sng = buildNodeIdx(g, gridSize, bbox.getFullWebMercBox(), true);
-  EdgeGrid eg = buildEdgeIdx(g, gridSize, bbox.getFullWebMercBox());
+                           const BBoxIdx& bbox, double gridSize,
+                           Restrictor* res, const NodeSet& orphanStations) {
+  NodeGrid sng = buildNodeIdx(g, gridSize, bbox.getFullBox(), true);
+  EdgeGrid eg = buildEdgeIdx(g, gridSize, bbox.getFullBox());
 
   LOG(DEBUG) << "Grid size of " << sng.getXWidth() << "x" << sng.getYHeight();
 
-  for (double d : opts.maxSnapDistances) {
+  for (double d : opts.maxOsmStationDistances) {
     for (auto s : orphanStations) {
-      POINT geom = *s->pl().getGeom();
       NodePL pl = s->pl();
-      pl.getSI()->setIsFromOsm(false);
-      const auto& r =
-          snapStation(g, &pl, &eg, &sng, opts, res, false, false, d);
-      groupStats(r);
-      for (auto n : r) {
-        // if the snapped station is very near to the original OSM
-        // station, set is-from-osm to true
-        if (webMercMeterDist(geom, *n->pl().getGeom()) <
-            opts.maxOsmStationDistance) {
-          if (n->pl().getSI()) n->pl().getSI()->setIsFromOsm(true);
-        }
-      }
-    }
-  }
-
-  if (!fs) return;
-
-  std::vector<const Stop*> notSnapped;
-
-  for (auto& s : *fs) {
-    bool snapped = false;
-    auto pl = plFromGtfs(s.first, opts);
-    for (size_t i = 0; i < opts.maxSnapDistances.size(); i++) {
-      double d = opts.maxSnapDistances[i];
-
-      StatGroup* group = groupStats(
-          snapStation(g, &pl, &eg, &sng, opts, res,
-                      i == opts.maxSnapDistances.size() - 1, false, d));
-
-      if (group) {
-        group->addStop(s.first);
-        (*fs)[s.first] = *group->getNodes().begin();
-        snapped = true;
-      }
-    }
-    if (!snapped) {
-      LOG(VDEBUG) << "Could not snap station "
-                  << "(" << pl.getSI()->getName() << ")"
-                  << " (" << s.first->getLat() << "," << s.first->getLng()
-                  << ") in normal run, trying again later in orphan mode.";
-      if (!bbox.contains(*pl.getGeom())) {
-        LOG(VDEBUG) << "Note: '" << pl.getSI()->getName()
-                    << "' does not lie within the bounds for this graph and "
-                       "may be a stray station";
-      }
-      notSnapped.push_back(s.first);
-    }
-  }
-
-  if (notSnapped.size())
-    LOG(VDEBUG) << notSnapped.size()
-                << " stations could not be snapped in "
-                   "normal run, trying again in orphan "
-                   "mode.";
-
-  // try again, but aggressively snap to orphan OSM stations which have
-  // not been assigned to any GTFS stop yet
-  for (auto& s : notSnapped) {
-    bool snapped = false;
-    auto pl = plFromGtfs(s, opts);
-    for (size_t i = 0; i < opts.maxSnapDistances.size(); i++) {
-      double d = opts.maxSnapDistances[i];
-
-      StatGroup* group = groupStats(
-          snapStation(g, &pl, &eg, &sng, opts, res,
-                      i == opts.maxSnapDistances.size() - 1, true, d));
-
-      if (group) {
-        group->addStop(s);
-        // add the added station name as an alt name to ensure future
-        // similarity
-        for (auto n : group->getNodes()) {
-          if (n->pl().getSI())
-            n->pl().getSI()->addAltName(pl.getSI()->getName());
-        }
-        (*fs)[s] = *group->getNodes().begin();
-        snapped = true;
-      }
-    }
-    if (!snapped) {
-      // finally give up
-
-      // add a group with only this stop in it
-      StatGroup* dummyGroup = new StatGroup();
-      Node* dummyNode = g->addNd(pl);
-
-      dummyNode->pl().getSI()->setGroup(dummyGroup);
-      dummyGroup->addNode(dummyNode);
-      dummyGroup->addStop(s);
-      (*fs)[s] = dummyNode;
-      if (!bbox.contains(*pl.getGeom())) {
-        LOG(VDEBUG) << "Could not snap station "
-                    << "(" << pl.getSI()->getName() << ")"
-                    << " (" << s->getLat() << "," << s->getLng() << ")";
-        LOG(VDEBUG) << "Note: '" << pl.getSI()->getName()
-                    << "' does not lie within the bounds for this graph and "
-                       "may be a stray station";
-      } else {
-        // only warn if it is contained in the BBOX for this graph
-        LOG(WARN) << "Could not snap station "
-                  << "(" << pl.getSI()->getName() << ")"
-                  << " (" << s->getLat() << "," << s->getLng() << ")";
-      }
+      snapStation(g, &pl, &eg, &sng, opts, res, d);
     }
   }
 }
+
+// _____________________________________________________________________________
+uint32_t OsmBuilder::costToInt(double c) {
+  // always round upwards, otherwise when combined with the heuristic which
+  // is always rounded downwards the PQ monotonicity is not ensured anymore -
+  // with a downward rounding, the rounding errors may sum up so high that the
+  // path will get cheaper than the heuristic cost
+  uint32_t val = std::ceil(c * 10);
+  if (std::ceil(c * 10) > std::numeric_limits<uint32_t>::max()) {
+    LOG(DEBUG) << "Cost " << c
+               << " does not fit in unsigned 32 bit integer, defaulting to "
+               << std::numeric_limits<uint32_t>::max() << ".";
+    return std::numeric_limits<uint32_t>::max();
+  }
+  return val;
+}
+
+// _____________________________________________________________________________
+uint32_t OsmBuilder::parseHexColor(std::string s) const {
+  // TODO(patrick): not very nice
+  size_t proced = 0;
+  std::transform(s.begin(), s.end(), s.begin(), ::toupper);
+  std::string ret = "      ";
+  if (s.size() == 7 && s[0] == '#') {
+    for (size_t i = 1; i < 7; i++) {
+      if (isdigit(s[i]))
+        ret[i - 1] = s[i];
+      else if (isalpha(s[i]) && (s[i] > 64 && s[i] < 71))
+        ret[i - 1] = s[i];
+      else
+        return ad::cppgtfs::gtfs::NO_COLOR;
+    }
+
+    return std::stoul("0x" + ret, &proced, 16);
+  }
+
+  if (s.size() == 4 && s[0] == '#') {
+    for (size_t i = 1; i < 4; i++) {
+      if (isdigit(s[i])) {
+        ret[(i - 1) * 2] = s[i];
+        ret[(i - 1) * 2 + 1] = s[i];
+      } else if (isalpha(s[i]) && (s[i] > 64 && s[i] < 71)) {
+        ret[(i - 1) * 2] = s[i];
+        ret[(i - 1) * 2 + 1] = s[i];
+      } else {
+        return ad::cppgtfs::gtfs::NO_COLOR;
+      }
+    }
+    return std::stoul("0x" + ret, &proced, 16);
+  }
+
+  if (s == "BLACK") return 0x00000000;
+  if (s == "SILVER") return 0x00C0C0C0;
+  if (s == "GRAY") return 0x00808080;
+  if (s == "WHITE") return 0x00FFFFFF;
+  if (s == "MAROON") return 0x00800000;
+  if (s == "RED") return 0x00FF0000;
+  if (s == "PURPLE") return 0x00800080;
+  if (s == "FUCHSIA") return 0x00FF00FF;
+  if (s == "GREEN") return 0x00008000;
+  if (s == "LIME") return 0x0000FF00;
+  if (s == "OLIVE") return 0x00808000;
+  if (s == "YELLOW") return 0x00FFFF00;
+  if (s == "NAVY") return 0x00000080;
+  if (s == "BLUE") return 0x000000FF;
+  if (s == "TEAL") return 0x00008080;
+  if (s == "AQUA") return 0x0000FFFF;
+
+  if (ret.empty()) return ad::cppgtfs::gtfs::NO_COLOR;
+  return std::stoul("0x" + ret, &proced, 16);
+}
diff --git a/src/pfaedle/osm/OsmBuilder.h b/src/pfaedle/osm/OsmBuilder.h
index 8b4c54f..10029c4 100644
--- a/src/pfaedle/osm/OsmBuilder.h
+++ b/src/pfaedle/osm/OsmBuilder.h
@@ -30,20 +30,19 @@
 namespace pfaedle {
 namespace osm {
 
+using ad::cppgtfs::gtfs::Stop;
+using pfaedle::router::NodeSet;
+using pfaedle::trgraph::Component;
+using pfaedle::trgraph::Edge;
 using pfaedle::trgraph::EdgeGrid;
-using pfaedle::trgraph::NodeGrid;
-using pfaedle::trgraph::Normalizer;
+using pfaedle::trgraph::EdgePL;
 using pfaedle::trgraph::Graph;
 using pfaedle::trgraph::Node;
+using pfaedle::trgraph::NodeGrid;
 using pfaedle::trgraph::NodePL;
-using pfaedle::trgraph::Edge;
-using pfaedle::trgraph::EdgePL;
-using pfaedle::trgraph::TransitEdgeLine;
+using pfaedle::trgraph::Normalizer;
 using pfaedle::trgraph::StatInfo;
-using pfaedle::trgraph::StatGroup;
-using pfaedle::trgraph::Component;
-using pfaedle::router::NodeSet;
-using ad::cppgtfs::gtfs::Stop;
+using pfaedle::trgraph::TransitEdgeLine;
 using util::Nullable;
 
 struct NodeCand {
@@ -58,9 +57,8 @@ struct SearchFunc {
 };
 
 struct EqSearch : public SearchFunc {
-  explicit EqSearch(bool orphanSnap) : orphanSnap(orphanSnap) {}
+  EqSearch() {}
   double minSimi = 0.9;
-  bool orphanSnap;
   bool operator()(const Node* cand, const StatInfo* si) const;
 };
 
@@ -87,8 +85,7 @@ class OsmBuilder {
   // Read the OSM file at path, and write a graph to g. Only elements
   // inside the bounding box will be read
   void read(const std::string& path, const OsmReadOpts& opts, Graph* g,
-            const BBoxIdx& box, size_t gridSize, router::FeedStops* fs,
-            Restrictor* res);
+            const BBoxIdx& box, double gridSize, Restrictor* res);
 
   // Based on the list of options, output an overpass XML query for getting
   // the data needed for routing
@@ -103,8 +100,8 @@ class OsmBuilder {
 
  private:
   pfxml::parser_state readBBoxNds(pfxml::file* xml, OsmIdSet* nodes,
-                               OsmIdSet* noHupNodes, const OsmFilter& filter,
-                               const BBoxIdx& bbox) const;
+                                  OsmIdSet* noHupNodes, const OsmFilter& filter,
+                                  const BBoxIdx& bbox) const;
 
   void readRels(pfxml::file* f, RelLst* rels, RelMap* nodeRels, RelMap* wayRels,
                 const OsmFilter& filter, const AttrKeySet& keepAttrs,
@@ -140,13 +137,14 @@ class OsmBuilder {
                  Restrictor* restor, const FlatRels& flatRels,
                  EdgTracks* etracks, const OsmReadOpts& opts);
 
-  void readEdges(pfxml::file* xml, const RelMap& wayRels, const OsmFilter& filter,
-                 const OsmIdSet& bBoxNodes, const AttrKeySet& keepAttrs,
-                 OsmIdList* ret, NIdMap* nodes, const FlatRels& flatRels);
+  void readEdges(pfxml::file* xml, const RelMap& wayRels,
+                 const OsmFilter& filter, const OsmIdSet& bBoxNodes,
+                 const AttrKeySet& keepAttrs, OsmIdList* ret, NIdMap* nodes,
+                 const FlatRels& flatRels);
 
-  OsmWay nextWay(pfxml::file* xml, const RelMap& wayRels, const OsmFilter& filter,
-                 const OsmIdSet& bBoxNodes, const AttrKeySet& keepAttrs,
-                 const FlatRels& flatRels) const;
+  OsmWay nextWay(pfxml::file* xml, const RelMap& wayRels,
+                 const OsmFilter& filter, const OsmIdSet& bBoxNodes,
+                 const AttrKeySet& keepAttrs, const FlatRels& flatRels) const;
 
   bool keepWay(const OsmWay& w, const RelMap& wayRels, const OsmFilter& filter,
                const OsmIdSet& bBoxNodes, const FlatRels& fl) const;
@@ -168,52 +166,46 @@ class OsmBuilder {
                  const AttrKeySet& keepAttrs) const;
 
  protected:
-  Nullable<StatInfo> getStatInfo(Node* node, osmid nid, const POINT& pos,
-                                 const AttrMap& m, StAttrGroups* groups,
+  Nullable<StatInfo> getStatInfo(osmid nid, const AttrMap& m,
                                  const RelMap& nodeRels, const RelLst& rels,
                                  const OsmReadOpts& ops) const;
 
   static void snapStats(const OsmReadOpts& opts, Graph* g, const BBoxIdx& bbox,
-                        size_t gridSize, router::FeedStops* fs, Restrictor* res,
+                        double gridSize, Restrictor* res,
                         const NodeSet& orphanStations);
-  static void writeGeoms(Graph* g);
-  static void deleteOrphNds(Graph* g);
+  static void writeGeoms(Graph* g, const OsmReadOpts& opts);
   static void deleteOrphEdgs(Graph* g, const OsmReadOpts& opts);
+  static void deleteOrphNds(Graph* g, const OsmReadOpts& opts);
   static double dist(const Node* a, const Node* b);
-  static double webMercDist(const Node* a, const Node* b);
 
-  static NodeGrid buildNodeIdx(Graph* g, size_t size, const BOX& webMercBox,
+  static NodeGrid buildNodeIdx(Graph* g, double size, const BOX& box,
                                bool which);
 
-  static EdgeGrid buildEdgeIdx(Graph* g, size_t size, const BOX& webMercBox);
+  static EdgeGrid buildEdgeIdx(Graph* g, double size, const BOX& box);
 
   static void fixGaps(Graph* g, NodeGrid* ng);
   static void collapseEdges(Graph* g);
   static void writeODirEdgs(Graph* g, Restrictor* restor);
   static void writeSelfEdgs(Graph* g);
+  static void writeOneWayPens(Graph* g, const OsmReadOpts& opts);
+  static void writeNoLinePens(Graph* g, const OsmReadOpts& opts);
   static void writeEdgeTracks(const EdgTracks& tracks);
   static void simplifyGeoms(Graph* g);
-  static uint32_t writeComps(Graph* g);
+  static uint32_t writeComps(Graph* g, const OsmReadOpts& opts);
   static bool edgesSim(const Edge* a, const Edge* b);
   static const EdgePL& mergeEdgePL(Edge* a, Edge* b);
   static void getEdgCands(const POINT& s, EdgeCandPQ* ret, EdgeGrid* eg,
                           double d);
 
-  static std::set<Node*> getMatchingNds(const NodePL& s, NodeGrid* ng,
-                                        double d);
-
-  static Node* getMatchingNd(const NodePL& s, NodeGrid* ng, double d);
-
-  static NodeSet snapStation(Graph* g, NodePL* s, EdgeGrid* eg, NodeGrid* sng,
-                             const OsmReadOpts& opts, Restrictor* restor,
-                             bool surHeur, bool orphSnap, double maxD);
+  static void snapStation(Graph* g, NodePL* s, EdgeGrid* eg, NodeGrid* sng,
+                          const OsmReadOpts& opts, Restrictor* restor,
+                          double maxD);
 
   // Checks if from the edge e, a station similar to si can be reach with less
   // than maxD distance and less or equal to "maxFullTurns" full turns. If
   // such a station exists, it is returned. If not, 0 is returned.
   static Node* eqStatReach(const Edge* e, const StatInfo* si, const POINT& p,
-                           double maxD, int maxFullTurns, double maxAng,
-                           bool orph);
+                           double maxD, int maxFullTurns, double maxAng);
 
   static Node* depthSearch(const Edge* e, const StatInfo* si, const POINT& p,
                            double maxD, int maxFullTurns, double minAngle,
@@ -223,8 +215,6 @@ class OsmBuilder {
                         double maxD, int maxFullTurns, double minAngle);
   static bool keepFullTurn(const trgraph::Node* n, double ang);
 
-  static StatGroup* groupStats(const NodeSet& s);
-
   static NodePL plFromGtfs(const Stop* s, const OsmReadOpts& ops);
 
   std::vector<TransitEdgeLine*> getLines(const std::vector<size_t>& edgeRels,
@@ -254,6 +244,10 @@ class OsmBuilder {
 
   bool relKeep(osmid id, const RelMap& rels, const FlatRels& fl) const;
 
+  uint32_t parseHexColor(std::string) const;
+
+  static uint32_t costToInt(double c);
+
   std::map<TransitEdgeLine, TransitEdgeLine*> _lines;
   std::map<size_t, TransitEdgeLine*> _relLines;
 };
diff --git a/src/pfaedle/osm/OsmFilter.cpp b/src/pfaedle/osm/OsmFilter.cpp
index 589cf5c..d180041 100644
--- a/src/pfaedle/osm/OsmFilter.cpp
+++ b/src/pfaedle/osm/OsmFilter.cpp
@@ -26,6 +26,7 @@ OsmFilter::OsmFilter(const OsmReadOpts& o)
       _posRestr(o.restrPosRestr),
       _negRestr(o.restrNegRestr),
       _noRestr(o.noRestrFilter),
+      _turnCycle(o.turnCycleFilter),
       _levels(o.levelFilters) {}
 
 // _____________________________________________________________________________
@@ -72,6 +73,11 @@ uint64_t OsmFilter::blocker(const AttrMap& attrs) const {
   return contained(attrs, _blocker, NODE);
 }
 
+// _____________________________________________________________________________
+uint64_t OsmFilter::turnCycle(const AttrMap& attrs) const {
+  return contained(attrs, _turnCycle, NODE);
+}
+
 // _____________________________________________________________________________
 uint64_t OsmFilter::contained(const AttrMap& attrs, const MultAttrMap& map,
                               Type t) {
diff --git a/src/pfaedle/osm/OsmFilter.h b/src/pfaedle/osm/OsmFilter.h
index daf353a..05bafc7 100644
--- a/src/pfaedle/osm/OsmFilter.h
+++ b/src/pfaedle/osm/OsmFilter.h
@@ -27,6 +27,7 @@ class OsmFilter {
   uint64_t onewayrev(const AttrMap& attrs) const;
   uint64_t station(const AttrMap& attrs) const;
   uint64_t blocker(const AttrMap& attrs) const;
+  uint64_t turnCycle(const AttrMap& attrs) const;
   uint64_t negRestr(const AttrMap& attrs) const;
   uint64_t posRestr(const AttrMap& attrs) const;
   std::vector<std::string> getAttrKeys() const;
@@ -46,7 +47,7 @@ class OsmFilter {
 
  private:
   MultAttrMap _keep, _drop, _nohup, _oneway, _onewayrev, _twoway, _station,
-      _blocker, _posRestr, _negRestr, _noRestr;
+      _blocker, _posRestr, _negRestr, _noRestr, _turnCycle;
   const MultAttrMap* _levels;
 };
 }  // namespace osm
diff --git a/src/pfaedle/osm/OsmIdSet.cpp b/src/pfaedle/osm/OsmIdSet.cpp
index 8b23bf9..3f79e71 100644
--- a/src/pfaedle/osm/OsmIdSet.cpp
+++ b/src/pfaedle/osm/OsmIdSet.cpp
@@ -15,6 +15,7 @@
 #include <string>
 #include "pfaedle/Def.h"
 #include "pfaedle/osm/OsmIdSet.h"
+#include "util/3rdparty/MurmurHash3.h"
 
 using pfaedle::osm::OsmIdSet;
 
@@ -28,26 +29,46 @@ OsmIdSet::OsmIdSet()
       _last(0),
       _smallest(-1),
       _biggest(0),
+      _hasInv(false),
       _obufpos(0),
       _curBlock(-1),
       _fsize(0) {
   _bitset = new std::bitset<BLOOMF_BITS>();
+  _bitsetNotIn = new std::bitset<BLOOMF_BITS>();
   _file = openTmpFile();
 
   _buffer = new unsigned char[BUFFER_S];
-  _outBuffer = new unsigned char[OBUFFER_S];
+  _outBuffer = new unsigned char[BUFFER_S];
 }
 
 // _____________________________________________________________________________
 OsmIdSet::~OsmIdSet() {
   delete _bitset;
+  delete _bitsetNotIn;
   delete[] _buffer;
   if (!_closed) delete[] _outBuffer;
 }
 
+// _____________________________________________________________________________
+void OsmIdSet::nadd(osmid id) {
+  if (_closed) throw std::exception();
+
+  _hasInv = true;
+
+  uint32_t h1, h2;
+  MurmurHash3_x86_32(&id, 8, 469954432, &h1);
+  h2 = jenkins(id);
+
+  for (int i = 0; i < 5; i++) {
+    uint32_t h = (h1 + i * h2) % BLOOMF_BITS;
+    (*_bitsetNotIn)[h] = 1;
+  }
+}
+
 // _____________________________________________________________________________
 void OsmIdSet::add(osmid id) {
   if (_closed) throw std::exception();
+
   diskAdd(id);
 
   if (_last > id) _sorted = false;
@@ -55,7 +76,14 @@ void OsmIdSet::add(osmid id) {
   if (id < _smallest) _smallest = id;
   if (id > _biggest) _biggest = id;
 
-  for (int i = 0; i < 10; i++) (*_bitset)[hash(id, i)] = 1;
+  uint32_t h1, h2;
+  MurmurHash3_x86_32(&id, 8, 469954432, &h1);
+  h2 = jenkins(id);
+
+  for (int i = 0; i < 5; i++) {
+    uint32_t h = (h1 + i * h2) % BLOOMF_BITS;
+    (*_bitset)[h] = 1;
+  }
 }
 
 // _____________________________________________________________________________
@@ -69,8 +97,8 @@ void OsmIdSet::diskAdd(osmid id) {
     _blockEnds.push_back(id);
   }
 
-  if (_obufpos >= OBUFFER_S) {
-    ssize_t w = cwrite(_file, _outBuffer, OBUFFER_S);
+  if (_obufpos >= BUFFER_S) {
+    ssize_t w = cwrite(_file, _outBuffer, BUFFER_S);
     _fsize += w;
     _obufpos = 0;
   }
@@ -86,7 +114,8 @@ size_t OsmIdSet::getBlock(osmid id) const {
 bool OsmIdSet::diskHas(osmid id) const {
   assert(_sorted);
 
-  if (std::find(_blockEnds.begin(), _blockEnds.end(), id) != _blockEnds.end()) {
+  auto a = std::lower_bound(_blockEnds.begin(), _blockEnds.end(), id);
+  if (a != _blockEnds.end() && *a == id) {
     return true;
   }
 
@@ -125,12 +154,23 @@ bool OsmIdSet::has(osmid id) const {
   LOOKUPS++;
   if (!_closed) close();
 
+  // trivial cases
   if (id < _smallest || id > _biggest) {
     return false;
   }
 
-  for (int i = 0; i < 10; i++) {
-    if ((*_bitset)[hash(id, i)] == 0) return false;
+  uint32_t h1, h2;
+  MurmurHash3_x86_32(&id, 8, 469954432, &h1);
+  h2 = jenkins(id);
+
+  for (int i = 0; i < 5; i++) {
+    uint32_t h = (h1 + i * h2) % BLOOMF_BITS;
+    if ((*_bitset)[h] == 0) {
+      return false;
+    }
+    if (_hasInv && (*_bitsetNotIn)[h] == 0) {
+      return true;
+    }
   }
 
   bool has = diskHas(id);
@@ -249,8 +289,8 @@ size_t OsmIdSet::cread(int f, void* buf, size_t n) const {
 
 // _____________________________________________________________________________
 uint32_t OsmIdSet::knuth(uint32_t in) const {
-  const uint32_t prime = 2654435769;
-  return (in * prime) >> 2;
+  const uint32_t a = 2654435769;
+  return (in * a) >> 2;
 }
 
 // _____________________________________________________________________________
@@ -264,11 +304,6 @@ uint32_t OsmIdSet::jenkins(uint32_t in) const {
   return in >> 2;
 }
 
-// _____________________________________________________________________________
-uint32_t OsmIdSet::hash(uint32_t in, int i) const {
-  return (knuth(in) + jenkins(in) * i) % BLOOMF_BITS;
-}
-
 // _____________________________________________________________________________
 int OsmIdSet::openTmpFile() const {
   const std::string& fname = getTmpFName("", "");
diff --git a/src/pfaedle/osm/OsmIdSet.h b/src/pfaedle/osm/OsmIdSet.h
index d19f9a1..1a16b61 100644
--- a/src/pfaedle/osm/OsmIdSet.h
+++ b/src/pfaedle/osm/OsmIdSet.h
@@ -25,7 +25,7 @@ static const size_t BUFFER_S = 8 * 64 * 1024;
 static const size_t SORT_BUFFER_S = 8 * 64 * 1024;
 static const size_t OBUFFER_S = 8 * 1024 * 1024;
 
-#define BLOOMF_BITS 400000000
+#define BLOOMF_BITS 214748357
 
 /*
  * A disk-based set for OSM ids. Read-access for checking the presence is
@@ -39,6 +39,9 @@ class OsmIdSet {
   // Add an OSM id
   void add(osmid id);
 
+  // Add an OSM id that is NOT contained
+  void nadd(osmid id);
+
   // Check if an OSM id is contained
   bool has(osmid id) const;
 
@@ -57,6 +60,8 @@ class OsmIdSet {
   osmid _smallest;
   osmid _biggest;
 
+  bool _hasInv;
+
   size_t _obufpos;
   mutable size_t _curBlock;
   mutable ssize_t _curBlockSize;
@@ -64,13 +69,14 @@ class OsmIdSet {
   // bloom filter
   std::bitset<BLOOMF_BITS>* _bitset;
 
+  std::bitset<BLOOMF_BITS>* _bitsetNotIn;
+
   mutable std::vector<osmid> _blockEnds;
 
   mutable size_t _fsize;
 
   uint32_t knuth(uint32_t in) const;
   uint32_t jenkins(uint32_t in) const;
-  uint32_t hash(uint32_t in, int i) const;
   void diskAdd(osmid id);
   void close() const;
   void sort() const;
diff --git a/src/pfaedle/osm/OsmReadOpts.h b/src/pfaedle/osm/OsmReadOpts.h
index 47d78ae..5678c51 100644
--- a/src/pfaedle/osm/OsmReadOpts.h
+++ b/src/pfaedle/osm/OsmReadOpts.h
@@ -5,14 +5,14 @@
 #ifndef PFAEDLE_OSM_OSMREADOPTS_H_
 #define PFAEDLE_OSM_OSMREADOPTS_H_
 
+#include <map>
 #include <queue>
-#include <unordered_set>
+#include <set>
 #include <string>
 #include <unordered_map>
-#include <map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
-#include <set>
 #include "pfaedle/osm/Osm.h"
 #include "pfaedle/trgraph/Graph.h"
 #include "pfaedle/trgraph/Normalizer.h"
@@ -77,11 +77,12 @@ struct RelLineRules {
   AttrLst sNameRule;
   AttrLst fromNameRule;
   AttrLst toNameRule;
+  AttrLst colorRule;
 };
 
 inline bool operator==(const RelLineRules& a, const RelLineRules& b) {
   return a.sNameRule == b.sNameRule && a.fromNameRule == b.fromNameRule &&
-         a.toNameRule == b.toNameRule;
+         a.toNameRule == b.toNameRule && a.colorRule == b.colorRule;
 }
 
 struct StationAttrRules {
@@ -94,21 +95,6 @@ inline bool operator==(const StationAttrRules& a, const StationAttrRules& b) {
   return a.nameRule == b.nameRule && a.platformRule == b.platformRule;
 }
 
-struct StatGroupNAttrRule {
-  DeepAttrRule attr;
-  double maxDist;
-};
-
-inline bool operator==(const StatGroupNAttrRule& a,
-                       const StatGroupNAttrRule& b) {
-  return a.attr == b.attr && a.maxDist == b.maxDist;
-}
-
-typedef std::unordered_map<
-    std::string,
-    std::unordered_map<std::string, std::vector<trgraph::StatGroup*>>>
-    StAttrGroups;
-
 struct OsmReadOpts {
   OsmReadOpts() {}
 
@@ -121,7 +107,7 @@ struct OsmReadOpts {
   MultAttrMap twoWayFilter;
   MultAttrMap stationFilter;
   MultAttrMap stationBlockerFilter;
-  std::vector<StatGroupNAttrRule> statGroupNAttrRules;
+  MultAttrMap turnCycleFilter;
 
   trgraph::Normalizer statNormzer;
   trgraph::Normalizer lineNormzer;
@@ -136,14 +122,23 @@ struct OsmReadOpts {
   uint8_t maxSnapLevel;
 
   double maxAngleSnapReach;
-  std::vector<double> maxSnapDistances;
-  double maxSnapFallbackHeurDistance;
+  double maxSnapDistance;
+  double maxStationCandDistance;
   double maxBlockDistance;
 
-  double maxOsmStationDistance;
+  double maxSpeed;
+  double maxSpeedCorFac;
 
-  // TODO(patrick): this is not implemented yet
-  double levelSnapPunishFac[7] = {0, 0, 0, 0, 0, 0, 0};
+  std::vector<double> maxOsmStationDistances;
+
+  // given in km/h, but store in m/s
+  double levelDefSpeed[8] = {85 * 0.2777, 70 * 0.2777, 55 * 0.2777, 40 * 0.2777,
+                             30 * 0.2777, 20 * 0.2777, 10 * 0.2777, 5 * 0.2777};
+
+  double oneWaySpeedPen;
+  double oneWayEntryCost;
+
+  double noLinesPunishFact;
 
   double fullTurnAngle;
 
@@ -154,9 +149,10 @@ struct OsmReadOpts {
 };
 
 inline bool operator==(const OsmReadOpts& a, const OsmReadOpts& b) {
-  if (a.maxSnapDistances.size() != b.maxSnapDistances.size()) return false;
-  for (size_t i = 0; i < a.maxSnapDistances.size(); i++) {
-    if (fabs(a.maxSnapDistances[i] - b.maxSnapDistances[i]) >= 0.1)
+  if (a.maxOsmStationDistances.size() != b.maxOsmStationDistances.size())
+    return false;
+  for (size_t i = 0; i < a.maxOsmStationDistances.size(); i++) {
+    if (fabs(a.maxOsmStationDistances[i] - b.maxOsmStationDistances[i]) >= 0.1)
       return false;
   }
 
@@ -173,24 +169,29 @@ inline bool operator==(const OsmReadOpts& a, const OsmReadOpts& b) {
          a.twoWayFilter == b.twoWayFilter &&
          a.stationFilter == b.stationFilter &&
          a.stationBlockerFilter == b.stationBlockerFilter &&
-         a.statGroupNAttrRules == b.statGroupNAttrRules &&
+         a.turnCycleFilter == b.turnCycleFilter &&
          a.statNormzer == b.statNormzer && a.lineNormzer == b.lineNormzer &&
          a.trackNormzer == b.trackNormzer && a.relLinerules == b.relLinerules &&
          a.statAttrRules == b.statAttrRules &&
          a.maxSnapLevel == b.maxSnapLevel &&
          fabs(a.maxAngleSnapReach - b.maxAngleSnapReach) < 0.1 &&
-         fabs(a.maxOsmStationDistance - b.maxOsmStationDistance) < 0.1 &&
-         fabs(a.maxSnapFallbackHeurDistance - b.maxSnapFallbackHeurDistance) <
-             0.1 &&
+         fabs(a.maxSnapDistance - b.maxSnapDistance) < 0.1 &&
+         fabs(a.maxStationCandDistance - b.maxStationCandDistance) < 0.1 &&
          fabs(a.maxBlockDistance - b.maxBlockDistance) < 0.1 &&
-         fabs(a.levelSnapPunishFac[0] - b.levelSnapPunishFac[0]) < 0.1 &&
-         fabs(a.levelSnapPunishFac[1] - b.levelSnapPunishFac[1]) < 0.1 &&
-         fabs(a.levelSnapPunishFac[2] - b.levelSnapPunishFac[2]) < 0.1 &&
-         fabs(a.levelSnapPunishFac[3] - b.levelSnapPunishFac[3]) < 0.1 &&
-         fabs(a.levelSnapPunishFac[4] - b.levelSnapPunishFac[4]) < 0.1 &&
-         fabs(a.levelSnapPunishFac[5] - b.levelSnapPunishFac[5]) < 0.1 &&
-         fabs(a.levelSnapPunishFac[6] - b.levelSnapPunishFac[6]) < 0.1 &&
+         fabs(a.levelDefSpeed[0] - b.levelDefSpeed[0]) < 0.1 &&
+         fabs(a.levelDefSpeed[1] - b.levelDefSpeed[1]) < 0.1 &&
+         fabs(a.levelDefSpeed[2] - b.levelDefSpeed[2]) < 0.1 &&
+         fabs(a.levelDefSpeed[3] - b.levelDefSpeed[3]) < 0.1 &&
+         fabs(a.levelDefSpeed[4] - b.levelDefSpeed[4]) < 0.1 &&
+         fabs(a.levelDefSpeed[5] - b.levelDefSpeed[5]) < 0.1 &&
+         fabs(a.levelDefSpeed[6] - b.levelDefSpeed[6]) < 0.1 &&
+         fabs(a.levelDefSpeed[7] - b.levelDefSpeed[7]) < 0.1 &&
+         fabs(a.oneWaySpeedPen - b.oneWaySpeedPen) < 0.1 &&
+         fabs(a.oneWayEntryCost - b.oneWayEntryCost) < 0.1 &&
+         fabs(a.noLinesPunishFact - b.noLinesPunishFact) < 0.1 &&
          fabs(a.fullTurnAngle - b.fullTurnAngle) < 0.1 &&
+         fabs(a.maxSpeedCorFac - b.maxSpeedCorFac) < 0.1 &&
+         fabs(a.maxSpeed - b.maxSpeed) < 0.1 &&
          a.restrPosRestr == b.restrPosRestr &&
          a.restrNegRestr == b.restrNegRestr &&
          a.noRestrFilter == b.noRestrFilter;
diff --git a/src/pfaedle/router/Comp.h b/src/pfaedle/router/Comp.h
index 349ff04..cdadc21 100644
--- a/src/pfaedle/router/Comp.h
+++ b/src/pfaedle/router/Comp.h
@@ -16,7 +16,7 @@ namespace router {
 using util::editDist;
 
 // _____________________________________________________________________________
-inline double statSimi(const std::string& a, const std::string& b) {
+inline bool statSimi(const std::string& a, const std::string& b) {
   if (a == b) return 1;
 
   if (a.empty() || b.empty()) return 0;
@@ -55,7 +55,7 @@ inline double statSimi(const std::string& a, const std::string& b) {
 }
 
 // _____________________________________________________________________________
-inline double lineSimi(const std::string& a, const std::string& b) {
+inline bool lineSimi(const std::string& a, const std::string& b) {
   if (a == b) return 1;
 
   if (a.empty() || b.empty()) return 0;
diff --git a/src/pfaedle/router/EdgePL.cpp b/src/pfaedle/router/EdgePL.cpp
deleted file mode 100644
index a166b5b..0000000
--- a/src/pfaedle/router/EdgePL.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#include "pfaedle/Def.h"
-#include "util/geo/Geo.h"
-#include "pfaedle/router/EdgePL.h"
-#include "pfaedle/router/Router.h"
-#include "util/String.h"
-
-using pfaedle::router::EdgePL;
-using pfaedle::router::EdgeCost;
-using pfaedle::router::EdgeList;
-using pfaedle::trgraph::Node;
-
-// _____________________________________________________________________________
-EdgeList* EdgePL::getEdges() { return &_edges; }
-
-// _____________________________________________________________________________
-const EdgeList& EdgePL::getEdges() const { return _edges; }
-
-// _____________________________________________________________________________
-const POINT& EdgePL::frontHop() const {
-  if (!_edges.size()) return *_end->pl().getGeom();
-  return _edges.back()->pl().frontHop();
-}
-
-// _____________________________________________________________________________
-const POINT& EdgePL::backHop() const {
-  if (!_edges.size()) return *_start->pl().getGeom();
-  return _edges.front()->pl().backHop();
-}
-
-// _____________________________________________________________________________
-const Node* EdgePL::backNode() const { return _end; }
-
-// _____________________________________________________________________________
-const Node* EdgePL::frontNode() const { return _start; }
-
-// _____________________________________________________________________________
-const LINE* EdgePL::getGeom() const {
-  if (!_edges.size()) return 0;
-  if (!_geom.size()) {
-    const trgraph::Node* l = _start;
-    for (auto i = _edges.rbegin(); i != _edges.rend(); i++) {
-      const auto e = *i;
-      if ((e->getFrom() == l) ^ e->pl().isRev()) {
-        _geom.insert(_geom.end(), e->pl().getGeom()->begin(),
-                     e->pl().getGeom()->end());
-      } else {
-        _geom.insert(_geom.end(), e->pl().getGeom()->rbegin(),
-                     e->pl().getGeom()->rend());
-      }
-      l = e->getOtherNd(l);
-    }
-  }
-
-  return &_geom;
-}
-
-// _____________________________________________________________________________
-void EdgePL::setStartNode(const trgraph::Node* s) { _start = s; }
-
-// _____________________________________________________________________________
-void EdgePL::setEndNode(const trgraph::Node* e) { _end = e; }
-
-// _____________________________________________________________________________
-void EdgePL::setStartEdge(const trgraph::Edge* s) { _startE = s; }
-
-// _____________________________________________________________________________
-void EdgePL::setEndEdge(const trgraph::Edge* e) { _endE = e; }
-
-// _____________________________________________________________________________
-const EdgeCost& EdgePL::getCost() const { return _cost; }
-
-// _____________________________________________________________________________
-void EdgePL::setCost(const router::EdgeCost& c) { _cost = c; }
-
-// _____________________________________________________________________________
-util::json::Dict EdgePL::getAttrs() const {
-  util::json::Dict obj;
-  obj["cost"] = std::to_string(_cost.getValue());
-  obj["from_edge"] = util::toString(_startE);
-  obj["to_edge"] = util::toString(_endE);
-  obj["dummy"] = _edges.size() ? "no" : "yes";
-
-  return obj;
-}
diff --git a/src/pfaedle/router/EdgePL.h b/src/pfaedle/router/EdgePL.h
deleted file mode 100644
index 024b9a2..0000000
--- a/src/pfaedle/router/EdgePL.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#ifndef PFAEDLE_ROUTER_EDGEPL_H_
-#define PFAEDLE_ROUTER_EDGEPL_H_
-
-#include <map>
-#include <string>
-#include "pfaedle/Def.h"
-#include "pfaedle/router/Misc.h"
-#include "util/geo/Geo.h"
-#include "util/geo/GeoGraph.h"
-
-using util::geograph::GeoEdgePL;
-
-namespace pfaedle {
-namespace router {
-
-class EdgePL {
- public:
-  EdgePL() : _cost(), _start(0), _end(0), _startE(0), _endE(0) {}
-  const LINE* getGeom() const;
-  util::json::Dict getAttrs() const;
-  router::EdgeList* getEdges();
-  const router::EdgeList& getEdges() const;
-  void setStartNode(const trgraph::Node* s);
-  void setEndNode(const trgraph::Node* s);
-  void setStartEdge(const trgraph::Edge* s);
-  void setEndEdge(const trgraph::Edge* s);
-  const router::EdgeCost& getCost() const;
-  void setCost(const router::EdgeCost& c);
-  const POINT& frontHop() const;
-  const POINT& backHop() const;
-  const trgraph::Node* frontNode() const;
-  const trgraph::Node* backNode() const;
-
- private:
-  router::EdgeCost _cost;
-  // the edges are in this field in REVERSED ORDER!
-  router::EdgeList _edges;
-  const trgraph::Node* _start;
-  const trgraph::Node* _end;
-  const trgraph::Edge* _startE;
-  const trgraph::Edge* _endE;
-  mutable LINE _geom;
-};
-}  // namespace router
-}  // namespace pfaedle
-
-#endif  // PFAEDLE_ROUTER_EDGEPL_H_
diff --git a/src/pfaedle/router/Graph.h b/src/pfaedle/router/Graph.h
deleted file mode 100644
index 88d7345..0000000
--- a/src/pfaedle/router/Graph.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#ifndef PFAEDLE_ROUTER_GRAPH_H_
-#define PFAEDLE_ROUTER_GRAPH_H_
-
-#include "pfaedle/trgraph/Graph.h"
-#include "pfaedle/router/EdgePL.h"
-#include "pfaedle/router/NodePL.h"
-#include "util/graph/DirGraph.h"
-
-using util::geo::Point;
-using util::geo::Line;
-
-namespace pfaedle {
-namespace router {
-
-typedef util::graph::Edge<router::NodePL, router::EdgePL> Edge;
-typedef util::graph::Node<router::NodePL, router::EdgePL> Node;
-typedef util::graph::DirGraph<router::NodePL, router::EdgePL> Graph;
-
-}  // namespace router
-}  // namespace pfaedle
-
-#endif  // PFAEDLE_ROUTER_GRAPH_H_
diff --git a/src/pfaedle/router/HopCache.cpp b/src/pfaedle/router/HopCache.cpp
new file mode 100644
index 0000000..bb53290
--- /dev/null
+++ b/src/pfaedle/router/HopCache.cpp
@@ -0,0 +1,40 @@
+// Copyright 2020, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <utility>
+#include <set>
+#include "pfaedle/router/HopCache.h"
+#include "pfaedle/trgraph/Graph.h"
+#include "util/Misc.h"
+
+using pfaedle::router::HopCache;
+using pfaedle::trgraph::Edge;
+
+// _____________________________________________________________________________
+void HopCache::setMin(const Edge* a, const Edge* b, uint32_t val) {
+  _cache.set(a, b, val);
+}
+
+// _____________________________________________________________________________
+void HopCache::setEx(const Edge* a, const Edge* b, uint32_t val) {
+  int64_t v = val;
+  _cache.set(a, b, -(v + 1));
+}
+
+// _____________________________________________________________________________
+void HopCache::setMin(const Edge* a, const std::set<Edge*>& b, uint32_t val) {
+  for (auto eb : b) _cache.set(a, eb, val);
+}
+
+// _____________________________________________________________________________
+void HopCache::setMin(const std::set<Edge*>& a, const Edge* b, uint32_t val) {
+  for (auto ea : a) _cache.set(ea, b, val);
+}
+
+// _____________________________________________________________________________
+std::pair<uint32_t, bool> HopCache::get(const Edge* a, const Edge* b) const {
+  int64_t v = _cache.get(a, b);
+  if (v < 0) return {(-v) - 1, 1};
+  return {v, 0};
+}
diff --git a/src/pfaedle/router/HopCache.h b/src/pfaedle/router/HopCache.h
new file mode 100644
index 0000000..43d17af
--- /dev/null
+++ b/src/pfaedle/router/HopCache.h
@@ -0,0 +1,39 @@
+// Copyright 2020, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef PFAEDLE_ROUTER_HOPCACHE_H_
+#define PFAEDLE_ROUTER_HOPCACHE_H_
+
+#include <map>
+#include <set>
+#include <utility>
+#include "pfaedle/trgraph/Graph.h"
+#include "util/Misc.h"
+
+namespace pfaedle {
+namespace router {
+
+class HopCache {
+ public:
+  void setMin(const trgraph::Edge* a, const trgraph::Edge* b, uint32_t val);
+
+  void setMin(const trgraph::Edge* a, const std::set<trgraph::Edge*>& b,
+              uint32_t val);
+
+  void setMin(const std::set<trgraph::Edge*>& a, const trgraph::Edge* b,
+              uint32_t val);
+
+  void setEx(const trgraph::Edge* a, const trgraph::Edge* b, uint32_t val);
+
+  std::pair<uint32_t, bool> get(const trgraph::Edge* a,
+                                const trgraph::Edge* b) const;
+
+ private:
+  util::SparseMatrix<const trgraph::Edge*, int64_t, 0> _cache;
+};
+
+}  // namespace router
+}  // namespace pfaedle
+
+#endif  // PFAEDLE_ROUTER_HOPCACHE_H_
diff --git a/src/pfaedle/router/Misc.h b/src/pfaedle/router/Misc.h
index 1c69c40..237c8b1 100644
--- a/src/pfaedle/router/Misc.h
+++ b/src/pfaedle/router/Misc.h
@@ -21,132 +21,75 @@ using ad::cppgtfs::gtfs::Stop;
 namespace pfaedle {
 namespace router {
 
-struct NodeCand {
-  trgraph::Node* nd;
-  double pen;
-};
+extern double time;
 
 struct EdgeCand {
   trgraph::Edge* e;
   double pen;
+  double progr;
+  POINT point;
+  int time;
+  std::vector<size_t> depPrede;
 };
 
 struct RoutingOpts {
   RoutingOpts()
-      : fullTurnPunishFac(2000),
+      : fullTurnPunishFac(1000),
         fullTurnAngle(45),
-        passThruStationsPunish(100),
-        oneWayPunishFac(1),
-        oneWayEdgePunish(0),
-        lineUnmatchedPunishFact(0.5),
-        noLinesPunishFact(0),
+        lineUnmatchedPunishFact(1),
+        lineNameFromUnmatchedPunishFact(1),
+        lineNameToUnmatchedPunishFact(1),
+        noLinesPunishFact(1),
         platformUnmatchedPen(0),
         stationDistPenFactor(0),
+        turnRestrCost(0),
         popReachEdge(true),
         noSelfHops(true) {}
-  double fullTurnPunishFac;
+  uint32_t fullTurnPunishFac;
   double fullTurnAngle;
-  double passThruStationsPunish;
-  double oneWayPunishFac;
-  double oneWayEdgePunish;
   double lineUnmatchedPunishFact;
+  double lineNameFromUnmatchedPunishFact;
+  double lineNameToUnmatchedPunishFact;
   double noLinesPunishFact;
   double platformUnmatchedPen;
+  double stationUnmatchedPen;
   double stationDistPenFactor;
-  double nonOsmPen;
-  double levelPunish[8];
+  double nonStationPen;
+  uint32_t turnRestrCost;
   bool popReachEdge;
   bool noSelfHops;
+  bool useStations;
+  double transitionPen;
+  std::string transPenMethod;
 };
 
 // _____________________________________________________________________________
 inline bool operator==(const RoutingOpts& a, const RoutingOpts& b) {
-  return fabs(a.fullTurnPunishFac - b.fullTurnPunishFac) < 0.01 &&
+  return a.fullTurnPunishFac == b.fullTurnPunishFac &&
          fabs(a.fullTurnAngle - b.fullTurnAngle) < 0.01 &&
-         fabs(a.passThruStationsPunish - b.passThruStationsPunish) < 0.01 &&
-         fabs(a.oneWayPunishFac - b.oneWayPunishFac) < 0.01 &&
-         fabs(a.oneWayEdgePunish - b.oneWayEdgePunish) < 0.01 &&
          fabs(a.lineUnmatchedPunishFact - b.lineUnmatchedPunishFact) < 0.01 &&
+         fabs(a.lineNameFromUnmatchedPunishFact -
+              b.lineNameFromUnmatchedPunishFact) < 0.01 &&
+         fabs(a.lineNameToUnmatchedPunishFact -
+              b.lineNameToUnmatchedPunishFact) < 0.01 &&
          fabs(a.noLinesPunishFact - b.noLinesPunishFact) < 0.01 &&
          fabs(a.platformUnmatchedPen - b.platformUnmatchedPen) < 0.01 &&
+         fabs(a.stationUnmatchedPen - b.stationUnmatchedPen) < 0.01 &&
          fabs(a.stationDistPenFactor - b.stationDistPenFactor) < 0.01 &&
-         fabs(a.nonOsmPen - b.nonOsmPen) < 0.01 &&
-         fabs(a.levelPunish[0] - b.levelPunish[0]) < 0.01 &&
-         fabs(a.levelPunish[1] - b.levelPunish[1]) < 0.01 &&
-         fabs(a.levelPunish[2] - b.levelPunish[2]) < 0.01 &&
-         fabs(a.levelPunish[3] - b.levelPunish[3]) < 0.01 &&
-         fabs(a.levelPunish[4] - b.levelPunish[4]) < 0.01 &&
-         fabs(a.levelPunish[5] - b.levelPunish[5]) < 0.01 &&
-         fabs(a.levelPunish[6] - b.levelPunish[6]) < 0.01 &&
-         fabs(a.levelPunish[7] - b.levelPunish[7]) < 0.01 &&
-         a.popReachEdge == b.popReachEdge && a.noSelfHops == b.noSelfHops;
-}
-
-struct EdgeCost {
-  EdgeCost() : _cost(0) {}
-  explicit EdgeCost(double cost) : _cost(cost) {}
-  EdgeCost(double mDist, double mDistLvl1, double mDistLvl2, double mDistLvl3,
-           double mDistLvl4, double mDistLvl5, double mDistLvl6,
-           double mDistLvl7, uint32_t fullTurns, int32_t passThru,
-           double oneWayMeters, size_t oneWayEdges, double lineUnmatchedMeters,
-           double noLinesMeters, double reachPen, const RoutingOpts* o) {
-    if (!o) {
-      _cost = mDist + reachPen;
-    } else {
-      _cost = mDist * o->levelPunish[0] + mDistLvl1 * o->levelPunish[1] +
-              mDistLvl2 * o->levelPunish[2] + mDistLvl3 * o->levelPunish[3] +
-              mDistLvl4 * o->levelPunish[4] + mDistLvl5 * o->levelPunish[5] +
-              mDistLvl6 * o->levelPunish[6] + mDistLvl7 * o->levelPunish[7] +
-              oneWayMeters * o->oneWayPunishFac +
-              oneWayEdges * o->oneWayEdgePunish +
-              lineUnmatchedMeters * o->lineUnmatchedPunishFact +
-              noLinesMeters * o->noLinesPunishFact +
-              fullTurns * o->fullTurnPunishFac +
-              passThru * o->passThruStationsPunish + reachPen;
-    }
-  }
-
-  float _cost;
-
-  double getValue() const { return _cost; }
-};
-
-// _____________________________________________________________________________
-inline EdgeCost operator+(const EdgeCost& a, const EdgeCost& b) {
-  return EdgeCost(a.getValue() + b.getValue());
-}
-
-// _____________________________________________________________________________
-inline bool operator<=(const EdgeCost& a, const EdgeCost& b) {
-  return a.getValue() <= b.getValue();
-}
-
-// _____________________________________________________________________________
-inline bool operator==(const EdgeCost& a, const EdgeCost& b) {
-  return a.getValue() == b.getValue();
-}
-
-// _____________________________________________________________________________
-inline bool operator>(const EdgeCost& a, const EdgeCost& b) {
-  return a.getValue() > b.getValue();
-}
-
-// _____________________________________________________________________________
-template <typename F>
-inline bool angSmaller(const Point<F>& f, const Point<F>& m, const Point<F>& t,
-                       double ang) {
-  if (util::geo::innerProd(m, f, t) < ang) return 1;
-  return 0;
+         a.turnRestrCost == b.turnRestrCost &&
+         fabs(a.transitionPen - b.transitionPen) < 0.01 &&
+         fabs(a.nonStationPen - b.nonStationPen) < 0.01 &&
+         a.transPenMethod == b.transPenMethod &&
+         a.useStations == b.useStations && a.popReachEdge == b.popReachEdge &&
+         a.noSelfHops == b.noSelfHops;
 }
 
 typedef std::set<trgraph::Node*> NodeSet;
 typedef std::set<trgraph::Edge*> EdgeSet;
 typedef std::unordered_map<const Stop*, trgraph::Node*> FeedStops;
 
-typedef std::vector<NodeCand> NodeCandGroup;
-typedef std::vector<NodeCandGroup> NodeCandRoute;
-
 typedef std::vector<EdgeCand> EdgeCandGroup;
+typedef std::vector<EdgeCandGroup> EdgeCandMap;
 typedef std::vector<EdgeCandGroup> EdgeCandRoute;
 
 typedef std::vector<trgraph::Edge*> EdgeList;
@@ -154,8 +97,12 @@ typedef std::vector<trgraph::Node*> NodeList;
 
 struct EdgeListHop {
   EdgeList edges;
-  const trgraph::Node* start;
-  const trgraph::Node* end;
+  const trgraph::Edge* start;
+  const trgraph::Edge* end;
+  double progrStart;
+  double progrEnd;
+  POINT pointStart;
+  POINT pointEnd;
 };
 
 typedef std::vector<EdgeListHop> EdgeListHops;
diff --git a/src/pfaedle/router/NodePL.h b/src/pfaedle/router/NodePL.h
deleted file mode 100644
index a9c2ea4..0000000
--- a/src/pfaedle/router/NodePL.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#ifndef PFAEDLE_ROUTER_NODEPL_H_
-#define PFAEDLE_ROUTER_NODEPL_H_
-
-#include <map>
-#include <string>
-#include "pfaedle/trgraph/Graph.h"
-#include "util/geo/GeoGraph.h"
-#include "util/geo/Geo.h"
-#include "pfaedle/Def.h"
-
-using util::geograph::GeoNodePL;
-
-
-namespace pfaedle {
-namespace router {
-
-class NodePL {
- public:
-  NodePL() : _n(0) {}
-  NodePL(const pfaedle::trgraph::Node* n) : _n(n) {}  // NOLINT
-
-  const POINT* getGeom() const {
-    return !_n ? 0 : _n->pl().getGeom();
-  }
-  util::json::Dict getAttrs() const {
-    if (_n) return _n->pl().getAttrs();
-    return util::json::Dict();
-  }
-
- private:
-  const pfaedle::trgraph::Node* _n;
-};
-}  // namespace router
-}  // namespace pfaedle
-
-#endif  // PFAEDLE_ROUTER_NODEPL_H_
diff --git a/src/pfaedle/router/Router.cpp b/src/pfaedle/router/Router.cpp
deleted file mode 100644
index c2e0055..0000000
--- a/src/pfaedle/router/Router.cpp
+++ /dev/null
@@ -1,646 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#ifdef _OPENMP
-#include <omp.h>
-#else
-#define omp_get_thread_num() 0
-#define omp_get_num_procs() 1
-#endif
-
-#include <algorithm>
-#include <fstream>
-#include <limits>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-#include "pfaedle/router/Comp.h"
-#include "pfaedle/router/Router.h"
-#include "pfaedle/router/RoutingAttrs.h"
-#include "util/geo/output/GeoGraphJsonOutput.h"
-#include "util/graph/Dijkstra.h"
-#include "util/graph/EDijkstra.h"
-#include "util/log/Log.h"
-
-using pfaedle::router::Router;
-using pfaedle::router::EdgeCost;
-using pfaedle::router::CostFunc;
-using pfaedle::router::DistHeur;
-using pfaedle::router::NCostFunc;
-using pfaedle::router::NDistHeur;
-using pfaedle::router::CombCostFunc;
-using pfaedle::router::EdgeListHop;
-using pfaedle::router::EdgeListHops;
-using pfaedle::router::RoutingOpts;
-using pfaedle::router::RoutingAttrs;
-using pfaedle::router::HopBand;
-using pfaedle::router::NodeCandRoute;
-using util::graph::EDijkstra;
-using util::graph::Dijkstra;
-using util::geo::webMercMeterDist;
-
-// _____________________________________________________________________________
-EdgeCost NCostFunc::operator()(const trgraph::Node* from,
-                               const trgraph::Edge* e,
-                               const trgraph::Node* to) const {
-  UNUSED(to);
-  if (!from) return EdgeCost();
-
-  int oneway = e->pl().oneWay() == 2;
-  int32_t stationSkip = 0;
-
-  return EdgeCost(e->pl().lvl() == 0 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 1 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 2 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 3 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 4 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 5 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 6 ? e->pl().getLength() : 0,
-                  e->pl().lvl() == 7 ? e->pl().getLength() : 0, 0, stationSkip,
-                  e->pl().getLength() * oneway, oneway, 0, 0, 0, &_rOpts);
-}
-
-// _____________________________________________________________________________
-EdgeCost CostFunc::operator()(const trgraph::Edge* from, const trgraph::Node* n,
-                              const trgraph::Edge* to) const {
-  if (!from) return EdgeCost();
-
-  uint32_t fullTurns = 0;
-  int oneway = from->pl().oneWay() == 2;
-  int32_t stationSkip = 0;
-
-  if (n) {
-    if (from->getFrom() == to->getTo() && from->getTo() == to->getFrom()) {
-      // trivial full turn
-      fullTurns = 1;
-    } else if (n->getDeg() > 2) {
-      // otherwise, only intersection angles will be punished
-      fullTurns = router::angSmaller(from->pl().backHop(), *n->pl().getGeom(),
-                                     to->pl().frontHop(), _rOpts.fullTurnAngle);
-    }
-
-    if (from->pl().isRestricted() && !_res.may(from, to, n)) oneway = 1;
-
-    // for debugging
-    n->pl().setVisited();
-
-    if (_tgGrp && n->pl().getSI() && n->pl().getSI()->getGroup() != _tgGrp)
-      stationSkip = 1;
-  }
-
-  double transitLinePen = transitLineCmp(from->pl());
-  bool noLines = (_rAttrs.shortName.empty() && _rAttrs.toString.empty() &&
-                  _rAttrs.fromString.empty() && from->pl().getLines().empty());
-
-  return EdgeCost(from->pl().lvl() == 0 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 1 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 2 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 3 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 4 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 5 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 6 ? from->pl().getLength() : 0,
-                  from->pl().lvl() == 7 ? from->pl().getLength() : 0, fullTurns,
-                  stationSkip, from->pl().getLength() * oneway, oneway,
-                  from->pl().getLength() * transitLinePen,
-                  noLines ? from->pl().getLength() : 0, 0, &_rOpts);
-}
-
-// _____________________________________________________________________________
-double CostFunc::transitLineCmp(const trgraph::EdgePL& e) const {
-  if (_rAttrs.shortName.empty() && _rAttrs.toString.empty() &&
-      _rAttrs.fromString.empty())
-    return 0;
-  double best = 1;
-  for (const auto* l : e.getLines()) {
-    double cur = _rAttrs.simi(l);
-
-    if (cur < 0.0001) return 0;
-    if (cur < best) best = cur;
-  }
-
-  return best;
-}
-
-// _____________________________________________________________________________
-NDistHeur::NDistHeur(const RoutingOpts& rOpts,
-                     const std::set<trgraph::Node*>& tos)
-    : _rOpts(rOpts), _maxCentD(0) {
-  size_t c = 0;
-  double x = 0, y = 0;
-  for (auto to : tos) {
-    x += to->pl().getGeom()->getX();
-    y += to->pl().getGeom()->getY();
-    c++;
-  }
-
-  x /= c;
-  y /= c;
-  _center = POINT(x, y);
-
-  for (auto to : tos) {
-    double cur = webMercMeterDist(*to->pl().getGeom(), _center);
-    if (cur > _maxCentD) _maxCentD = cur;
-  }
-}
-
-// _____________________________________________________________________________
-DistHeur::DistHeur(uint8_t minLvl, const RoutingOpts& rOpts,
-                   const std::set<trgraph::Edge*>& tos)
-    : _rOpts(rOpts), _lvl(minLvl), _maxCentD(0) {
-  size_t c = 0;
-  double x = 0, y = 0;
-  for (auto to : tos) {
-    x += to->getFrom()->pl().getGeom()->getX();
-    y += to->getFrom()->pl().getGeom()->getY();
-    c++;
-  }
-
-  x /= c;
-  y /= c;
-  _center = POINT(x, y);
-
-  for (auto to : tos) {
-    double cur = webMercMeterDist(*to->getFrom()->pl().getGeom(), _center) *
-                 _rOpts.levelPunish[_lvl];
-    if (cur > _maxCentD) _maxCentD = cur;
-  }
-}
-
-// _____________________________________________________________________________
-EdgeCost DistHeur::operator()(const trgraph::Edge* a,
-                              const std::set<trgraph::Edge*>& b) const {
-  UNUSED(b);
-  double cur = webMercMeterDist(*a->getFrom()->pl().getGeom(), _center) *
-               _rOpts.levelPunish[_lvl];
-
-  return EdgeCost(cur - _maxCentD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-// _____________________________________________________________________________
-EdgeCost NDistHeur::operator()(const trgraph::Node* a,
-                               const std::set<trgraph::Node*>& b) const {
-  UNUSED(b);
-  double cur = webMercMeterDist(*a->pl().getGeom(), _center);
-
-  return EdgeCost(cur - _maxCentD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-}
-
-// _____________________________________________________________________________
-double CombCostFunc::operator()(const router::Edge* from, const router::Node* n,
-                                const router::Edge* to) const {
-  UNUSED(n);
-  UNUSED(from);
-  return to->pl().getCost().getValue();
-}
-
-// _____________________________________________________________________________
-Router::Router(size_t numThreads, bool caching)
-    : _cache(numThreads), _caching(caching) {
-  for (size_t i = 0; i < numThreads; i++) {
-    _cache[i] = new Cache();
-  }
-}
-
-// _____________________________________________________________________________
-Router::~Router() {
-  for (size_t i = 0; i < _cache.size(); i++) {
-    delete _cache[i];
-  }
-}
-
-// _____________________________________________________________________________
-bool Router::compConned(const EdgeCandGroup& a, const EdgeCandGroup& b) const {
-  for (auto n1 : a) {
-    for (auto n2 : b) {
-      if (n1.e->getFrom()->pl().getComp() == n2.e->getFrom()->pl().getComp())
-        return true;
-    }
-  }
-
-  return false;
-}
-
-// _____________________________________________________________________________
-HopBand Router::getHopBand(const EdgeCandGroup& a, const EdgeCandGroup& b,
-                           const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                           const osm::Restrictor& rest) const {
-  assert(a.size());
-  assert(b.size());
-
-  double pend = 0;
-  for (size_t i = 0; i < a.size(); i++) {
-    for (size_t j = 0; j < b.size(); j++) {
-      double d = webMercMeterDist(*a[i].e->getFrom()->pl().getGeom(),
-                                  *b[j].e->getFrom()->pl().getGeom());
-      if (d > pend) pend = d;
-    }
-  }
-
-  LOG(VDEBUG) << "Pending max hop distance is " << pend << " meters";
-
-  const trgraph::StatGroup* tgGrpTo = 0;
-
-  if (b.begin()->e->getFrom()->pl().getSI())
-    tgGrpTo = b.begin()->e->getFrom()->pl().getSI()->getGroup();
-
-  CostFunc costF(rAttrs, rOpts, rest, tgGrpTo, pend * 50);
-
-  std::set<trgraph::Edge *> from, to;
-
-  for (auto e : a) from.insert(e.e);
-  for (auto e : b) to.insert(e.e);
-
-  LOG(VDEBUG) << "Doing pilot run between " << from.size() << "->" << to.size()
-              << " edge candidates";
-
-  EdgeList el;
-  EdgeCost ret = costF.inf();
-  DistHeur distH(0, rOpts, to);
-
-  if (compConned(a, b))
-    ret = EDijkstra::shortestPath(from, to, costF, distH, &el);
-
-  if (el.size() < 2 && costF.inf() <= ret) {
-    LOG(VDEBUG) << "Pilot run: no connection between candidate groups,"
-                << " setting max distance to 1";
-    return HopBand{0, 1, 0, 0};
-  }
-
-  // cache the found path, will save a few dijkstra iterations
-  nestedCache(&el, from, costF, rAttrs);
-
-  auto na = el.back()->getFrom();
-  auto nb = el.front()->getFrom();
-
-  double maxStrD = 0;
-
-  for (auto e : to) {
-    double d = webMercMeterDist(*el.front()->getFrom()->pl().getGeom(),
-                                *e->getTo()->pl().getGeom());
-    if (d > maxStrD) maxStrD = d;
-  }
-
-  // TODO(patrick): derive the punish level here automatically
-  double maxD = std::max(ret.getValue(), pend * rOpts.levelPunish[2]) * 3 +
-                rOpts.fullTurnPunishFac + rOpts.platformUnmatchedPen;
-  double minD = ret.getValue();
-
-  LOG(VDEBUG) << "Pilot run: min distance between two groups is "
-              << ret.getValue() << " (between nodes " << na << " and " << nb
-              << "), using a max routing distance of " << maxD << ". The max"
-              << " straight line distance from the pilot target to any other "
-                 "target node was"
-              << " " << maxStrD << ".";
-
-  return HopBand{minD, maxD, el.front(), maxStrD};
-}
-
-// _____________________________________________________________________________
-EdgeListHops Router::routeGreedy(const NodeCandRoute& route,
-                                 const RoutingAttrs& rAttrs,
-                                 const RoutingOpts& rOpts,
-                                 const osm::Restrictor& rest) const {
-  if (route.size() < 2) return EdgeListHops();
-  EdgeListHops ret(route.size() - 1);
-
-  for (size_t i = 0; i < route.size() - 1; i++) {
-    const trgraph::StatGroup* tgGrp = 0;
-    std::set<trgraph::Node *> from, to;
-    for (auto c : route[i]) from.insert(c.nd);
-    for (auto c : route[i + 1]) to.insert(c.nd);
-    if (route[i + 1].begin()->nd->pl().getSI())
-      tgGrp = route[i + 1].begin()->nd->pl().getSI()->getGroup();
-
-    NCostFunc cost(rAttrs, rOpts, rest, tgGrp);
-    NDistHeur dist(rOpts, to);
-
-    NodeList nodesRet;
-    EdgeListHop hop;
-    Dijkstra::shortestPath(from, to, cost, dist, &hop.edges, &nodesRet);
-
-    if (nodesRet.size() > 1) {
-      // careful: nodesRet is reversed!
-      hop.start = nodesRet.back();
-      hop.end = nodesRet.front();
-    } else {
-      // just take the first candidate if no route could be found
-      hop.start = *from.begin();
-      hop.end = *to.begin();
-    }
-
-    ret[i] = hop;
-  }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-EdgeListHops Router::routeGreedy2(const NodeCandRoute& route,
-                                  const RoutingAttrs& rAttrs,
-                                  const RoutingOpts& rOpts,
-                                  const osm::Restrictor& rest) const {
-  if (route.size() < 2) return EdgeListHops();
-  EdgeListHops ret(route.size() - 1);
-
-  for (size_t i = 0; i < route.size() - 1; i++) {
-    const trgraph::StatGroup* tgGrp = 0;
-    std::set<trgraph::Node *> from, to;
-
-    if (i == 0)
-      for (auto c : route[i]) from.insert(c.nd);
-    else
-      from.insert(const_cast<trgraph::Node*>(ret[i - 1].end));
-
-    for (auto c : route[i + 1]) to.insert(c.nd);
-
-    if (route[i + 1].begin()->nd->pl().getSI())
-      tgGrp = route[i + 1].begin()->nd->pl().getSI()->getGroup();
-
-    NCostFunc cost(rAttrs, rOpts, rest, tgGrp);
-    NDistHeur dist(rOpts, to);
-
-    NodeList nodesRet;
-    EdgeListHop hop;
-    Dijkstra::shortestPath(from, to, cost, dist, &hop.edges, &nodesRet);
-    if (nodesRet.size() > 1) {
-      // careful: nodesRet is reversed!
-      hop.start = nodesRet.back();
-      hop.end = nodesRet.front();
-    } else {
-      // just take the first candidate if no route could be found
-      hop.start = *from.begin();
-      hop.end = *to.begin();
-    }
-
-    ret[i] = hop;
-  }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-EdgeListHops Router::route(const EdgeCandRoute& route,
-                           const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                           const osm::Restrictor& rest) const {
-  router::Graph cg;
-  return Router::route(route, rAttrs, rOpts, rest, &cg);
-}
-
-// _____________________________________________________________________________
-EdgeListHops Router::route(const EdgeCandRoute& route,
-                           const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                           const osm::Restrictor& rest,
-                           router::Graph* cgraph) const {
-  if (route.size() < 2) return EdgeListHops();
-  EdgeListHops ret(route.size() - 1);
-
-  CombCostFunc ccost(rOpts);
-  router::Node* source = cgraph->addNd();
-  router::Node* sink = cgraph->addNd();
-  CombNodeMap nodes;
-  CombNodeMap nextNodes;
-
-  for (size_t i = 0; i < route[0].size(); i++) {
-    auto e = route[0][i].e;
-    // we can be sure that each edge is exactly assigned to only one
-    // node because the transitgraph is directed
-    nodes[e] = cgraph->addNd(route[0][i].e->getFrom());
-    cgraph->addEdg(source, nodes[e])
-        ->pl()
-        .setCost(EdgeCost(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                          route[0][i].pen, 0));
-  }
-
-  size_t iters = EDijkstra::ITERS;
-  double itPerSecTot = 0;
-  size_t n = 0;
-  for (size_t i = 0; i < route.size() - 1; i++) {
-    nextNodes.clear();
-    HopBand hopBand = getHopBand(route[i], route[i + 1], rAttrs, rOpts, rest);
-
-    const trgraph::StatGroup* tgGrp = 0;
-    if (route[i + 1].begin()->e->getFrom()->pl().getSI())
-      tgGrp = route[i + 1].begin()->e->getFrom()->pl().getSI()->getGroup();
-
-    std::set<trgraph::Edge*> froms;
-    for (const auto& fr : route[i]) froms.insert(fr.e);
-
-    for (auto eFr : froms) {
-      router::Node* cNodeFr = nodes.find(eFr)->second;
-
-      EdgeSet tos;
-      std::map<trgraph::Edge*, router::Edge*> edges;
-      std::map<trgraph::Edge*, double> pens;
-      std::unordered_map<trgraph::Edge*, EdgeList*> edgeLists;
-      std::unordered_map<trgraph::Edge*, EdgeCost> costs;
-
-      assert(route[i + 1].size());
-
-      for (const auto& to : route[i + 1]) {
-        auto eTo = to.e;
-        tos.insert(eTo);
-        if (!nextNodes.count(eTo))
-          nextNodes[eTo] = cgraph->addNd(to.e->getFrom());
-        if (i == route.size() - 2) cgraph->addEdg(nextNodes[eTo], sink);
-
-        edges[eTo] = cgraph->addEdg(cNodeFr, nextNodes[eTo]);
-        pens[eTo] = to.pen;
-
-        edgeLists[eTo] = edges[eTo]->pl().getEdges();
-        edges[eTo]->pl().setStartNode(eFr->getFrom());
-        // for debugging
-        edges[eTo]->pl().setStartEdge(eFr);
-        edges[eTo]->pl().setEndNode(to.e->getFrom());
-        // for debugging
-        edges[eTo]->pl().setEndEdge(eTo);
-      }
-
-      size_t iters = EDijkstra::ITERS;
-      auto t1 = TIME();
-
-      assert(tos.size());
-      assert(froms.size());
-
-      hops(eFr, froms, tos, tgGrp, edgeLists, &costs, rAttrs, rOpts, rest,
-           hopBand);
-      double itPerSec =
-          (static_cast<double>(EDijkstra::ITERS - iters)) / TOOK(t1, TIME());
-      n++;
-      itPerSecTot += itPerSec;
-
-      LOG(VDEBUG) << "from " << eFr << ": 1-" << tos.size() << " ("
-                  << route[i + 1].size() << " nodes) hop took "
-                  << EDijkstra::ITERS - iters << " iterations, "
-                  << TOOK(t1, TIME()) << "ms (tput: " << itPerSec << " its/ms)";
-      for (auto& kv : edges) {
-        kv.second->pl().setCost(
-            EdgeCost(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, pens[kv.first], 0) +
-            costs[kv.first]);
-
-        if (rOpts.popReachEdge && kv.second->pl().getEdges()->size()) {
-          if (kv.second->pl().getEdges() &&
-              kv.second->pl().getEdges()->size()) {
-            // the reach edge is included, but we dont want it in the geometry
-            kv.second->pl().getEdges()->erase(
-                kv.second->pl().getEdges()->begin());
-          }
-        }
-      }
-    }
-
-    std::swap(nodes, nextNodes);
-  }
-
-  LOG(VDEBUG) << "Hops took " << EDijkstra::ITERS - iters << " iterations,"
-              << " average tput was " << (itPerSecTot / n) << " its/ms";
-
-  iters = EDijkstra::ITERS;
-  std::vector<router::Edge*> res;
-  EDijkstra::shortestPath(source, sink, ccost, &res);
-  size_t j = 0;
-
-  LOG(VDEBUG) << "Optim graph solve took " << EDijkstra::ITERS - iters
-              << " iterations.";
-
-  for (auto i = res.rbegin(); i != res.rend(); i++) {
-    const auto e = *i;
-    if (e->getFrom() != source && e->getTo() != sink) {
-      assert(e->pl().frontNode());
-      assert(e->pl().backNode());
-
-      ret[j] = EdgeListHop{std::move(*e->pl().getEdges()), e->pl().frontNode(),
-                           e->pl().backNode()};
-      j++;
-    }
-  }
-
-  assert(ret.size() == j);
-  return ret;
-}
-
-// _____________________________________________________________________________
-EdgeListHops Router::route(const NodeCandRoute& route,
-                           const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                           const osm::Restrictor& rest) const {
-  router::Graph cg;
-  return Router::route(route, rAttrs, rOpts, rest, &cg);
-}
-
-// _____________________________________________________________________________
-EdgeListHops Router::route(const NodeCandRoute& route,
-                           const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                           const osm::Restrictor& rest,
-                           router::Graph* cgraph) const {
-  EdgeCandRoute r;
-  for (auto& nCands : route) {
-    r.emplace_back();
-    for (auto n : nCands)
-      for (auto* e : n.nd->getAdjListOut())
-        r.back().push_back(EdgeCand{e, n.pen});
-  }
-
-  return Router::route(r, rAttrs, rOpts, rest, cgraph);
-}
-
-// _____________________________________________________________________________
-void Router::hops(trgraph::Edge* from, const std::set<trgraph::Edge*>& froms,
-                  const std::set<trgraph::Edge*> tos,
-                  const trgraph::StatGroup* tgGrp,
-                  const std::unordered_map<trgraph::Edge*, EdgeList*>& edgesRet,
-                  std::unordered_map<trgraph::Edge*, EdgeCost>* rCosts,
-                  const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                  const osm::Restrictor& rest, HopBand hopB) const {
-  std::set<trgraph::Edge*> rem;
-
-  CostFunc cost(rAttrs, rOpts, rest, tgGrp, hopB.maxD);
-
-  const auto& cached = getCachedHops(from, tos, edgesRet, rCosts, rAttrs);
-
-  for (auto e : cached) {
-    // shortcut: if the nodes lie in two different connected components,
-    // the distance between them is trivially infinite
-    if ((rOpts.noSelfHops && (e == from || e->getFrom() == from->getFrom())) ||
-        from->getFrom()->pl().getComp() != e->getTo()->pl().getComp() ||
-        e->pl().oneWay() == 2 || from->pl().oneWay() == 2) {
-      (*rCosts)[e] = cost.inf();
-    } else {
-      rem.insert(e);
-    }
-  }
-
-  LOG(VDEBUG) << "From cache: " << tos.size() - rem.size()
-              << ", have to cal: " << rem.size();
-
-  if (rem.size()) {
-    DistHeur dist(from->getFrom()->pl().getComp()->minEdgeLvl, rOpts, rem);
-    const auto& ret = EDijkstra::shortestPath(from, rem, cost, dist, edgesRet);
-    for (const auto& kv : ret) {
-      nestedCache(edgesRet.at(kv.first), froms, cost, rAttrs);
-
-      (*rCosts)[kv.first] = kv.second;
-    }
-  }
-}
-
-// _____________________________________________________________________________
-void Router::nestedCache(const EdgeList* el,
-                         const std::set<trgraph::Edge*>& froms,
-                         const CostFunc& cost,
-                         const RoutingAttrs& rAttrs) const {
-  if (!_caching) return;
-  if (el->size() == 0) return;
-  // iterate over result edges backwards
-  EdgeList curEdges;
-  EdgeCost curCost;
-
-  size_t j = 0;
-
-  for (auto i = el->begin(); i < el->end(); i++) {
-    if (curEdges.size()) {
-      curCost = curCost + cost(*i, (*i)->getTo(), curEdges.back());
-    }
-
-    curEdges.push_back(*i);
-
-    if (froms.count(*i)) {
-      EdgeCost startC = cost(0, 0, *i) + curCost;
-      cache(*i, el->front(), startC, &curEdges, rAttrs);
-      j++;
-    }
-  }
-}
-
-// _____________________________________________________________________________
-std::set<pfaedle::trgraph::Edge*> Router::getCachedHops(
-    trgraph::Edge* from, const std::set<trgraph::Edge*>& tos,
-    const std::unordered_map<trgraph::Edge*, EdgeList*>& edgesRet,
-    std::unordered_map<trgraph::Edge*, EdgeCost>* rCosts,
-    const RoutingAttrs& rAttrs) const {
-  std::set<trgraph::Edge*> ret;
-  for (auto to : tos) {
-    if (_caching && (*_cache[omp_get_thread_num()])[rAttrs][from].count(to)) {
-      const auto& cv = (*_cache[omp_get_thread_num()])[rAttrs][from][to];
-      (*rCosts)[to] = cv.first;
-      *edgesRet.at(to) = cv.second;
-    } else {
-      ret.insert(to);
-    }
-  }
-
-  return ret;
-}
-
-// _____________________________________________________________________________
-void Router::cache(trgraph::Edge* from, trgraph::Edge* to, const EdgeCost& c,
-                   EdgeList* edges, const RoutingAttrs& rAttrs) const {
-  if (!_caching) return;
-  if (from == to) return;
-  (*_cache[omp_get_thread_num()])[rAttrs][from][to] =
-      std::pair<EdgeCost, EdgeList>(c, *edges);
-}
-
-// _____________________________________________________________________________
-size_t Router::getCacheNumber() const { return _cache.size(); }
diff --git a/src/pfaedle/router/Router.h b/src/pfaedle/router/Router.h
index 74bf581..4ec8cb7 100644
--- a/src/pfaedle/router/Router.h
+++ b/src/pfaedle/router/Router.h
@@ -6,198 +6,97 @@
 #define PFAEDLE_ROUTER_ROUTER_H_
 
 #include <limits>
-#include <map>
-#include <mutex>
 #include <set>
+#include <stack>
 #include <string>
 #include <unordered_map>
+#include <map>
 #include <utility>
 #include <vector>
 #include "pfaedle/Def.h"
 #include "pfaedle/osm/Restrictor.h"
-#include "pfaedle/router/Graph.h"
+#include "pfaedle/router/HopCache.h"
 #include "pfaedle/router/Misc.h"
 #include "pfaedle/router/RoutingAttrs.h"
+#include "pfaedle/router/TripTrie.h"
+#include "pfaedle/router/Weights.h"
 #include "pfaedle/trgraph/Graph.h"
+#include "util/Misc.h"
 #include "util/geo/Geo.h"
-#include "util/graph/Dijkstra.h"
 #include "util/graph/EDijkstra.h"
 
-using util::graph::EDijkstra;
-using util::graph::Dijkstra;
-
 namespace pfaedle {
 namespace router {
 
-typedef std::unordered_map<const trgraph::Edge*, router::Node*> CombNodeMap;
+constexpr static uint32_t ROUTE_INF = std::numeric_limits<uint32_t>::max();
+constexpr static double DBL_INF = std::numeric_limits<double>::infinity();
+constexpr static size_t NO_PREDE = std::numeric_limits<size_t>::max();
+
+constexpr static int MAX_ROUTE_COST_DOUBLING_STEPS = 3;
+
 typedef std::pair<size_t, size_t> HId;
-typedef std::map<
-    RoutingAttrs,
-    std::unordered_map<const trgraph::Edge*,
-                       std::unordered_map<const trgraph::Edge*,
-                                          std::pair<EdgeCost, EdgeList> > > >
-    Cache;
+typedef std::vector<double> LayerCostsDAG;
+typedef std::vector<LayerCostsDAG> CostsDAG;
+typedef std::vector<std::vector<size_t>> PredeDAG;
 
-struct HopBand {
-  double minD;
-  double maxD;
-  const trgraph::Edge* nearest;
-  double maxInGrpDist;
-};
+typedef std::unordered_map<const trgraph::Edge*,
+                           std::unordered_map<const trgraph::Edge*, uint32_t>>
+    EdgeCostMatrix;
+typedef std::unordered_map<const trgraph::Edge*,
+                           std::unordered_map<const trgraph::Edge*, double>>
+    EdgeDistMatrix;
+typedef util::graph::EDijkstra::EList<trgraph::NodePL, trgraph::EdgePL> TrEList;
 
-struct CostFunc
-    : public EDijkstra::CostFunc<trgraph::NodePL, trgraph::EdgePL, EdgeCost> {
-  CostFunc(const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-           const osm::Restrictor& res, const trgraph::StatGroup* tgGrp,
-           double max)
-      : _rAttrs(rAttrs),
-        _rOpts(rOpts),
-        _res(res),
-        _tgGrp(tgGrp),
-        _inf(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, max, 0) {}
+typedef std::vector<std::pair<std::pair<size_t, size_t>, uint32_t>> CostMatrix;
 
-  const RoutingAttrs& _rAttrs;
-  const RoutingOpts& _rOpts;
-  const osm::Restrictor& _res;
-  const trgraph::StatGroup* _tgGrp;
-  EdgeCost _inf;
-
-  EdgeCost operator()(const trgraph::Edge* from, const trgraph::Node* n,
-                      const trgraph::Edge* to) const;
-  EdgeCost inf() const { return _inf; }
-
-  double transitLineCmp(const trgraph::EdgePL& e) const;
-};
-
-struct NCostFunc
-    : public Dijkstra::CostFunc<trgraph::NodePL, trgraph::EdgePL, EdgeCost> {
-  NCostFunc(const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-            const osm::Restrictor& res, const trgraph::StatGroup* tgGrp)
-      : _rAttrs(rAttrs),
-        _rOpts(rOpts),
-        _res(res),
-        _tgGrp(tgGrp),
-        _inf(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-             std::numeric_limits<double>::infinity(), 0) {}
-
-  const RoutingAttrs& _rAttrs;
-  const RoutingOpts& _rOpts;
-  const osm::Restrictor& _res;
-  const trgraph::StatGroup* _tgGrp;
-  EdgeCost _inf;
-
-  EdgeCost operator()(const trgraph::Node* from, const trgraph::Edge* e,
-                      const trgraph::Node* to) const;
-  EdgeCost inf() const { return _inf; }
-
-  double transitLineCmp(const trgraph::EdgePL& e) const;
-};
-
-struct DistHeur
-    : public EDijkstra::HeurFunc<trgraph::NodePL, trgraph::EdgePL, EdgeCost> {
-  DistHeur(uint8_t minLvl, const RoutingOpts& rOpts,
-           const std::set<trgraph::Edge*>& tos);
-
-  const RoutingOpts& _rOpts;
-  uint8_t _lvl;
-  POINT _center;
-  double _maxCentD;
-  EdgeCost operator()(const trgraph::Edge* a,
-                      const std::set<trgraph::Edge*>& b) const;
-};
-
-struct NDistHeur
-    : public Dijkstra::HeurFunc<trgraph::NodePL, trgraph::EdgePL, EdgeCost> {
-  NDistHeur(const RoutingOpts& rOpts, const std::set<trgraph::Node*>& tos);
-
-  const RoutingOpts& _rOpts;
-  POINT _center;
-  double _maxCentD;
-  EdgeCost operator()(const trgraph::Node* a,
-                      const std::set<trgraph::Node*>& b) const;
-};
-
-struct CombCostFunc
-    : public EDijkstra::CostFunc<router::NodePL, router::EdgePL, double> {
-  explicit CombCostFunc(const RoutingOpts& rOpts) : _rOpts(rOpts) {}
-
-  const RoutingOpts& _rOpts;
-
-  double operator()(const router::Edge* from, const router::Node* n,
-                    const router::Edge* to) const;
-  double inf() const { return std::numeric_limits<double>::infinity(); }
+class Router {
+ public:
+  virtual ~Router() = default;
+  virtual std::map<size_t, EdgeListHops> route(const TripTrie* trie,
+                                               const EdgeCandMap& ecm,
+                                               const RoutingOpts& rOpts,
+                                               const osm::Restrictor& rest,
+                                               HopCache* hopCache,
+                                               bool noFastHops) const = 0;
 };
 
 /*
  * Finds the most likely route of schedule-based vehicle between stops in a
  * physical transportation network
  */
-class Router {
+template <typename TW>
+class RouterImpl : public Router {
  public:
-  // Init this router with caches for numThreads threads
-  explicit Router(size_t numThreads, bool caching);
-  ~Router();
-
-  // Find the most likely path through the graph for a node candidate route.
-  EdgeListHops route(const NodeCandRoute& route, const RoutingAttrs& rAttrs,
-                     const RoutingOpts& rOpts,
-                     const osm::Restrictor& rest) const;
-  EdgeListHops route(const NodeCandRoute& route, const RoutingAttrs& rAttrs,
-                     const RoutingOpts& rOpts, const osm::Restrictor& rest,
-                     router::Graph* cgraph) const;
-
-  // Find the most likely path through the graph for an edge candidate route.
-  EdgeListHops route(const EdgeCandRoute& route, const RoutingAttrs& rAttrs,
-                     const RoutingOpts& rOpts,
-                     const osm::Restrictor& rest) const;
-  EdgeListHops route(const EdgeCandRoute& route, const RoutingAttrs& rAttrs,
-                     const RoutingOpts& rOpts, const osm::Restrictor& rest,
-                     router::Graph* cgraph) const;
-
-  // Find the most likely path through cgraph for a node candidate route, but
-  // based on a greedy node to node approach
-  EdgeListHops routeGreedy(const NodeCandRoute& route,
-                           const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                           const osm::Restrictor& rest) const;
-
-  // Find the most likely path through cgraph for a node candidate route, but
-  // based on a greedy node to node set approach
-  EdgeListHops routeGreedy2(const NodeCandRoute& route,
-                            const RoutingAttrs& rAttrs,
-                            const RoutingOpts& rOpts,
-                            const osm::Restrictor& rest) const;
-
-  // Return the number of thread caches this router was initialized with
-  size_t getCacheNumber() const;
+  // Find the most likely path through the graph for a trip trie.
+  virtual std::map<size_t, EdgeListHops> route(
+      const TripTrie* trie, const EdgeCandMap& ecm, const RoutingOpts& rOpts,
+      const osm::Restrictor& rest, HopCache* hopCache, bool noFastHops) const;
 
  private:
-  mutable std::vector<Cache*> _cache;
-  bool _caching;
-  HopBand getHopBand(const EdgeCandGroup& a, const EdgeCandGroup& b,
-                     const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-                     const osm::Restrictor& rest) const;
+  void hops(const EdgeCandGroup& from, const EdgeCandGroup& to,
+            CostMatrix* rCosts, CostMatrix* dists, const RoutingAttrs& rAttrs,
+            const RoutingOpts& rOpts, const osm::Restrictor& rest,
+            HopCache* hopCache, uint32_t maxCost) const;
 
-  void hops(trgraph::Edge* from, const std::set<trgraph::Edge*>& froms,
-            const std::set<trgraph::Edge*> to, const trgraph::StatGroup* tgGrp,
-            const std::unordered_map<trgraph::Edge*, EdgeList*>& edgesRet,
-            std::unordered_map<trgraph::Edge*, EdgeCost>* rCosts,
-            const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
-            const osm::Restrictor& rest, HopBand hopB) const;
+  void hopsFast(const EdgeCandGroup& from, const EdgeCandGroup& to,
+                const LayerCostsDAG& initCosts, CostMatrix* rCosts,
+                const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
+                const osm::Restrictor& rest,
 
-  std::set<trgraph::Edge*> getCachedHops(
-      trgraph::Edge* from, const std::set<trgraph::Edge*>& to,
-      const std::unordered_map<trgraph::Edge*, EdgeList*>& edgesRet,
-      std::unordered_map<trgraph::Edge*, EdgeCost>* rCosts,
-      const RoutingAttrs& rAttrs) const;
+                HopCache* hopCache, uint32_t maxCost) const;
 
-  void cache(trgraph::Edge* from, trgraph::Edge* to, const EdgeCost& c,
-             EdgeList* edges, const RoutingAttrs& rAttrs) const;
+  bool connected(const EdgeCand& from, const EdgeCandGroup& tos) const;
+  bool connected(const EdgeCandGroup& froms, const EdgeCand& to) const;
 
-  void nestedCache(const EdgeList* el, const std::set<trgraph::Edge*>& froms,
-                   const CostFunc& cost, const RoutingAttrs& rAttrs) const;
+  bool cacheDrop(
 
-  bool compConned(const EdgeCandGroup& a, const EdgeCandGroup& b) const;
+      HopCache* hopCache, const std::set<trgraph::Edge*>& froms,
+      const trgraph::Edge* to, uint32_t maxCost) const;
+
+  uint32_t addNonOverflow(uint32_t a, uint32_t b) const;
 };
+
+#include "pfaedle/router/Router.tpp"
 }  // namespace router
 }  // namespace pfaedle
 
diff --git a/src/pfaedle/router/Router.tpp b/src/pfaedle/router/Router.tpp
new file mode 100644
index 0000000..9b35f51
--- /dev/null
+++ b/src/pfaedle/router/Router.tpp
@@ -0,0 +1,614 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifdef _OPENMP
+#include <omp.h>
+#else
+#define omp_get_thread_num() 0
+#define omp_get_num_procs() 1
+#endif
+
+#include <unordered_map>
+#include <map>
+#include <vector>
+#include <utility>
+#include <set>
+#include <limits>
+#include <stack>
+
+using util::graph::EDijkstra;
+
+// _____________________________________________________________________________
+template <typename TW>
+std::map<size_t, EdgeListHops> RouterImpl<TW>::route(
+    const TripTrie* trie, const EdgeCandMap& ecm, const RoutingOpts& rOpts,
+    const osm::Restrictor& rest, HopCache* hopCache, bool noFastHops) const {
+  std::map<size_t, EdgeListHops> ret;
+
+  // the current node costs in our DAG
+  CostsDAG costsDAG(trie->getNds().size());
+  PredeDAG predeDAG(trie->getNds().size());
+  std::vector<double> maxCosts(trie->getNds().size());
+
+  // skip the root node, init all to inf
+  for (size_t nid = 1; nid < trie->getNds().size(); nid++) {
+    costsDAG[nid].resize(ecm.at(nid).size(), DBL_INF);
+    predeDAG[nid].resize(ecm.at(nid).size(), NO_PREDE);
+    maxCosts.resize(ecm.at(nid).size(), 0);
+  }
+
+  std::stack<size_t> st;
+
+  // init cost of all first childs
+  for (size_t cnid : trie->getNd(0).childs) {
+    st.push(cnid);
+    for (size_t frId = 0; frId < ecm.at(cnid).size(); frId++) {
+      costsDAG[cnid][frId] = ecm.at(cnid)[frId].pen;
+    }
+  }
+
+  while (!st.empty()) {
+    size_t frTrNid = st.top();
+    st.pop();
+    const auto& frTrNd = trie->getNd(frTrNid);
+    for (size_t toTrNid : trie->getNd(frTrNid).childs) {
+      CostMatrix costM, dists;
+      const auto& toTrNd = trie->getNd(toTrNid);
+
+      if (frTrNd.arr && !toTrNd.arr) {
+        for (size_t toId = 0; toId < costsDAG[toTrNid].size(); toId++) {
+          auto toCand = ecm.at(toTrNid)[toId];
+          for (size_t frId : toCand.depPrede) {
+            double newC = costsDAG[frTrNid][frId] + ecm.at(toTrNid)[toId].pen;
+            if (newC < costsDAG[toTrNid][toId]) {
+              costsDAG[toTrNid][toId] = newC;
+              predeDAG[toTrNid][toId] = frId;
+            }
+          }
+        }
+        st.push(toTrNid);
+        continue;
+      }
+
+      const double avgDepT = frTrNd.accTime / frTrNd.trips;
+      const double avgArrT = toTrNd.accTime / toTrNd.trips;
+
+      double hopDist = 0;
+
+      if (TW::NEED_DIST)
+        hopDist = util::geo::haversine(frTrNd.lat, frTrNd.lng, toTrNd.lat,
+                                       toTrNd.lng);
+
+      uint32_t newMaxCost = TW::maxCost(avgArrT - avgDepT, rOpts);
+      uint32_t maxCost = newMaxCost;
+
+      bool found = false;
+      int step = 0;
+
+      while (!found && step <= MAX_ROUTE_COST_DOUBLING_STEPS) {
+        maxCosts[toTrNid] = newMaxCost;
+        maxCost = newMaxCost;
+
+        // calculate n x n hops between layers
+        if (noFastHops || !TW::ALLOWS_FAST_ROUTE) {
+          hops(ecm.at(frTrNid), ecm.at(toTrNid), &costM, &dists, toTrNd.rAttrs,
+               rOpts, rest, hopCache, maxCost);
+        } else {
+          hopsFast(ecm.at(frTrNid), ecm.at(toTrNid), costsDAG[frTrNid], &costM,
+                   toTrNd.rAttrs, rOpts, rest, hopCache, maxCost);
+        }
+
+        for (size_t matrixI = 0; matrixI < costM.size(); matrixI++) {
+          const auto& mVal = costM[matrixI];
+          const size_t frId = mVal.first.first;
+          const size_t toId = mVal.first.second;
+          const uint32_t c = mVal.second;
+
+          double mDist = 0;
+
+          // the dists and the costM matrices have entries at exactly the same
+          // loc
+          if (TW::NEED_DIST) mDist = dists[matrixI].second;
+
+          // calculate the transition weights
+          const double depT = ecm.at(frTrNid)[frId].time;
+          const double arrT = ecm.at(toTrNid)[toId].time;
+          const double w = TW::weight(c, mDist, arrT - depT, hopDist, rOpts);
+
+          // update costs to successors in next layer
+          double newC = costsDAG[frTrNid][frId] + ecm.at(toTrNid)[toId].pen + w;
+          if (newC < costsDAG[toTrNid][toId]) {
+            costsDAG[toTrNid][toId] = newC;
+            predeDAG[toTrNid][toId] = frId;
+            found = true;
+          }
+        }
+
+        if (newMaxCost <= std::numeric_limits<uint32_t>::max() / 2)
+          newMaxCost *= 2;
+        else
+          newMaxCost = std::numeric_limits<uint32_t>::max();
+
+        if (newMaxCost == maxCost) break;
+        step++;
+      }
+
+      if (!found) {
+        // write the cost for the NULL candidates as a fallback
+        for (size_t frNid = 0; frNid < ecm.at(frTrNid).size(); frNid++) {
+          double newC = costsDAG[frTrNid][frNid] + maxCost * 100;
+          // in the time expanded case, there might be multiple null cands
+          size_t nullCId = 0;
+          while (nullCId < ecm.at(toTrNid).size() &&
+                 !ecm.at(toTrNid)[nullCId].e) {
+            if (newC < costsDAG[toTrNid][nullCId]) {
+              predeDAG[toTrNid][nullCId] = frNid;
+              costsDAG[toTrNid][nullCId] = newC;
+            }
+            nullCId++;
+          }
+        }
+
+        // for the remaining, write dummy edges
+        for (size_t frNid = 0; frNid < ecm.at(frTrNid).size(); frNid++) {
+          // skip NULL candidates
+          size_t toNid = 1;
+          while (toNid < ecm.at(toTrNid).size() && !ecm.at(toTrNid)[toNid].e)
+            toNid++;
+          for (; toNid < ecm.at(toTrNid).size(); toNid++) {
+            double newC = costsDAG[frTrNid][frNid] + ecm.at(toTrNid)[toNid].pen;
+            if (newC < costsDAG[toTrNid][toNid]) {
+              predeDAG[toTrNid][toNid] = frNid;
+              costsDAG[toTrNid][toNid] = newC;
+            }
+          }
+        }
+      }
+
+      st.push(toTrNid);
+    }
+  }
+
+  // update sink costs
+  std::unordered_map<size_t, double> sinkCosts;
+  std::unordered_map<size_t, size_t> frontIds;
+  for (auto leaf : trie->getNdTrips()) {
+    sinkCosts[leaf.first] = DBL_INF;
+    frontIds[leaf.first] = 0;
+
+    for (size_t lastId = 0; lastId < ecm.at(leaf.first).size(); lastId++) {
+      double nCost = costsDAG[leaf.first][lastId];
+      if (nCost < sinkCosts[leaf.first]) {
+        frontIds[leaf.first] = lastId;
+        sinkCosts[leaf.first] = nCost;
+      }
+    }
+  }
+
+  // retrieve edges
+  for (auto leaf : trie->getNdTrips()) {
+    const auto leafNid = leaf.first;
+    auto curTrieNid = leafNid;
+
+    while (predeDAG[curTrieNid][frontIds[leafNid]] != NO_PREDE) {
+      const auto curTrieParNid = trie->getNd(curTrieNid).parent;
+      const auto frId = predeDAG[curTrieNid][frontIds[leafNid]];
+      const auto toId = frontIds[leafNid];
+
+      const auto frTrNd = trie->getNd(curTrieParNid);
+      const auto toTrNd = trie->getNd(curTrieNid);
+
+      // skip in-node hops
+      if (frTrNd.arr && !toTrNd.arr) {
+        frontIds[leafNid] = frId;
+        curTrieNid = curTrieParNid;
+        continue;
+      }
+
+      std::vector<trgraph::Edge*> edgs;
+
+      const auto& fr = ecm.at(curTrieParNid)[frId];
+      const auto& to = ecm.at(curTrieNid)[toId];
+
+      // for subtracting and adding progression costs
+      typename TW::CostFunc costPr(toTrNd.rAttrs, rOpts, rest, ROUTE_INF);
+
+      if (fr.e && to.e) {
+        // account for max progression start offset, do this exactly like
+        // in the hops calculation to ensure that we can find the path again
+        double maxProgrStart = 0;
+        for (const auto& fr : ecm.at(curTrieParNid)) {
+          if (!fr.e) continue;
+          double progrStart = 0;
+          if (fr.progr > 0) progrStart = costPr(fr.e, 0, 0) * fr.progr;
+          if (progrStart > maxProgrStart) maxProgrStart = progrStart;
+        }
+
+        const double maxCostRt = maxCosts[curTrieNid] + maxProgrStart;
+        uint32_t maxCostRtInt = maxCostRt;
+
+        // avoid overflow
+        if (maxCostRt >= std::numeric_limits<uint32_t>::max()) {
+          maxCostRtInt = std::numeric_limits<uint32_t>::max();
+        }
+
+        typename TW::CostFunc cost(toTrNd.rAttrs, rOpts, rest, maxCostRtInt);
+        typename TW::DistHeur distH(fr.e->getFrom()->pl().getComp().maxSpeed,
+                                    rOpts, {to.e});
+
+        const double c =
+            EDijkstra::shortestPath(fr.e, to.e, cost, distH, &edgs);
+        // c += costPr(to.e, 0, 0) * to.progr;
+
+        if (c < maxCostRtInt) {
+          // a path was found, use it
+          ret[leafNid].push_back(
+              {edgs, fr.e, to.e, fr.progr, to.progr, {}, {}});
+        } else {
+          // no path was found, which is marked by an empty edge list
+          ret[leafNid].push_back({{}, fr.e, to.e, fr.progr, to.progr, {}, {}});
+        }
+      } else {
+        // fallback to the position given in candidate
+        if (fr.e) {
+          ret[leafNid].push_back({edgs, fr.e, 0, fr.progr, 0, {}, to.point});
+        } else if (to.e) {
+          ret[leafNid].push_back({edgs, 0, to.e, 0, to.progr, fr.point, {}});
+        } else {
+          ret[leafNid].push_back({edgs, 0, 0, 0, 0, fr.point, to.point});
+        }
+      }
+      frontIds[leafNid] = frId;
+      curTrieNid = curTrieParNid;
+    }
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename TW>
+void RouterImpl<TW>::hops(const EdgeCandGroup& froms, const EdgeCandGroup& tos,
+                          CostMatrix* rCosts, CostMatrix* dists,
+                          const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
+                          const osm::Restrictor& rest, HopCache* hopCache,
+                          uint32_t maxCost) const {
+  // standard 1 -> n approach
+  std::set<trgraph::Edge*> eFrs;
+  for (const auto& from : froms) {
+    if (!from.e) continue;
+    eFrs.insert(from.e);
+  }
+
+  std::set<trgraph::Edge*> eTos;
+  for (const auto& to : tos) {
+    if (!to.e) continue;
+    eTos.insert(to.e);
+  }
+
+  EdgeCostMatrix ecm;
+  EdgeDistMatrix ecmDist;
+
+  // account for max progression start offset
+  double maxProgrStart = 0;
+  typename TW::CostFunc cost(rAttrs, rOpts, rest, ROUTE_INF);
+  for (const auto& fr : froms) {
+    if (!fr.e) continue;
+    double progrStart = 0;
+    if (fr.progr > 0) progrStart = cost(fr.e, 0, 0) * fr.progr;
+    if (progrStart > maxProgrStart) maxProgrStart = progrStart;
+  }
+
+  maxCost = addNonOverflow(maxCost, maxProgrStart);
+  typename TW::CostFunc costF(rAttrs, rOpts, rest, maxCost);
+
+  for (trgraph::Edge* eFrom : eFrs) {
+    std::set<trgraph::Edge*> remTos;
+    for (trgraph::Edge* eTo : eTos) {
+      // init ecmDist
+      ecmDist[eFrom][eTo] = ROUTE_INF;
+
+      std::pair<uint32_t, bool> cached = {0, 0};
+      if (hopCache) cached = hopCache->get(eFrom, eTo);
+
+      // shortcut: if the nodes lie in two different connected components,
+      // the distance between them is trivially infinite
+      if (eFrom->getFrom()->pl().getCompId() !=
+          eTo->getTo()->pl().getCompId()) {
+        ecm[eFrom][eTo] = costF.inf();
+      } else if (cached.second >= costF.inf()) {
+        ecm[eFrom][eTo] = costF.inf();
+      } else if (!TW::NEED_DIST && cached.second) {
+        ecm[eFrom][eTo] = cached.first;
+      } else {
+        remTos.insert(eTo);
+      }
+    }
+
+    if (remTos.size()) {
+      typename TW::DistHeur distH(eFrom->getFrom()->pl().getComp().maxSpeed,
+                                  rOpts, remTos);
+
+      std::unordered_map<trgraph::Edge*, TrEList> paths;
+      std::unordered_map<trgraph::Edge*, TrEList*> pathPtrs;
+      for (auto to : tos) pathPtrs[to.e] = &paths[to.e];
+
+      const auto& costs =
+          EDijkstra::shortestPath(eFrom, remTos, costF, distH, pathPtrs);
+
+      for (const auto& c : costs) {
+        ecm[eFrom][c.first] = c.second;
+
+        if (paths[c.first].size() == 0) {
+          if (hopCache) hopCache->setMin(eFrom, c.first, maxCost);
+          continue;  // no path found
+        }
+
+        if (hopCache) hopCache->setEx(eFrom, c.first, c.second);
+      }
+
+      if (TW::NEED_DIST) {
+        for (const auto& c : costs) {
+          if (!paths[c.first].size()) continue;
+          double d = 0;
+          // don't count last edge
+          for (size_t i = paths[c.first].size() - 1; i > 0; i--) {
+            d += paths[c.first][i]->pl().getLength();
+          }
+          ecmDist[eFrom][c.first] = d;
+        }
+      }
+    }
+  }
+
+  // build return costs
+  for (size_t frId = 0; frId < froms.size(); frId++) {
+    auto fr = froms[frId];
+    if (!fr.e) continue;
+    auto costFr = costF(fr.e, 0, 0);
+    for (size_t toId = 0; toId < tos.size(); toId++) {
+      auto to = tos[toId];
+      if (!to.e) continue;
+      auto costTo = costF(to.e, 0, 0);
+
+      uint32_t c = ecm[fr.e][to.e];
+
+      if (c >= maxCost) continue;
+
+      double dist = 0;
+      if (TW::NEED_DIST) dist = ecmDist[fr.e][to.e];
+
+      if (fr.e == to.e) {
+        if (fr.progr <= to.progr) {
+          const uint32_t progrCFr = costFr * fr.progr;
+          const uint32_t progrCTo = costTo * to.progr;
+
+          // calculate this in one step to avoid uint32_t underflow below
+          c += progrCTo - progrCFr;
+        } else {
+          // trivial case we can ignore
+          continue;
+        }
+
+      } else {
+        // subtract progression cost on first edge
+        if (fr.progr > 0) {
+          const uint32_t progrCFr = costFr * fr.progr;
+          c -= progrCFr;
+          if (TW::NEED_DIST) dist -= fr.e->pl().getLength() * fr.progr;
+        }
+
+        // add progression cost on last edge
+        if (to.progr > 0) {
+          const uint32_t progrCTo = costTo * to.progr;
+          c += progrCTo;
+          if (TW::NEED_DIST) dist += to.e->pl().getLength() * to.progr;
+        }
+      }
+
+      if (c < maxCost) {
+        rCosts->push_back({{frId, toId}, c});
+        if (TW::NEED_DIST) dists->push_back({{frId, toId}, dist});
+      }
+    }
+  }
+}
+
+// _____________________________________________________________________________
+template <typename TW>
+void RouterImpl<TW>::hopsFast(const EdgeCandGroup& froms,
+                              const EdgeCandGroup& tos,
+                              const LayerCostsDAG& rawInitCosts,
+                              CostMatrix* rCosts, const RoutingAttrs& rAttrs,
+                              const RoutingOpts& rOpts,
+                              const osm::Restrictor& restr, HopCache* hopCache,
+                              uint32_t maxCost) const {
+  std::unordered_map<trgraph::Edge*, uint32_t> initCosts;
+
+  std::set<trgraph::Edge*> eFrs, eTos;
+  std::map<trgraph::Edge*, std::vector<size_t>> eFrCands, eToCands;
+  double maxSpeed = 0;
+  for (size_t frId = 0; frId < froms.size(); frId++) {
+    if (rawInitCosts[frId] >= DBL_INF || !connected(froms[frId], tos)) continue;
+
+    eFrs.insert(froms[frId].e);
+    eFrCands[froms[frId].e].push_back(frId);
+
+    if (froms[frId].e->getFrom()->pl().getComp().maxSpeed > maxSpeed)
+      maxSpeed = froms[frId].e->getFrom()->pl().getComp().maxSpeed;
+  }
+
+  for (size_t toId = 0; toId < tos.size(); toId++) {
+    if (!connected(froms, tos[toId]))
+      continue;  // skip nodes not conn'ed to any <fr>
+
+    if (hopCache && cacheDrop(hopCache, eFrs, tos[toId].e, maxCost))
+      continue;  // skip nodes we have already encountered at higher cost
+
+    eTos.insert(tos[toId].e);
+    eToCands[tos[toId].e].push_back(toId);
+  }
+
+  if (eFrs.size() == 0 || eTos.size() == 0) return;
+
+  // account for max progression start offset
+  double maxProgrStart = 0;
+  typename TW::CostFunc progrCostF(rAttrs, rOpts, restr, ROUTE_INF);
+  for (const auto& fr : froms) {
+    if (!fr.e) continue;
+    double progrStart = 0;
+    if (fr.progr > 0) progrStart = progrCostF(fr.e, 0, 0) * fr.progr;
+    if (progrStart > maxProgrStart) maxProgrStart = progrStart;
+  }
+
+  // initialize init doubles
+  LayerCostsDAG prepInitCosts(froms.size());
+  for (size_t frId = 0; frId < froms.size(); frId++) {
+    if (!froms[frId].e || rawInitCosts[frId] >= DBL_INF) continue;
+    const auto& fr = froms[frId];
+    // offset by progr start
+    double progrStart = progrCostF(fr.e, 0, 0) * fr.progr;
+    prepInitCosts[frId] =
+        TW::invWeight(rawInitCosts[frId], rOpts) + maxProgrStart - progrStart;
+  }
+
+  // all init costs are inf
+  for (const auto& fr : froms) initCosts[fr.e] = ROUTE_INF;
+
+  // now chose the best offset cost
+  for (size_t frId = 0; frId < froms.size(); frId++) {
+    if (!froms[frId].e || rawInitCosts[frId] >= DBL_INF) continue;
+    const auto& fr = froms[frId];
+    if (prepInitCosts[frId] < initCosts[fr.e])
+      initCosts[fr.e] = prepInitCosts[frId];
+  }
+
+  // get max init costs
+  uint32_t maxInit = 0;
+  uint32_t minInit = ROUTE_INF;
+  for (const auto& c : initCosts) {
+    if (!eFrs.count(c.first)) continue;
+    if (c.second != ROUTE_INF && c.second > maxInit) maxInit = c.second;
+    if (c.second < minInit) minInit = c.second;
+  }
+
+  for (auto& c : initCosts) c.second = c.second - minInit;
+
+  // account for start offsets
+  maxCost = addNonOverflow(maxCost, maxProgrStart);
+
+  typename TW::CostFunc costF(rAttrs, rOpts, restr,
+                              maxCost + (maxInit - minInit));
+
+  std::unordered_map<trgraph::Edge*, TrEList> paths;
+  std::unordered_map<trgraph::Edge*, TrEList*> pathPtrs;
+  for (const auto& to : tos) pathPtrs[to.e] = &paths[to.e];
+
+  typename TW::DistHeur distH(maxSpeed, rOpts, eTos);
+
+  const auto& costs =
+      EDijkstra::shortestPath(eFrs, eTos, initCosts, maxCost, costF, distH);
+
+  for (const auto& c : costs) {
+    auto toEdg = c.first;
+    if (c.second.second >= costF.inf()) {
+      if (hopCache) hopCache->setMin(eFrs, toEdg, maxCost);
+      continue;  // no path found
+    }
+    auto fromEdg = c.second.first;
+    uint32_t cost = c.second.second - initCosts[fromEdg];
+
+    if (cost >= maxCost) continue;
+
+    for (size_t frId : eFrCands.find(fromEdg)->second) {
+      const auto& fr = froms[frId];
+      auto costFr = costF(fr.e, 0, 0);
+
+      for (size_t toId : eToCands.find(toEdg)->second) {
+        const auto& to = tos[toId];
+        uint32_t wrCost = cost;
+
+        if (fr.e == to.e) {
+          if (fr.progr <= to.progr) {
+            const auto costTo = costF(to.e, 0, 0);
+            const uint32_t progrCFr = costFr * fr.progr;
+            const uint32_t progrCTo = costTo * to.progr;
+
+            // calculate this in one step to avoid uint32_t underflow below
+            wrCost += progrCTo - progrCFr;
+          } else {
+            // trivial case we can ignore
+            continue;
+          }
+        } else {
+          // subtract progression cost on first edge
+          if (fr.progr > 0) {
+            const uint32_t progrCFr = costFr * fr.progr;
+            wrCost -= progrCFr;
+          }
+
+          // add progression cost on last edge
+          if (to.progr > 0) {
+            const auto costTo = costF(to.e, 0, 0);
+            const uint32_t progrCTo = costTo * to.progr;
+            wrCost += progrCTo;
+          }
+        }
+
+        if (wrCost >= maxCost - maxProgrStart) continue;
+
+        rCosts->push_back({{frId, toId}, wrCost});
+      }
+    }
+  }
+}
+
+// _____________________________________________________________________________
+template <typename TW>
+bool RouterImpl<TW>::connected(const EdgeCand& fr,
+                               const EdgeCandGroup& tos) const {
+  if (!fr.e) return false;
+  for (const auto& to : tos) {
+    if (!to.e) continue;
+    if (fr.e->getFrom()->pl().getCompId() == to.e->getFrom()->pl().getCompId())
+      return true;
+  }
+  return false;
+}
+
+// _____________________________________________________________________________
+template <typename TW>
+bool RouterImpl<TW>::connected(const EdgeCandGroup& froms,
+                               const EdgeCand& to) const {
+  if (!to.e) return false;
+  for (const auto& fr : froms) {
+    if (!fr.e) continue;
+    if (fr.e->getFrom()->pl().getCompId() == to.e->getFrom()->pl().getCompId())
+      return true;
+  }
+  return false;
+}
+
+// _____________________________________________________________________________
+template <typename TW>
+bool RouterImpl<TW>::cacheDrop(HopCache* hopCache,
+                               const std::set<trgraph::Edge*>& froms,
+                               const trgraph::Edge* to,
+                               uint32_t maxCost) const {
+  for (auto fr : froms)
+    if (hopCache->get(fr, to).first <= maxCost) return false;
+
+  return true;
+}
+
+// _____________________________________________________________________________
+template <typename TW>
+uint32_t RouterImpl<TW>::addNonOverflow(uint32_t a, uint32_t b) const {
+  if (a == std::numeric_limits<uint32_t>::max() ||
+      b == std::numeric_limits<uint32_t>::max())
+    return std::numeric_limits<uint32_t>::max();
+  uint32_t res = a + b;
+  if (res >= a && res >= b) return res;
+  return std::numeric_limits<uint32_t>::max();
+}
diff --git a/src/pfaedle/router/RoutingAttrs.h b/src/pfaedle/router/RoutingAttrs.h
index 11a5cdb..c1b001f 100644
--- a/src/pfaedle/router/RoutingAttrs.h
+++ b/src/pfaedle/router/RoutingAttrs.h
@@ -5,8 +5,10 @@
 #ifndef PFAEDLE_ROUTER_ROUTINGATTRS_H_
 #define PFAEDLE_ROUTER_ROUTINGATTRS_H_
 
-#include <map>
+#include <unordered_map>
+#include <vector>
 #include <string>
+#include "pfaedle/statsimi-classifier/StatsimiClassifier.h"
 #include "pfaedle/trgraph/EdgePL.h"
 
 using pfaedle::trgraph::TransitEdgeLine;
@@ -14,40 +16,74 @@ using pfaedle::trgraph::TransitEdgeLine;
 namespace pfaedle {
 namespace router {
 
+struct LineSimilarity {
+  bool nameSimilar : 1;
+  bool fromSimilar : 1;
+  bool toSimilar : 1;
+};
+
+inline bool operator<(const LineSimilarity& a, const LineSimilarity& b) {
+  return (a.nameSimilar + a.fromSimilar + a.toSimilar) <
+         (b.nameSimilar + b.fromSimilar + b.toSimilar);
+}
+
 struct RoutingAttrs {
-  RoutingAttrs() : fromString(""), toString(""), shortName(""), _simiCache() {}
-  std::string fromString;
-  std::string toString;
+  RoutingAttrs()
+      : lineFrom(""), lineTo(), shortName(""), classifier(0), _simiCache() {}
+  std::string lineFrom;
+  std::vector<std::string> lineTo;
   std::string shortName;
 
-  mutable std::map<const TransitEdgeLine*, double> _simiCache;
+  const pfaedle::statsimiclassifier::StatsimiClassifier* classifier;
+
+  mutable std::unordered_map<const TransitEdgeLine*, LineSimilarity> _simiCache;
+
+  LineSimilarity simi(const TransitEdgeLine* line) const {
+    // shortcut, if we don't have a line information, classify as similar
+    if (line->shortName.empty() && line->toStr.empty() && line->fromStr.empty())
+      return {true, true, true};
 
-  // carfull: lower return value = higher similarity
-  double simi(const TransitEdgeLine* line) const {
     auto i = _simiCache.find(line);
     if (i != _simiCache.end()) return i->second;
 
-    double cur = 1;
+    LineSimilarity ret{false, false, false};
+
     if (shortName.empty() || router::lineSimi(line->shortName, shortName) > 0.5)
-      cur -= 0.333333333;
+      ret.nameSimilar = true;
 
-    if (toString.empty() || line->toStr.empty() ||
-        router::statSimi(line->toStr, toString) > 0.5)
-      cur -= 0.333333333;
+    if (lineTo.size() == 0) {
+      ret.toSimilar = true;
+    } else {
+      for (const auto& lTo : lineTo) {
+        if (lTo.empty() || classifier->similar(line->toStr, lTo)) {
+          ret.toSimilar = true;
+          break;
+        }
+      }
+    }
 
-    if (fromString.empty() || line->fromStr.empty() ||
-        router::statSimi(line->fromStr, fromString) > 0.5)
-      cur -= 0.333333333;
+    if (lineFrom.empty() || classifier->similar(line->fromStr, lineFrom))
+      ret.fromSimilar = true;
 
-    _simiCache[line] = cur;
+    _simiCache[line] = ret;
 
-    return cur;
+    return ret;
+  }
+
+  void merge(const RoutingAttrs& other) {
+    assert(other.lineFrom == lineFrom);
+    assert(other.shortName == shortName);
+
+    for (const auto& l : other.lineTo) {
+      auto i = std::lower_bound(lineTo.begin(), lineTo.end(), l);
+      if (i != lineTo.end() && (*i) == l) continue;  // already present
+      lineTo.insert(i, l);
+    }
   }
 };
 
 inline bool operator==(const RoutingAttrs& a, const RoutingAttrs& b) {
-  return a.shortName == b.shortName && a.toString == b.toString &&
-         a.fromString == b.fromString;
+  return a.shortName == b.shortName && a.lineFrom == b.lineFrom;
 }
 
 inline bool operator!=(const RoutingAttrs& a, const RoutingAttrs& b) {
@@ -55,10 +91,8 @@ inline bool operator!=(const RoutingAttrs& a, const RoutingAttrs& b) {
 }
 
 inline bool operator<(const RoutingAttrs& a, const RoutingAttrs& b) {
-  return a.fromString < b.fromString ||
-         (a.fromString == b.fromString && a.toString < b.toString) ||
-         (a.fromString == b.fromString && a.toString == b.toString &&
-          a.shortName < b.shortName);
+  return a.lineFrom < b.lineFrom ||
+         (a.lineFrom == b.lineFrom && a.shortName < b.shortName);
 }
 
 }  // namespace router
diff --git a/src/pfaedle/router/ShapeBuilder.cpp b/src/pfaedle/router/ShapeBuilder.cpp
index cd5c85b..6223cfe 100644
--- a/src/pfaedle/router/ShapeBuilder.cpp
+++ b/src/pfaedle/router/ShapeBuilder.cpp
@@ -2,27 +2,23 @@
 // Chair of Algorithms and Data Structures.
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
-#ifdef _OPENMP
-#include <omp.h>
-#else
-#define omp_get_thread_num() 0
-#define omp_get_num_procs() 1
-#endif
-
-#include <exception>
+#include <atomic>
+#include <cstdlib>
+#include <limits>
 #include <map>
 #include <mutex>
+#include <random>
 #include <stdexcept>
+#include <thread>
 #include <unordered_map>
 #include <utility>
 #include "ad/cppgtfs/gtfs/Feed.h"
 #include "pfaedle/Def.h"
-#include "pfaedle/eval/Collector.h"
 #include "pfaedle/gtfs/Feed.h"
 #include "pfaedle/gtfs/StopTime.h"
 #include "pfaedle/osm/OsmBuilder.h"
 #include "pfaedle/router/ShapeBuilder.h"
-#include "pfaedle/trgraph/StatGroup.h"
+#include "pfaedle/statsimi-classifier/StatsimiClassifier.h"
 #include "util/geo/Geo.h"
 #include "util/geo/output/GeoGraphJsonOutput.h"
 #include "util/geo/output/GeoJsonOutput.h"
@@ -33,255 +29,515 @@ using util::geo::DBox;
 using util::geo::DPoint;
 using util::geo::extendBox;
 using util::geo::minbox;
+using util::geo::PolyLine;
 
+using ad::cppgtfs::gtfs::NO_COLOR;
 using ad::cppgtfs::gtfs::ShapePoint;
 using ad::cppgtfs::gtfs::Stop;
 using pfaedle::gtfs::Feed;
 using pfaedle::gtfs::StopTime;
 using pfaedle::gtfs::Trip;
 using pfaedle::osm::BBoxIdx;
-using pfaedle::router::Clusters;
+using pfaedle::router::EdgeCandGroup;
+using pfaedle::router::EdgeCandMap;
 using pfaedle::router::EdgeListHops;
 using pfaedle::router::FeedStops;
-using pfaedle::router::NodeCandGroup;
-using pfaedle::router::NodeCandRoute;
 using pfaedle::router::RoutingAttrs;
 using pfaedle::router::ShapeBuilder;
+using pfaedle::router::Stats;
+using pfaedle::router::TripForests;
+using pfaedle::router::TripTrie;
+using pfaedle::statsimiclassifier::JaccardClassifier;
+using pfaedle::trgraph::EdgeGrid;
+using pfaedle::trgraph::NodeGrid;
 using util::geo::latLngToWebMerc;
-using util::geo::webMercMeterDist;
-using util::geo::webMercToLatLng;
+using util::geo::M_PER_DEG;
 using util::geo::output::GeoGraphJsonOutput;
 
 // _____________________________________________________________________________
-ShapeBuilder::ShapeBuilder(Feed* feed, ad::cppgtfs::gtfs::Feed* evalFeed,
-                           MOTs mots, const config::MotConfig& motCfg,
-                           eval::Collector* ecoll, pfaedle::trgraph::Graph* g,
-                           router::FeedStops* fStops, osm::Restrictor* restr,
-                           const config::Config& cfg)
+ShapeBuilder::ShapeBuilder(
+    Feed* feed, MOTs mots, const config::MotConfig& motCfg,
+    pfaedle::trgraph::Graph* g, router::FeedStops* fStops,
+    osm::Restrictor* restr,
+    const pfaedle::statsimiclassifier::StatsimiClassifier* classifier,
+    router::Router* router, const config::Config& cfg)
     : _feed(feed),
-      _evalFeed(evalFeed),
       _mots(mots),
       _motCfg(motCfg),
-      _ecoll(ecoll),
       _cfg(cfg),
       _g(g),
-      _crouter(omp_get_num_procs(), cfg.useCaching),
       _stops(fStops),
       _curShpCnt(0),
-      _restr(restr) {
-  _numThreads = _crouter.getCacheNumber();
+      _restr(restr),
+      _classifier(classifier),
+      _router(router) {
+  pfaedle::osm::BBoxIdx box(BOX_PADDING);
+  ShapeBuilder::getGtfsBox(feed, mots, cfg.shapeTripId, cfg.dropShapes, &box,
+                           _motCfg.osmBuildOpts.maxSpeed);
+
+  _eGrid = EdgeGrid(cfg.gridSize, cfg.gridSize, box.getFullBox(), false);
+  _nGrid = NodeGrid(cfg.gridSize, cfg.gridSize, box.getFullBox(), false);
+
+  LOG(DEBUG) << "Grid size of " << _nGrid.getXWidth() << "x"
+             << _nGrid.getYHeight();
+
+  buildIndex();
 }
 
 // _____________________________________________________________________________
-const NodeCandGroup& ShapeBuilder::getNodeCands(const Stop* s) const {
-  if (_stops->find(s) == _stops->end() || _stops->at(s) == 0) return _emptyNCG;
-  return _stops->at(s)->pl().getSI()->getGroup()->getNodeCands(s);
+void ShapeBuilder::buildIndex() {
+  for (auto* n : _g->getNds()) {
+    for (auto* e : n->getAdjListOut()) {
+      if (e->pl().lvl() > _motCfg.osmBuildOpts.maxSnapLevel) continue;
+      // don't snap to one way edges
+      if (e->pl().oneWay() == 2) continue;
+
+      _eGrid.add(*e->pl().getGeom(), e);
+    }
+  }
+
+  for (auto* n : _g->getNds()) {
+    // only station nodes
+    if (n->pl().getSI()) {
+      _nGrid.add(*n->pl().getGeom(), n);
+    }
+  }
 }
 
 // _____________________________________________________________________________
-LINE ShapeBuilder::shapeL(const router::NodeCandRoute& ncr,
-                          const router::RoutingAttrs& rAttrs) {
-  try {
-    const router::EdgeListHops& res = route(ncr, rAttrs);
+void ShapeBuilder::buildCandCache(const TripForests& forests) {
+  std::set<const Stop*> stops;
+  size_t count = 0;
 
-    LINE l;
-    for (const auto& hop : res) {
-      const trgraph::Node* last = hop.start;
-      if (hop.edges.size() == 0) {
-        l.push_back(*hop.start->pl().getGeom());
-        l.push_back(*hop.end->pl().getGeom());
-      }
-      for (auto i = hop.edges.rbegin(); i != hop.edges.rend(); i++) {
-        const auto* e = *i;
-        if ((e->getFrom() == last) ^ e->pl().isRev()) {
-          l.insert(l.end(), e->pl().getGeom()->begin(),
-                   e->pl().getGeom()->end());
-        } else {
-          l.insert(l.end(), e->pl().getGeom()->rbegin(),
-                   e->pl().getGeom()->rend());
+  for (const auto& forest : forests) {
+    for (const auto& trie : forest.second) {
+      for (const auto& trips : trie.getNdTrips()) {
+        for (const auto& st : trips.second[0]->getStopTimes()) {
+          stops.insert(st.getStop());
         }
-        last = e->getOtherNd(last);
       }
     }
+  }
 
-    return l;
+  size_t numThreads = std::thread::hardware_concurrency();
+  std::vector<std::thread> thrds(numThreads);
+  std::vector<GrpCache> caches(numThreads);
+  std::vector<std::vector<const Stop*>> threadStops(numThreads);
+
+  size_t i = 0;
+  for (auto stop : stops) {
+    threadStops[i].push_back(stop);
+    if (++i == numThreads) i = 0;
+  }
+
+  i = 0;
+  for (auto& t : thrds) {
+    t = std::thread(&ShapeBuilder::edgCandWorker, this, &threadStops[i],
+                    &caches[i]);
+    i++;
+  }
+
+  for (auto& thr : thrds) thr.join();
+
+  // merge
+  for (size_t i = 0; i < numThreads; i++) {
+    for (const auto& c : caches[i]) {
+      _grpCache[c.first] = c.second;
+      count += c.second.size();
+    }
+  }
+
+  if (_grpCache.size())
+    LOG(DEBUG) << "Average candidate set size: "
+               << ((count * 1.0) / _grpCache.size());
+}
+
+// _____________________________________________________________________________
+EdgeCandGroup ShapeBuilder::getEdgCands(const Stop* s) const {
+  auto cached = _grpCache.find(s);
+  if (cached != _grpCache.end()) return cached->second;
+
+  EdgeCandGroup ret;
+
+  const auto& snormzer = _motCfg.osmBuildOpts.statNormzer;
+  auto normedName = snormzer.norm(s->getName());
+
+  // the first cand is a placeholder for the stop position itself, it is chosen
+  // when no candidate yielded a feasible route
+  auto pos = POINT(s->getLng(), s->getLat());
+  ret.push_back({0, 0, 0, pos, 0, {}});
+
+  // unsigned seed =
+  // std::chrono::system_clock::now().time_since_epoch().count();
+  // std::default_random_engine gen(seed);
+  // std::normal_distribution<double> dist(0.0, 25.0);
+
+  // add some gaussian noise
+  // pos.setX(pos.getX() + dist(gen));
+  // pos.setY(pos.getY() + dist(gen));
+
+  double maxMDist = _motCfg.osmBuildOpts.maxStationCandDistance;
+
+  double distor = util::geo::latLngDistFactor(pos);
+
+  std::set<trgraph::Node*> frNIdx;
+  _nGrid.get(util::geo::pad(util::geo::getBoundingBox(pos),
+                            (maxMDist / M_PER_DEG) / distor),
+             &frNIdx);
+
+  if (_motCfg.routingOpts.useStations) {
+    for (auto nd : frNIdx) {
+      assert(nd->pl().getSI());
+
+      double mDist = util::geo::haversine(pos, *nd->pl().getGeom());
+      if (mDist > maxMDist) continue;
+
+      double nameMatchPunish = 0;
+      double trackMatchPunish = 0;
+
+      if (!_classifier->similar(normedName, pos, nd->pl().getSI()->getName(),
+                                *nd->pl().getGeom())) {
+        // stations do not match, punish
+        nameMatchPunish = _motCfg.routingOpts.stationUnmatchedPen;
+      }
+
+      std::string platform = s->getPlatformCode();
+
+      if (!platform.empty() && !nd->pl().getSI()->getTrack().empty() &&
+          nd->pl().getSI()->getTrack() == platform) {
+        trackMatchPunish = _motCfg.routingOpts.platformUnmatchedPen;
+      }
+
+      for (auto* e : nd->getAdjListOut()) {
+        // don't snap to one way edges
+        if (e->pl().oneWay() == 2) continue;
+        ret.push_back({e,
+                       mDist * _motCfg.routingOpts.stationDistPenFactor +
+                           nameMatchPunish + trackMatchPunish,
+                       0,
+                       {},
+                       0,
+                       {}});
+      }
+    }
+  }
+
+  maxMDist = _motCfg.osmBuildOpts.maxSnapDistance;
+
+  std::set<trgraph::Edge*> frEIdx;
+  _eGrid.get(util::geo::pad(util::geo::getBoundingBox(pos),
+                            (maxMDist / M_PER_DEG) / distor),
+             &frEIdx);
+
+  std::set<trgraph::Edge*> selected;
+  std::map<const trgraph::Edge*, double> scores;
+  std::map<const trgraph::Edge*, double> progrs;
+
+  for (auto edg : frEIdx) {
+    if (selected.count(edg)) continue;
+
+    auto reach = deg2reachable(edg, selected);
+
+    double mDist = dist(pos, *edg->pl().getGeom()) * distor * M_PER_DEG;
+
+    if (mDist > maxMDist) continue;
+
+    if (!reach || mDist < scores[reach]) {
+      if (reach) {
+        selected.erase(selected.find(reach));
+        scores.erase(scores.find(reach));
+      }
+      util::geo::PolyLine<double> pl(*edg->pl().getGeom());
+      auto lp = pl.projectOn(pos);
+      double progr = lp.totalPos;
+      if (edg->pl().isRev()) progr = 1 - progr;
+      selected.insert(edg);
+      scores[edg] = mDist;
+      progrs[edg] = progr;
+    }
+  }
+
+  for (auto e : selected) {
+    ret.push_back({e,
+                   scores[e] * _motCfg.routingOpts.stationDistPenFactor +
+                       _motCfg.routingOpts.nonStationPen,
+                   progrs[e],
+                   {},
+                   0,
+                   {}});
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+pfaedle::trgraph::Edge* ShapeBuilder::deg2reachable(
+    trgraph::Edge* e, std::set<trgraph::Edge*> edgs) const {
+  trgraph::Edge* cur = e;
+
+  // forward
+  while (cur->getTo()->getDeg() == 2) {
+    // dont allow backtracking on reverse edge
+    auto next = e->getTo()->getAdjListOut().front()->getTo() == e->getFrom()
+                    ? e->getTo()->getAdjListOut().back()
+                    : e->getTo()->getAdjListOut().front();
+    if (next == e || next == cur) break;  // avoid circles
+    if (next->pl().oneWay() == 2) break;  // dont follow one way edges
+    if (edgs.count(next)) return next;
+    cur = next;
+  }
+
+  // backward
+  while (cur->getFrom()->getDeg() == 2) {
+    // dont allow backtracking on reverse edge
+    auto next = e->getFrom()->getAdjListIn().front()->getFrom() == e->getTo()
+                    ? e->getFrom()->getAdjListIn().back()
+                    : e->getFrom()->getAdjListIn().front();
+    if (next == e || next == cur) break;  // avoid circles
+    if (next->pl().oneWay() == 2) break;  // dont follow one way edges
+    if (edgs.count(cur)) return next;
+    cur = next;
+  }
+
+  return 0;
+}
+
+// _____________________________________________________________________________
+std::pair<std::vector<LINE>, Stats> ShapeBuilder::shapeL(Trip* trip) {
+  Stats stats;
+  try {
+    T_START(t);
+    EDijkstra::ITERS = 0;
+    auto hops = shapeify(trip);
+    stats.solveTime = T_STOP(t);
+    stats.numTries = 1;
+    stats.numTrieLeafs = 1;
+    stats.totNumTrips = 1;
+    stats.dijkstraIters = EDijkstra::ITERS;
+    std::map<uint32_t, double> colors;
+    LOG(INFO) << "Matched 1 trip in " << stats.solveTime << " ms.";
+    // print to line
+    return {getGeom(hops, getRAttrs(trip), &colors), stats};
   } catch (const std::runtime_error& e) {
     LOG(ERROR) << e.what();
-    return LINE();
+    return {std::vector<LINE>(), stats};
   }
 }
 
 // _____________________________________________________________________________
-LINE ShapeBuilder::shapeL(Trip* trip) {
-  return shapeL(getNCR(trip), getRAttrs(trip));
+std::map<size_t, pfaedle::router::EdgeListHops> ShapeBuilder::route(
+    const TripTrie* trie, const EdgeCandMap& ecm, HopCache* hopCache) const {
+  return _router->route(trie, ecm, _motCfg.routingOpts, *_restr, hopCache,
+                        _cfg.noFastHops);
 }
 
 // _____________________________________________________________________________
-EdgeListHops ShapeBuilder::route(const router::NodeCandRoute& ncr,
-                                 const router::RoutingAttrs& rAttrs) const {
-  router::Graph g;
+std::map<size_t, EdgeListHops> ShapeBuilder::shapeify(
+    const TripTrie* trie, HopCache* hopCache) const {
+  LOG(VDEBUG) << "Map-matching trie " << trie;
 
-  if (_cfg.solveMethod == "global") {
-    const router::EdgeListHops& ret =
-        _crouter.route(ncr, rAttrs, _motCfg.routingOpts, *_restr, &g);
+  // TODO(patrick): assumes the trie is not empty, check this!
+  assert(trie->getNdTrips().size());
+  assert(trie->getNdTrips().begin()->second.size());
+  RoutingAttrs rAttrs = getRAttrs(trie->getNdTrips().begin()->second[0]);
 
-    // write combination graph
-    if (!_cfg.shapeTripId.empty() && _cfg.writeCombGraph) {
-      LOG(INFO) << "Outputting combgraph.json...";
-      std::ofstream pstr(_cfg.dbgOutputPath + "/combgraph.json");
-      GeoGraphJsonOutput o;
-      o.printLatLng(g, pstr);
-    }
+  std::map<size_t, EdgeListHops> ret;
 
-    return ret;
-  } else if (_cfg.solveMethod == "greedy") {
-    return _crouter.routeGreedy(ncr, rAttrs, _motCfg.routingOpts, *_restr);
-  } else if (_cfg.solveMethod == "greedy2") {
-    return _crouter.routeGreedy2(ncr, rAttrs, _motCfg.routingOpts, *_restr);
-  } else {
-    LOG(ERROR) << "Unknown solution method " << _cfg.solveMethod;
-    exit(1);
+  const auto& routes = route(trie, getECM(trie), hopCache);
+
+  for (const auto& route : routes) {
+    ret[route.first] = route.second;
   }
 
-  return EdgeListHops();
-}
-
-// _____________________________________________________________________________
-pfaedle::router::Shape ShapeBuilder::shape(Trip* trip) const {
-  LOG(VDEBUG) << "Map-matching shape for trip #" << trip->getId() << " of mot "
-              << trip->getRoute()->getType() << "(sn=" << trip->getShortname()
-              << ", rsn=" << trip->getRoute()->getShortName()
-              << ", rln=" << trip->getRoute()->getLongName() << ")";
-  Shape ret;
-  ret.hops = route(getNCR(trip), getRAttrs(trip));
-  ret.avgHopDist = avgHopDist(trip);
-
-  LOG(VDEBUG) << "Finished map-matching for #" << trip->getId();
+  LOG(VDEBUG) << "Finished map-matching for trie " << trie;
 
   return ret;
 }
 
 // _____________________________________________________________________________
-pfaedle::router::Shape ShapeBuilder::shape(Trip* trip) {
+EdgeListHops ShapeBuilder::shapeify(Trip* trip) {
   LOG(VDEBUG) << "Map-matching shape for trip #" << trip->getId() << " of mot "
               << trip->getRoute()->getType() << "(sn=" << trip->getShortname()
               << ", rsn=" << trip->getRoute()->getShortName()
               << ", rln=" << trip->getRoute()->getLongName() << ")";
+  TripTrie trie;
+  trie.addTrip(trip, getRAttrs(trip),
+               _motCfg.routingOpts.transPenMethod == "timenorm", false);
+  const auto& routes = route(&trie, getECM(&trie), 0);
 
-  Shape ret;
-  ret.hops = route(getNCR(trip), getRAttrs(trip));
-  ret.avgHopDist = avgHopDist(trip);
-
-  LOG(VDEBUG) << "Finished map-matching for #" << trip->getId();
-
-  return ret;
+  return routes.begin()->second;
 }
 
 // _____________________________________________________________________________
-void ShapeBuilder::shape(pfaedle::netgraph::Graph* ng) {
-  TrGraphEdgs gtfsGraph;
+Stats ShapeBuilder::shapeify(pfaedle::netgraph::Graph* outNg) {
+  Stats stats;
+  EDijkstra::ITERS = 0;
 
+  T_START(cluster);
   LOG(DEBUG) << "Clustering trips...";
-  Clusters clusters = clusterTrips(_feed, _mots);
-  LOG(DEBUG) << "Clustered trips into " << clusters.size() << " clusters.";
+  const TripForests& forests = clusterTrips(_feed, _mots);
+  for (const auto& forest : forests) {
+    for (const auto& trie : forest.second) {
+      stats.numTries++;
+      stats.numTrieLeafs += trie.getNdTrips().size();
+    }
+  }
+  LOG(DEBUG) << "Clustered trips into " << stats.numTries
+             << " tries with a total of " << stats.numTrieLeafs << " leafs in "
+             << T_STOP(cluster) << "ms";
+
+  LOG(DEBUG) << "Building candidate cache...";
+  buildCandCache(forests);
+  LOG(DEBUG) << "Done.";
+
+  std::map<std::string, size_t> shpUse;
+  RouteRefColors refColors;
 
-  std::map<std::string, size_t> shpUsage;
   for (auto t : _feed->getTrips()) {
-    if (!t.getShape().empty()) shpUsage[t.getShape()]++;
-  }
+    if (!t.getShape().empty()) shpUse[t.getShape()]++;
 
-  // to avoid unfair load balance on threads
-  std::random_shuffle(clusters.begin(), clusters.end());
+    // write the colors of trips we won't touch, but whose route we might
+    if (t.getStopTimes().size() < 2) continue;
+    if (!_mots.count(t.getRoute()->getType()) ||
+        !_motCfg.mots.count(t.getRoute()->getType()))
+      continue;
 
-  size_t iters = EDijkstra::ITERS;
-  size_t totiters = EDijkstra::ITERS;
-  size_t oiters = EDijkstra::ITERS;
-  size_t j = 0;
-
-  auto t1 = TIME();
-  auto t2 = TIME();
-  double totAvgDist = 0;
-  size_t totNumTrips = 0;
-
-#pragma omp parallel for num_threads(_numThreads)
-  for (size_t i = 0; i < clusters.size(); i++) {
-    j++;
-
-    if (j % 10 == 0) {
-#pragma omp critical
-      {
-        LOG(INFO) << "@ " << j << " / " << clusters.size() << " ("
-                  << (static_cast<int>((j * 1.0) / clusters.size() * 100))
-                  << "%, " << (EDijkstra::ITERS - oiters) << " iters, "
-                  << "matching " << (10.0 / (TOOK(t1, TIME()) / 1000))
-                  << " trips/sec)";
-
-        oiters = EDijkstra::ITERS;
-        t1 = TIME();
-      }
-    }
-
-    // explicitly call const version of shape here for thread safety
-    const Shape& cshp =
-        const_cast<const ShapeBuilder&>(*this).shape(clusters[i][0]);
-    totAvgDist += cshp.avgHopDist;
-
-    if (_cfg.buildTransitGraph) {
-#pragma omp critical
-      { writeTransitGraph(cshp, &gtfsGraph, clusters[i]); }
-    }
-
-    std::vector<double> distances;
-    const ad::cppgtfs::gtfs::Shape& shp =
-        getGtfsShape(cshp, clusters[i][0], &distances);
-
-    LOG(VDEBUG) << "Took " << EDijkstra::ITERS - iters << " iterations.";
-    iters = EDijkstra::ITERS;
-
-    totNumTrips += clusters[i].size();
-
-    for (auto t : clusters[i]) {
-      if (_cfg.evaluate && _evalFeed && _ecoll) {
-        std::lock_guard<std::mutex> guard(_shpMutex);
-        _ecoll->add(t, _evalFeed->getShapes().get(t->getShape()), shp,
-                    distances);
-      }
-
-      if (!t->getShape().empty() && shpUsage[t->getShape()] > 0) {
-        shpUsage[t->getShape()]--;
-        if (shpUsage[t->getShape()] == 0) {
-          std::lock_guard<std::mutex> guard(_shpMutex);
-          _feed->getShapes().remove(t->getShape());
-        }
-      }
-      setShape(t, shp, distances);
+    if (!t.getShape().empty() && !_cfg.dropShapes) {
+      refColors[t.getRoute()][t.getRoute()->getColor()].push_back(&t);
     }
   }
 
-  LOG(INFO) << "Matched " << totNumTrips << " trips in " << clusters.size()
-            << " clusters.";
-  LOG(DEBUG) << "Took " << (EDijkstra::ITERS - totiters)
-             << " iterations in total.";
-  LOG(DEBUG) << "Took " << TOOK(t2, TIME()) << " ms in total.";
-  LOG(DEBUG) << "Total avg. tput "
-             << (static_cast<double>(EDijkstra::ITERS - totiters)) /
-                    TOOK(t2, TIME())
-             << " iters/sec";
-  LOG(DEBUG) << "Total avg. trip tput "
-             << (clusters.size() / (TOOK(t2, TIME()) / 1000)) << " trips/sec";
-  LOG(DEBUG) << "Avg hop distance was "
-             << (totAvgDist / static_cast<double>(clusters.size()))
-             << " meters";
+  // we implicitely cluster by routing attrs here. This ensures that now two
+  // threads will access the same routing attrs later on, which safes us an
+  // expensive locking mechanism later on for the hop cache
+  std::vector<const TripForest*> tries;
+  for (const auto& forest : forests) {
+    tries.push_back(&(forest.second));
+    for (const auto& trie : forest.second) {
+      for (const auto& trips : trie.getNdTrips()) {
+        stats.totNumTrips += trips.second.size();
+      }
+    }
+  }
+
+  auto tStart = TIME();
+  std::atomic<size_t> at(0);
+
+  size_t numThreads = std::thread::hardware_concurrency();
+  std::vector<std::thread> thrds(numThreads);
+  std::vector<RouteRefColors> colors(numThreads);
+  std::vector<TrGraphEdgs> gtfsGraphs(numThreads);
+
+  size_t i = 0;
+  for (auto& t : thrds) {
+    t = std::thread(&ShapeBuilder::shapeWorker, this, &tries, &at, &shpUse,
+                    &colors[i], &gtfsGraphs[i]);
+    i++;
+  }
+
+  for (auto& thr : thrds) thr.join();
+
+  stats.solveTime = TOOK(tStart, TIME());
+
+  LOG(INFO) << "Matched " << stats.totNumTrips << " trips in "
+            << stats.solveTime << " ms.";
+
+  // merge colors
+  for (auto& cols : colors) {
+    for (auto& route : cols) {
+      for (auto& col : route.second) {
+        refColors[route.first][col.first].insert(
+            refColors[route.first][col.first].end(), col.second.begin(),
+            col.second.end());
+      }
+    }
+  }
+
+  // update them in the routes, split routes if necessary
+  updateRouteColors(refColors);
 
   if (_cfg.buildTransitGraph) {
-    LOG(INFO) << "Building transit network graph...";
-    buildTrGraph(&gtfsGraph, ng);
+    LOG(DEBUG) << "Building transit network graph...";
+
+    // merge gtfsgraph from threads
+    TrGraphEdgs gtfsGraph;
+
+    for (auto& g : gtfsGraphs) {
+      for (auto& ePair : g) {
+        gtfsGraph[ePair.first].insert(gtfsGraph[ePair.first].begin(),
+                                      ePair.second.begin(), ePair.second.end());
+      }
+    }
+    buildNetGraph(&gtfsGraph, outNg);
+  }
+
+  stats.dijkstraIters = EDijkstra::ITERS;
+
+  return stats;
+}
+
+// _____________________________________________________________________________
+void ShapeBuilder::updateRouteColors(const RouteRefColors& refColors) {
+  for (auto& route : refColors) {
+    if (route.second.size() == 1) {
+      // only one color found for this route, great!
+      // update inplace...
+      route.first->setColor(route.second.begin()->first);
+      if (route.first->getColor() != NO_COLOR)
+        route.first->setTextColor(getTextColor(route.first->getColor()));
+    } else {
+      // are there fare rules using this route?
+      std::vector<
+          std::pair<ad::cppgtfs::gtfs::Fare<ad::cppgtfs::gtfs::Route>*,
+                    ad::cppgtfs::gtfs::FareRule<ad::cppgtfs::gtfs::Route>>>
+          rules;
+
+      for (auto& f : _feed->getFares()) {
+        for (auto r : f.second->getFareRules()) {
+          if (r.getRoute() == route.first) {
+            rules.push_back({f.second, r});
+          }
+        }
+      }
+
+      // add new routes...
+      for (auto& c : route.second) {
+        // keep the original one intact
+        if (c.first == route.first->getColor()) continue;
+
+        auto routeCp = *route.first;
+
+        // find free id
+        std::string newId = route.first->getId() + "::1";
+        size_t i = 1;
+        while (_feed->getRoutes().get(newId)) {
+          i++;
+          newId = route.first->getId() + "::" + std::to_string(i);
+        }
+
+        routeCp.setId(newId);
+        routeCp.setColor(c.first);
+        routeCp.setTextColor(getTextColor(routeCp.getColor()));
+
+        auto newRoute = _feed->getRoutes().add(routeCp);
+
+        // update trips to use that route
+        for (auto& t : c.second) t->setRoute(newRoute);
+
+        // add new fare rules
+        for (auto a : rules) {
+          auto rule = a.second;
+          rule.setRoute(newRoute);
+          a.first->addFareRule(rule);
+        }
+      }
+    }
   }
 }
 
 // _____________________________________________________________________________
 void ShapeBuilder::setShape(Trip* t, const ad::cppgtfs::gtfs::Shape& s,
-                            const std::vector<double>& distances) {
+                            const std::vector<float>& distances) {
   assert(distances.size() == t->getStopTimes().size());
   // set distances
   size_t i = 0;
@@ -291,91 +547,44 @@ void ShapeBuilder::setShape(Trip* t, const ad::cppgtfs::gtfs::Shape& s,
   }
 
   std::lock_guard<std::mutex> guard(_shpMutex);
-  t->setShape(_feed->getShapes().add(s));
+  auto gtfsShp = _feed->getShapes().add(s);
+  t->setShape(gtfsShp);
 }
 
 // _____________________________________________________________________________
 ad::cppgtfs::gtfs::Shape ShapeBuilder::getGtfsShape(
-    const Shape& shp, Trip* t, std::vector<double>* hopDists) {
+    const EdgeListHops& hops, Trip* t, const RoutingAttrs& rAttrs,
+    std::vector<float>* hopDists, uint32_t* bestColor) {
   ad::cppgtfs::gtfs::Shape ret(getFreeShapeId(t));
 
-  assert(shp.hops.size() == t->getStopTimes().size() - 1);
+  assert(hops.size() == t->getStopTimes().size() - 1);
+
+  std::map<uint32_t, double> colors;
+
+  const std::vector<LINE>& gl = getGeom(hops, rAttrs, &colors);
+  const std::vector<float>& measures = getMeasure(gl);
 
   size_t seq = 0;
-  double dist = -1;
-  double lastDist = -1;
   hopDists->push_back(0);
-  POINT last(0, 0);
-  for (const auto& hop : shp.hops) {
-    const trgraph::Node* l = hop.start;
-    if (hop.edges.size() == 0) {
-      POINT ll = webMercToLatLng<PFAEDLE_PRECISION>(
-          hop.start->pl().getGeom()->getX(), hop.start->pl().getGeom()->getY());
-
-      if (dist > -0.5)
-        dist += webMercMeterDist(last, *hop.start->pl().getGeom());
-      else
-        dist = 0;
-
-      last = *hop.start->pl().getGeom();
-
-      if (dist - lastDist > 0.01) {
-        ret.addPoint(ShapePoint(ll.getY(), ll.getX(), dist, seq));
-        seq++;
-        lastDist = dist;
-      }
-
-      dist += webMercMeterDist(last, *hop.end->pl().getGeom());
-      last = *hop.end->pl().getGeom();
-
-      if (dist - lastDist > 0.01) {
-        ll = webMercToLatLng<PFAEDLE_PRECISION>(
-            hop.end->pl().getGeom()->getX(), hop.end->pl().getGeom()->getY());
-        ret.addPoint(ShapePoint(ll.getY(), ll.getX(), dist, seq));
-        seq++;
-        lastDist = dist;
-      }
+  for (size_t i = 0; i < gl.size(); i++) {
+    for (size_t j = 0; j < gl[i].size(); j++) {
+      ret.addPoint(
+          ShapePoint(gl[i][j].getY(), gl[i][j].getX(), measures[seq], seq));
+      seq++;
     }
+    hopDists->push_back(measures[seq - 1]);
+  }
 
-    for (auto i = hop.edges.rbegin(); i != hop.edges.rend(); i++) {
-      const auto* e = *i;
-      if ((e->getFrom() == l) ^ e->pl().isRev()) {
-        for (size_t i = 0; i < e->pl().getGeom()->size(); i++) {
-          const POINT& cur = (*e->pl().getGeom())[i];
-          if (dist > -0.5)
-            dist += webMercMeterDist(last, cur);
-          else
-            dist = 0;
-          last = cur;
-          if (dist - lastDist > 0.01) {
-            POINT ll =
-                webMercToLatLng<PFAEDLE_PRECISION>(cur.getX(), cur.getY());
-            ret.addPoint(ShapePoint(ll.getY(), ll.getX(), dist, seq));
-            seq++;
-            lastDist = dist;
-          }
-        }
-      } else {
-        for (int64_t i = e->pl().getGeom()->size() - 1; i >= 0; i--) {
-          const POINT& cur = (*e->pl().getGeom())[i];
-          if (dist > -0.5)
-            dist += webMercMeterDist(last, cur);
-          else
-            dist = 0;
-          last = cur;
-          if (dist - lastDist > 0.01) {
-            POINT ll =
-                webMercToLatLng<PFAEDLE_PRECISION>(cur.getX(), cur.getY());
-            ret.addPoint(ShapePoint(ll.getY(), ll.getX(), dist, seq));
-            seq++;
-            lastDist = dist;
-          }
-        }
-      }
-      l = e->getOtherNd(l);
+  // get most likely color
+  double best = 0;
+  *bestColor = NO_COLOR;
+  for (const auto& c : colors) {
+    double progr = c.second / measures.back();
+    // TODO(patrick): make threshold configurable
+    if (progr > 0.9 && progr > best) {
+      best = progr;
+      *bestColor = c.first;
     }
-
-    hopDists->push_back(lastDist);
   }
 
   return ret;
@@ -402,21 +611,24 @@ const RoutingAttrs& ShapeBuilder::getRAttrs(const Trip* trip) {
   if (i == _rAttrs.end()) {
     router::RoutingAttrs ret;
 
+    ret.classifier = _classifier;
+
     const auto& lnormzer = _motCfg.osmBuildOpts.lineNormzer;
+    const auto& snormzer = _motCfg.osmBuildOpts.statNormzer;
 
     ret.shortName = lnormzer.norm(trip->getRoute()->getShortName());
+    ret.lineFrom =
+        snormzer.norm(trip->getStopTimes().front().getStop()->getName());
+    ret.lineTo = {
+        snormzer.norm(trip->getStopTimes().back().getStop()->getName())};
 
+    // fallbacks for line name
     if (ret.shortName.empty())
       ret.shortName = lnormzer.norm(trip->getShortname());
 
     if (ret.shortName.empty())
       ret.shortName = lnormzer.norm(trip->getRoute()->getLongName());
 
-    ret.fromString = _motCfg.osmBuildOpts.statNormzer.norm(
-        trip->getStopTimes().begin()->getStop()->getName());
-    ret.toString = _motCfg.osmBuildOpts.statNormzer.norm(
-        (--trip->getStopTimes().end())->getStop()->getName());
-
     return _rAttrs
         .insert(std::pair<const Trip*, router::RoutingAttrs>(trip, ret))
         .first->second;
@@ -433,7 +645,7 @@ const RoutingAttrs& ShapeBuilder::getRAttrs(const Trip* trip) const {
 // _____________________________________________________________________________
 void ShapeBuilder::getGtfsBox(const Feed* feed, const MOTs& mots,
                               const std::string& tid, bool dropShapes,
-                              osm::BBoxIdx* box) {
+                              osm::BBoxIdx* box, double maxSpeed) {
   for (const auto& t : feed->getTrips()) {
     if (!tid.empty() && t.getId() != tid) continue;
     if (tid.empty() && !t.getShape().empty() && !dropShapes) continue;
@@ -441,7 +653,49 @@ void ShapeBuilder::getGtfsBox(const Feed* feed, const MOTs& mots,
 
     if (mots.count(t.getRoute()->getType())) {
       DBox cur;
-      for (const auto& st : t.getStopTimes()) {
+      for (size_t i = 0; i < t.getStopTimes().size(); i++) {
+        // skip outliers
+        const auto& st = t.getStopTimes()[i];
+
+        int toTime = std::numeric_limits<int>::max();
+        double toD = 0;
+        int fromTime = std::numeric_limits<int>::max();
+        double fromD = 0;
+
+        if (i > 0) {
+          const auto& stPrev = t.getStopTimes()[i - 1];
+          toTime = st.getArrivalTime().seconds() -
+                   stPrev.getDepartureTime().seconds();
+          toD = util::geo::haversine(
+              st.getStop()->getLat(), st.getStop()->getLng(),
+              stPrev.getStop()->getLat(), stPrev.getStop()->getLng());
+        }
+
+        if (i < t.getStopTimes().size() - 1) {
+          const auto& stNext = t.getStopTimes()[i + 1];
+          fromTime = stNext.getArrivalTime().seconds() -
+                     st.getDepartureTime().seconds();
+          fromD = util::geo::haversine(
+              st.getStop()->getLat(), st.getStop()->getLng(),
+              stNext.getStop()->getLat(), stNext.getStop()->getLng());
+        }
+
+        const double reqToTime = toD / maxSpeed;
+        const double reqFromTime = fromD / maxSpeed;
+
+        const double BUFFER = 5 * 60;
+
+        if (reqToTime > (BUFFER + toTime) * 3 * MAX_ROUTE_COST_DOUBLING_STEPS &&
+            reqFromTime >
+                (BUFFER + fromTime) * 3 * MAX_ROUTE_COST_DOUBLING_STEPS) {
+          LOG(DEBUG) << "Skipping station " << st.getStop()->getId() << " ("
+                     << st.getStop()->getName() << ") @ "
+                     << st.getStop()->getLat() << ", " << st.getStop()->getLng()
+                     << " for bounding box as the vehicle cannot realistically "
+                        "reach and leave it in the scheduled time";
+          continue;
+        }
+
         cur = extendBox(DPoint(st.getStop()->getLng(), st.getStop()->getLat()),
                         cur);
       }
@@ -451,141 +705,224 @@ void ShapeBuilder::getGtfsBox(const Feed* feed, const MOTs& mots,
 }
 
 // _____________________________________________________________________________
-NodeCandRoute ShapeBuilder::getNCR(Trip* trip) const {
-  router::NodeCandRoute ncr(trip->getStopTimes().size());
+std::vector<double> ShapeBuilder::getTransTimes(Trip* trip) const {
+  std::vector<double> ret;
 
-  size_t i = 0;
+  for (size_t i = 0; i < trip->getStopTimes().size() - 1; i++) {
+    auto cur = trip->getStopTimes()[i];
+    auto next = trip->getStopTimes()[i + 1];
 
-  for (const auto& st : trip->getStopTimes()) {
-    ncr[i] = getNodeCands(st.getStop());
-    if (ncr[i].size() == 0) {
-      throw std::runtime_error("No node candidate found for station '" +
-                               st.getStop()->getName() + "' on trip '" +
-                               trip->getId() + "'");
-    }
-    i++;
-  }
-  return ncr;
-}
+    int depTime = cur.getDepartureTime().seconds();
+    int arrTime = next.getArrivalTime().seconds();
 
-// _____________________________________________________________________________
-double ShapeBuilder::avgHopDist(Trip* trip) const {
-  size_t i = 0;
-  double sum = 0;
+    int diff = arrTime - depTime;
+    if (diff < 1) diff = 1;
 
-  const Stop* prev = 0;
-
-  for (const auto& st : trip->getStopTimes()) {
-    if (!prev) {
-      prev = st.getStop();
-      continue;
-    }
-    auto a = util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(prev->getLat(),
-                                                           prev->getLng());
-    auto b = util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(
-        st.getStop()->getLat(), st.getStop()->getLng());
-    sum += util::geo::webMercMeterDist(a, b);
-
-    prev = st.getStop();
-    i++;
-  }
-  return sum / static_cast<double>(i);
-}
-
-// _____________________________________________________________________________
-Clusters ShapeBuilder::clusterTrips(Feed* f, MOTs mots) {
-  // building an index [start station, end station] -> [cluster]
-
-  std::map<StopPair, std::vector<size_t>> clusterIdx;
-
-  Clusters ret;
-  for (auto& trip : f->getTrips()) {
-    if (!trip.getShape().empty() && !_cfg.dropShapes) continue;
-    if (trip.getStopTimes().size() < 2) continue;
-    if (!mots.count(trip.getRoute()->getType()) ||
-        !_motCfg.mots.count(trip.getRoute()->getType()))
-      continue;
-
-    bool found = false;
-    auto spair = StopPair(trip.getStopTimes().begin()->getStop(),
-                          trip.getStopTimes().rbegin()->getStop());
-    const auto& c = clusterIdx[spair];
-
-    for (size_t i = 0; i < c.size(); i++) {
-      if (routingEqual(ret[c[i]][0], &trip)) {
-        ret[c[i]].push_back(&trip);
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      ret.push_back(Cluster{&trip});
-      // explicit call to write render attrs to cache
-      getRAttrs(&trip);
-      clusterIdx[spair].push_back(ret.size() - 1);
-    }
+    ret.push_back(diff);
+    assert(ret.back() >= 0);
   }
 
   return ret;
 }
 
 // _____________________________________________________________________________
-bool ShapeBuilder::routingEqual(const Stop* a, const Stop* b) {
-  if (a == b) return true;  // trivial
+std::vector<double> ShapeBuilder::getTransDists(Trip* trip) const {
+  std::vector<double> ret;
 
-  auto namea = _motCfg.osmBuildOpts.statNormzer.norm(a->getName());
-  auto nameb = _motCfg.osmBuildOpts.statNormzer.norm(b->getName());
-  if (namea != nameb) return false;
+  for (size_t i = 0; i < trip->getStopTimes().size() - 1; i++) {
+    auto cur = trip->getStopTimes()[i];
+    auto next = trip->getStopTimes()[i + 1];
 
-  auto tracka = _motCfg.osmBuildOpts.trackNormzer.norm(a->getPlatformCode());
-  auto trackb = _motCfg.osmBuildOpts.trackNormzer.norm(b->getPlatformCode());
-  if (tracka != trackb) return false;
+    double dist = util::geo::haversine(
+        cur.getStop()->getLat(), cur.getStop()->getLng(),
+        next.getStop()->getLat(), next.getStop()->getLng());
 
-  POINT ap =
-      util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(a->getLat(), a->getLng());
-  POINT bp =
-      util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(b->getLat(), b->getLng());
+    ret.push_back(dist);
+  }
 
-  double d = util::geo::webMercMeterDist(ap, bp);
-
-  if (d > 1) return false;
-
-  return true;
+  return ret;
 }
 
 // _____________________________________________________________________________
-bool ShapeBuilder::routingEqual(Trip* a, Trip* b) {
-  if (a->getStopTimes().size() != b->getStopTimes().size()) return false;
-  if (getRAttrs(a) != getRAttrs(b)) return false;
+EdgeCandMap ShapeBuilder::getECM(const TripTrie* trie) const {
+  EdgeCandMap ecm(trie->getNds().size());
 
-  auto stb = b->getStopTimes().begin();
-  for (const auto& sta : a->getStopTimes()) {
-    if (!routingEqual(sta.getStop(), stb->getStop())) {
-      return false;
+  for (size_t nid = 1; nid < trie->getNds().size(); nid++) {
+    auto trNd = trie->getNds()[nid];
+    auto parentTrNd = trie->getNds()[trNd.parent];
+
+    if (nid != 1 && !trNd.arr) continue;
+
+    double avgT = 0;
+
+    if (trNd.trips) avgT = trNd.accTime / trNd.trips;
+
+    const auto& cands = getEdgCands(trNd.reprStop);
+    ecm[nid].reserve(cands.size());
+
+    for (auto& cand : cands) {
+      const auto& timeExpCands = timeExpand(cand, avgT);
+      assert(timeExpCands.size());
+
+      for (size_t depChildId : trNd.childs) {
+        if (nid == 1) break;
+        auto chldTrNd = trie->getNds()[depChildId];
+        double avgChildT = 0;
+        if (chldTrNd.trips) avgChildT = chldTrNd.accTime / chldTrNd.trips;
+
+        double timeDiff = avgChildT - avgT;
+        if (timeDiff < 0) timeDiff = 0;
+
+        for (size_t candId = 0; candId < timeExpCands.size(); candId++) {
+          const auto& cand = timeExpCands[candId];
+          ecm[depChildId].push_back(cand);
+          ecm[depChildId].back().time += timeDiff;
+
+          ecm[depChildId].back().pen = timePen(cand.time, avgChildT);
+
+          for (size_t sucCandId = 0; sucCandId < timeExpCands.size();
+               sucCandId++) {
+            if (timeExpCands[sucCandId].time <= ecm[depChildId].back().time) {
+              ecm[depChildId].back().depPrede.push_back(sucCandId +
+                                                        ecm[nid].size());
+            }
+          }
+          assert(ecm[depChildId].back().depPrede.size());
+        }
+      }
+      ecm[nid].insert(ecm[nid].end(), timeExpCands.begin(), timeExpCands.end());
     }
-    stb++;
+
+    assert(ecm[nid].size() != 0);
   }
 
-  return true;
+  return ecm;
+}
+
+// _____________________________________________________________________________
+double ShapeBuilder::timePen(int candTime, int schedTime) const {
+  // standard deviation of normal distribution
+  double standarddev = 5 * 60;
+
+  int diff = abs(candTime - schedTime);
+
+  double cNorm = (diff) / standarddev;
+  return cNorm * cNorm;
+}
+
+// _____________________________________________________________________________
+EdgeCandGroup ShapeBuilder::timeExpand(const EdgeCand& ec, int time) const {
+  EdgeCandGroup ret;
+  // TODO(patrick): heuristic for time expansion variance
+  // for (int i = -5; i < 6; i++) {
+  // for (int i = -10; i < 1; i++) {
+  for (int i = 0; i < 1; i++) {
+    EdgeCand ecNew = ec;
+    // in 30 sec steps
+    ecNew.time = time + i * 30;
+    ecNew.pen = ecNew.pen + timePen(ecNew.time, time);
+    ret.push_back(ecNew);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+TripForests ShapeBuilder::clusterTrips(Feed* f, MOTs mots) {
+  TripForests forest;
+  std::map<RoutingAttrs, std::vector<Trip*>> trips;
+
+  // warm the stop name normalizer caches so a
+  // multithreaded access later on will never write to the underlying cache
+  for (auto& stop : f->getStops()) {
+    const auto& snormzer = _motCfg.osmBuildOpts.statNormzer;
+    auto normedName = snormzer.norm(stop.getName());
+  }
+
+  // cluster by routing attr for parallization later on
+  for (auto& trip : f->getTrips()) {
+    if (!_cfg.dropShapes && !trip.getShape().empty()) continue;
+    if (trip.getStopTimes().size() < 2) continue;
+    if (!mots.count(trip.getRoute()->getType()) ||
+        !_motCfg.mots.count(trip.getRoute()->getType()))
+      continue;
+
+    // important: we are building the routing attributes here, so a
+    // multithreaded access later on will never write to the underlying cache
+    const auto& rAttrs = getRAttrs(&trip);
+
+    trips[rAttrs].push_back(&trip);
+    forest[rAttrs] = {};
+  }
+
+  size_t numThreads = std::thread::hardware_concurrency();
+  std::vector<std::thread> thrds(numThreads);
+  std::vector<std::vector<RoutingAttrs>> attrs(numThreads);
+
+  size_t i = 0;
+  for (auto it : trips) {
+    attrs[i].push_back(it.first);
+    if (++i == numThreads) i = 0;
+  }
+
+  i = 0;
+  for (auto& t : thrds) {
+    t = std::thread(&ShapeBuilder::clusterWorker, this, &attrs[i], &trips,
+                    &forest);
+    i++;
+  }
+
+  for (auto& thr : thrds) thr.join();
+
+  return forest;
+}
+
+// _____________________________________________________________________________
+void ShapeBuilder::clusterWorker(
+    const std::vector<RoutingAttrs>* rAttrsVec,
+    const std::map<RoutingAttrs, std::vector<Trip*>>* trips,
+    TripForests* forest) {
+  for (const auto& rAttrs : *rAttrsVec) {
+    for (auto& trip : trips->at(rAttrs)) {
+      bool ins = false;
+      auto& subForest = forest->at(rAttrs);
+      for (auto& trie : subForest) {
+        if (trie.addTrip(trip, rAttrs,
+                         _motCfg.routingOpts.transPenMethod == "timenorm",
+                         _cfg.noTrie)) {
+          ins = true;
+          break;
+        }
+      }
+
+      if (!ins) {
+        subForest.resize(subForest.size() + 1);
+        subForest.back().addTrip(
+            trip, rAttrs, _motCfg.routingOpts.transPenMethod == "timenorm",
+            false);
+      }
+    }
+  }
 }
 
 // _____________________________________________________________________________
 const pfaedle::trgraph::Graph* ShapeBuilder::getGraph() const { return _g; }
 
 // _____________________________________________________________________________
-void ShapeBuilder::writeTransitGraph(const Shape& shp, TrGraphEdgs* edgs,
-                                     const Cluster& cluster) const {
-  for (auto hop : shp.hops) {
+void ShapeBuilder::writeTransitGraph(
+    const router::EdgeListHops& hops, TrGraphEdgs* edgs,
+    const std::vector<pfaedle::gtfs::Trip*>& trips) const {
+  for (const auto& hop : hops) {
     for (const auto* e : hop.edges) {
       if (e->pl().isRev()) e = _g->getEdg(e->getTo(), e->getFrom());
-      (*edgs)[e].insert(cluster.begin(), cluster.end());
+      (*edgs)[e].insert((*edgs)[e].begin(), trips.begin(), trips.end());
     }
   }
 }
 
 // _____________________________________________________________________________
-void ShapeBuilder::buildTrGraph(TrGraphEdgs* edgs,
-                                pfaedle::netgraph::Graph* ng) const {
+void ShapeBuilder::buildNetGraph(TrGraphEdgs* edgs,
+                                 pfaedle::netgraph::Graph* ng) const {
   std::unordered_map<trgraph::Node*, pfaedle::netgraph::Node*> nodes;
 
   for (auto ep : *edgs) {
@@ -607,3 +944,275 @@ void ShapeBuilder::buildTrGraph(TrGraphEdgs* edgs,
                pfaedle::netgraph::EdgePL(*e->pl().getGeom(), ep.second));
   }
 }
+
+// _____________________________________________________________________________
+std::vector<LINE> ShapeBuilder::getGeom(
+    const EdgeListHops& hops, const RoutingAttrs& rAttrs,
+    std::map<uint32_t, double>* colors) const {
+  std::vector<LINE> ret;
+
+  for (size_t i = hops.size(); i > 0; i--) {
+    const auto& hop = hops[i - 1];
+    if (!hop.start || !hop.end) {
+      // no hop was found, use the fallback geometry
+
+      if (hop.start) {
+        auto l = getLine(hop.start);
+        if (hop.progrStart > 0) {
+          PolyLine<PFDL_PREC> pl(l);
+          const auto& seg = pl.getSegment(hop.progrStart, 1);
+          ret.push_back({seg.getLine().front(), hop.pointEnd});
+        } else {
+          ret.push_back({*hop.start->getFrom()->pl().getGeom(), hop.pointEnd});
+        }
+      } else if (hop.end) {
+        auto l = getLine(hop.end);
+        if (hop.progrEnd > 0) {
+          PolyLine<PFDL_PREC> pl(l);
+          const auto& seg = pl.getSegment(0, hop.progrEnd);
+          ret.push_back({hop.pointStart, seg.getLine().back()});
+        } else {
+          ret.push_back({hop.pointStart, *hop.end->getFrom()->pl().getGeom()});
+        }
+      } else {
+        ret.push_back({hop.pointEnd, hop.pointStart});
+      }
+    } else {
+      const auto& l = getLine(hop, rAttrs, colors);
+      ret.push_back(l);
+    }
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+LINE ShapeBuilder::getLine(const EdgeListHop& hop, const RoutingAttrs& rAttrs,
+                           std::map<uint32_t, double>* colors) const {
+  LINE l;
+
+  const auto& curL = getLine(hop.start);
+
+  if (hop.edges.size() == 0) {
+    // draw direct line between positions on edges
+    if (hop.progrStart > 0) {
+      PolyLine<PFDL_PREC> pl(curL);
+      const auto& seg = pl.getSegment(hop.progrStart, 1);
+      l.push_back(seg.front());
+    } else {
+      l.push_back(curL.front());
+    }
+
+    if (hop.progrEnd > 0) {
+      PolyLine<PFDL_PREC> pl(getLine(hop.end));
+      const auto& seg = pl.getSegment(0, hop.progrEnd);
+      l.push_back(seg.back());
+    } else {
+      l.push_back(*hop.end->getFrom()->pl().getGeom());
+    }
+
+    return l;
+  }
+
+  // special case: start and end are on the same edge!
+  if (hop.edges.size() == 1 && hop.start == hop.end) {
+    PolyLine<PFDL_PREC> pl(curL);
+    const auto& seg = pl.getSegment(hop.progrStart, hop.progrEnd);
+    l.insert(l.end(), seg.getLine().begin(), seg.getLine().end());
+
+    for (const auto& color : getColorMatch(hop.start, rAttrs)) {
+      (*colors)[color] += hop.start->pl().getLength();
+    }
+
+    return l;
+  }
+
+  auto from = hop.start->getFrom();
+
+  if (hop.progrStart > 0) {
+    PolyLine<PFDL_PREC> pl(curL);
+    const auto& seg = pl.getSegment(hop.progrStart, 1);
+    l.insert(l.end(), seg.getLine().begin(), seg.getLine().end());
+
+    double l = hop.start->pl().getLength() * (1 - hop.progrStart);
+    for (const auto& color : getColorMatch(hop.start, rAttrs)) {
+      (*colors)[color] += l;
+    }
+  } else {
+    l.insert(l.end(), curL.begin(), curL.end());
+
+    double l = hop.start->pl().getLength();
+    for (const auto& color : getColorMatch(hop.start, rAttrs)) {
+      (*colors)[color] += l;
+    }
+  }
+
+  from = hop.start->getOtherNd(from);
+
+  if (hop.edges.size() > 1) {
+    for (size_t j = hop.edges.size() - 2; j > 0; j--) {
+      const auto* e = hop.edges[j];
+      const auto& curL = getLine(e);
+      l.insert(l.end(), curL.begin(), curL.end());
+      from = e->getOtherNd(from);
+
+      double l = e->pl().getLength();
+      for (const auto& color : getColorMatch(e, rAttrs)) {
+        (*colors)[color] += l;
+      }
+    }
+  }
+
+  if (hop.progrEnd > 0) {
+    PolyLine<PFDL_PREC> pl(getLine(hop.end));
+    const auto& seg = pl.getSegment(0, hop.progrEnd);
+    l.insert(l.end(), seg.getLine().begin(), seg.getLine().end());
+
+    double l = hop.end->pl().getLength() * hop.progrEnd;
+    for (const auto& color : getColorMatch(hop.end, rAttrs)) {
+      (*colors)[color] += l;
+    }
+  }
+
+  if (l.size() > 1) return util::geo::simplify(l, 0.5 / M_PER_DEG);
+  return l;
+}
+
+// _____________________________________________________________________________
+LINE ShapeBuilder::getLine(const trgraph::Edge* e) const {
+  LINE l;
+  if (!e->pl().getGeom() || e->pl().getGeom()->size() == 0)
+    return {*e->getFrom()->pl().getGeom(), *e->getTo()->pl().getGeom()};
+  if (e->pl().isRev()) {
+    l.insert(l.end(), e->pl().getGeom()->rbegin(), e->pl().getGeom()->rend());
+  } else {
+    l.insert(l.end(), e->pl().getGeom()->begin(), e->pl().getGeom()->end());
+  }
+  return l;
+}
+
+// _____________________________________________________________________________
+std::vector<float> ShapeBuilder::getMeasure(
+    const std::vector<LINE>& lines) const {
+  assert(lines.size());
+  assert(lines.front().size());
+  std::vector<float> ret;
+  POINT last = lines.front().front();
+
+  for (const auto& l : lines) {
+    for (size_t i = 0; i < l.size(); i++) {
+      if (ret.size() == 0) {
+        ret.push_back(0);
+      } else {
+        float v = ret.back() + util::geo::haversine(last, l[i]);
+        assert(v >= ret.back());  // required by GTFS standard!
+        ret.push_back(v);
+      }
+      last = l[i];
+    }
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+void ShapeBuilder::shapeWorker(
+    const std::vector<const TripForest*>* tries, std::atomic<size_t>* at,
+    std::map<std::string, size_t>* shpUse,
+    std::map<Route*, std::map<uint32_t, std::vector<gtfs::Trip*>>>* routeColors,
+    TrGraphEdgs* gtfsGraph) {
+  while (1) {
+    size_t j = (*at)++;
+    if (j >= tries->size()) return;
+
+    int step = tries->size() < 10 ? tries->size() : 10;
+
+    if (j % (tries->size() / step) == 0) {
+      LOG(INFO) << "@ " << (static_cast<int>((j * 1.0) / tries->size() * 100))
+                << "%";
+      LOG(DEBUG) << "(@ trie forest " << j << "/" << tries->size() << ")";
+    }
+
+    const auto& forest = *((*tries)[j]);
+
+    // hop cache per forest, thus per routing attributes
+    HopCache hopCacheLoc;
+    HopCache* hopCache = 0;
+
+    if (!_cfg.noHopCache) hopCache = &hopCacheLoc;
+
+    for (size_t i = 0; i < forest.size(); i++) {
+      const TripTrie* trie = &(forest[i]);
+      const auto& hops = shapeify(trie, hopCache);
+
+      for (const auto& leaf : trie->getNdTrips()) {
+        std::vector<float> distances;
+        const RoutingAttrs& rAttrs = trie->getNd(leaf.first).rAttrs;
+
+        uint32_t color;
+
+        const ad::cppgtfs::gtfs::Shape& shp = getGtfsShape(
+            hops.at(leaf.first), leaf.second[0], rAttrs, &distances, &color);
+
+        if (_cfg.buildTransitGraph) {
+          writeTransitGraph(hops.at(leaf.first), gtfsGraph, leaf.second);
+        }
+
+        for (auto t : leaf.second) {
+          if (_cfg.writeColors && color != NO_COLOR &&
+              t->getRoute()->getColor() == NO_COLOR &&
+              t->getRoute()->getTextColor() == NO_COLOR) {
+            (*routeColors)[t->getRoute()][color].push_back(t);
+          } else {
+            // else, use the original route color
+            (*routeColors)[t->getRoute()][t->getRoute()->getColor()].push_back(
+                t);
+          }
+
+          if (!t->getShape().empty() && (*shpUse)[t->getShape()] > 0) {
+            (*shpUse)[t->getShape()]--;
+            if ((*shpUse)[t->getShape()] == 0) {
+              std::lock_guard<std::mutex> guard(_shpMutex);
+              _feed->getShapes().remove(t->getShape());
+            }
+          }
+          setShape(t, shp, distances);
+        }
+      }
+    }
+  }
+}
+
+// _____________________________________________________________________________
+void ShapeBuilder::edgCandWorker(std::vector<const Stop*>* stops,
+                                 GrpCache* cache) {
+  for (auto stop : *stops) {
+    (*cache)[stop] = getEdgCands(stop);
+  }
+}
+
+// _____________________________________________________________________________
+std::set<uint32_t> ShapeBuilder::getColorMatch(
+    const trgraph::Edge* e, const RoutingAttrs& rAttrs) const {
+  std::set<uint32_t> ret;
+  for (const auto* l : e->pl().getLines()) {
+    auto simi = rAttrs.simi(l);
+    if (simi.nameSimilar && l->color != NO_COLOR) ret.insert(l->color);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+uint32_t ShapeBuilder::getTextColor(uint32_t c) const {
+  double r = (c & 0x00FF0000) >> 16;
+  double g = (c & 0x0000FF00) >> 8;
+  double b = (c & 0x000000FF);
+
+  // gray value approx
+  double a = sqrt((r * r + g * g + b * b) / 3);
+
+  // below a certain gray value, use white, else black
+  if (a < 140) return 0x00FFFFFF;
+  return 0;
+}
diff --git a/src/pfaedle/router/ShapeBuilder.h b/src/pfaedle/router/ShapeBuilder.h
index 560d1b2..8087e84 100644
--- a/src/pfaedle/router/ShapeBuilder.h
+++ b/src/pfaedle/router/ShapeBuilder.h
@@ -9,39 +9,41 @@
 #include <set>
 #include <string>
 #include <unordered_map>
+#include <map>
 #include <utility>
 #include <vector>
 #include "ad/cppgtfs/gtfs/Feed.h"
 #include "pfaedle/Def.h"
 #include "pfaedle/config/MotConfig.h"
 #include "pfaedle/config/PfaedleConfig.h"
-#include "pfaedle/eval/Collector.h"
 #include "pfaedle/gtfs/Feed.h"
 #include "pfaedle/netgraph/Graph.h"
 #include "pfaedle/osm/Restrictor.h"
 #include "pfaedle/router/Misc.h"
 #include "pfaedle/router/Router.h"
+#include "pfaedle/router/Stats.h"
+#include "pfaedle/router/TripTrie.h"
+#include "pfaedle/statsimi-classifier/StatsimiClassifier.h"
 #include "pfaedle/trgraph/Graph.h"
 #include "util/geo/Geo.h"
 
 namespace pfaedle {
 namespace router {
 
-using ad::cppgtfs::gtfs::Stop;
-using pfaedle::gtfs::Trip;
-using pfaedle::gtfs::Feed;
-
-struct Shape {
-  router::EdgeListHops hops;
-  double avgHopDist;
-};
-
-typedef std::vector<Trip*> Cluster;
-typedef std::vector<Cluster> Clusters;
-typedef std::pair<const Stop*, const Stop*> StopPair;
-typedef std::unordered_map<const Trip*, router::RoutingAttrs> TripRAttrs;
-typedef std::unordered_map<const trgraph::Edge*, std::set<const Trip*>>
+typedef std::vector<TripTrie> TripForest;
+typedef std::map<router::RoutingAttrs, TripForest> TripForests;
+typedef std::pair<const ad::cppgtfs::gtfs::Stop*,
+                  const ad::cppgtfs::gtfs::Stop*>
+    StopPair;
+typedef std::unordered_map<const pfaedle::gtfs::Trip*, router::RoutingAttrs>
+    TripRAttrs;
+typedef std::unordered_map<const trgraph::Edge*,
+                           std::vector<const pfaedle::gtfs::Trip*>>
     TrGraphEdgs;
+typedef std::map<Route*, std::map<uint32_t, std::vector<gtfs::Trip*>>>
+    RouteRefColors;
+typedef std::unordered_map<const ad::cppgtfs::gtfs::Stop*, EdgeCandGroup>
+    GrpCache;
 
 /*
  * Layer class for the router. Provides an interface for direct usage with
@@ -49,76 +51,116 @@ typedef std::unordered_map<const trgraph::Edge*, std::set<const Trip*>>
  */
 class ShapeBuilder {
  public:
-  ShapeBuilder(Feed* feed, ad::cppgtfs::gtfs::Feed* evalFeed, MOTs mots,
-               const config::MotConfig& motCfg, eval::Collector* ecoll,
-               trgraph::Graph* g, router::FeedStops* stops,
-               osm::Restrictor* restr, const config::Config& cfg);
+  ShapeBuilder(
+      pfaedle::gtfs::Feed* feed, MOTs mots, const config::MotConfig& motCfg,
+      trgraph::Graph* g, router::FeedStops* stops, osm::Restrictor* restr,
+      const pfaedle::statsimiclassifier::StatsimiClassifier* classifier,
+      router::Router* router, const config::Config& cfg);
 
-  void shape(pfaedle::netgraph::Graph* ng);
+  Stats shapeify(pfaedle::netgraph::Graph* outNg);
 
   router::FeedStops* getFeedStops();
 
-  const NodeCandGroup& getNodeCands(const Stop* s) const;
+  // shape single trip
+  std::pair<std::vector<LINE>, Stats> shapeL(pfaedle::gtfs::Trip* trip);
 
-  LINE shapeL(const router::NodeCandRoute& ncr,
-              const router::RoutingAttrs& rAttrs);
-  LINE shapeL(Trip* trip);
-
-  pfaedle::router::Shape shape(Trip* trip) const;
-  pfaedle::router::Shape shape(Trip* trip);
+  std::map<size_t, EdgeListHops> shapeify(const TripTrie* trie,
+                                          HopCache* hopCache) const;
+  EdgeListHops shapeify(pfaedle::gtfs::Trip* trip);
 
   const trgraph::Graph* getGraph() const;
 
-  static void getGtfsBox(const Feed* feed, const MOTs& mots,
+  static void getGtfsBox(const pfaedle::gtfs::Feed* feed, const MOTs& mots,
                          const std::string& tid, bool dropShapes,
-                         osm::BBoxIdx* box);
+                         osm::BBoxIdx* box, double maxSpeed);
 
  private:
-  Feed* _feed;
-  ad::cppgtfs::gtfs::Feed* _evalFeed;
+  pfaedle::gtfs::Feed* _feed;
   MOTs _mots;
   config::MotConfig _motCfg;
-  eval::Collector* _ecoll;
   config::Config _cfg;
   trgraph::Graph* _g;
-  router::Router _crouter;
-
   router::FeedStops* _stops;
 
-  NodeCandGroup _emptyNCG;
+  EdgeCandGroup _emptyNCG;
 
-  size_t _curShpCnt, _numThreads;
+  size_t _curShpCnt;
 
   std::mutex _shpMutex;
 
   TripRAttrs _rAttrs;
 
   osm::Restrictor* _restr;
+  const pfaedle::statsimiclassifier::StatsimiClassifier* _classifier;
+  GrpCache _grpCache;
 
-  void buildGraph(router::FeedStops* fStops);
+  router::Router* _router;
 
-  Clusters clusterTrips(Feed* f, MOTs mots);
-  void writeTransitGraph(const Shape& shp, TrGraphEdgs* edgs,
-                         const Cluster& cluster) const;
-  void buildTrGraph(TrGraphEdgs* edgs, pfaedle::netgraph::Graph* ng) const;
+  TripForests clusterTrips(pfaedle::gtfs::Feed* f, MOTs mots);
+  void buildNetGraph(TrGraphEdgs* edgs, pfaedle::netgraph::Graph* ng) const;
 
-  std::string getFreeShapeId(Trip* t);
+  std::string getFreeShapeId(pfaedle::gtfs::Trip* t);
+  ad::cppgtfs::gtfs::Shape getGtfsShape(const EdgeListHops& shp,
+                                        pfaedle::gtfs::Trip* t,
+                                        const RoutingAttrs& rAttrs,
+                                        std::vector<float>* hopDists,
+                                        uint32_t* bestColor);
 
-  ad::cppgtfs::gtfs::Shape getGtfsShape(const Shape& shp, Trip* t,
-                                        std::vector<double>* hopDists);
+  void setShape(pfaedle::gtfs::Trip* t, const ad::cppgtfs::gtfs::Shape& s,
+                const std::vector<float>& dists);
 
-  void setShape(Trip* t, const ad::cppgtfs::gtfs::Shape& s,
-                const std::vector<double>& dists);
+  EdgeCandGroup getEdgCands(const ad::cppgtfs::gtfs::Stop* s) const;
 
-  router::NodeCandRoute getNCR(Trip* trip) const;
-  double avgHopDist(Trip* trip) const;
-  const router::RoutingAttrs& getRAttrs(const Trip* trip) const;
-  const router::RoutingAttrs& getRAttrs(const Trip* trip);
-  bool routingEqual(Trip* a, Trip* b);
-  bool routingEqual(const Stop* a, const Stop* b);
-  router::EdgeListHops route(const router::NodeCandRoute& ncr,
-                             const router::RoutingAttrs& rAttrs) const;
+  router::EdgeCandMap getECM(const TripTrie* trie) const;
+  std::vector<double> getTransTimes(pfaedle::gtfs::Trip* trip) const;
+  std::vector<double> getTransDists(pfaedle::gtfs::Trip* trip) const;
+  const router::RoutingAttrs& getRAttrs(const pfaedle::gtfs::Trip* trip) const;
+  const router::RoutingAttrs& getRAttrs(const pfaedle::gtfs::Trip* trip);
+  std::map<size_t, router::EdgeListHops> route(const TripTrie* trie,
+                                               const EdgeCandMap& ecm,
+                                               HopCache* hopCache) const;
+  void buildCandCache(const TripForests& clusters);
+  void buildIndex();
+
+  std::vector<LINE> getGeom(const EdgeListHops& shp, const RoutingAttrs& rAttrs,
+                            std::map<uint32_t, double>* colors) const;
+  double timePen(int candTime, int schedTime) const;
+
+  LINE getLine(const EdgeListHop& hop, const RoutingAttrs&,
+               std::map<uint32_t, double>* colMap) const;
+  LINE getLine(const trgraph::Edge* edg) const;
+  std::vector<float> getMeasure(const std::vector<LINE>& lines) const;
+
+  trgraph::Edge* deg2reachable(trgraph::Edge* e,
+                               std::set<trgraph::Edge*> edgs) const;
+
+  EdgeCandGroup timeExpand(const EdgeCand& ec, int time) const;
+
+  std::set<uint32_t> getColorMatch(const trgraph::Edge* e,
+                                   const RoutingAttrs& rAttrs) const;
+
+  void updateRouteColors(const RouteRefColors& c);
+
+  uint32_t getTextColor(uint32_t c) const;
+
+  void writeTransitGraph(const router::EdgeListHops& shp, TrGraphEdgs* edgs,
+                         const std::vector<pfaedle::gtfs::Trip*>& trips) const;
+
+  void shapeWorker(
+      const std::vector<const TripForest*>* tries, std::atomic<size_t>* at,
+      std::map<std::string, size_t>* shpUsage,
+      std::map<Route*, std::map<uint32_t, std::vector<gtfs::Trip*>>>*,
+      TrGraphEdgs* gtfsGraph);
+
+  void edgCandWorker(std::vector<const Stop*>* stops, GrpCache* cache);
+  void clusterWorker(const std::vector<RoutingAttrs>* rAttrs,
+                     const std::map<RoutingAttrs, std::vector<Trip*>>* trips,
+                     TripForests* forest);
+
+  pfaedle::trgraph::EdgeGrid _eGrid;
+  pfaedle::trgraph::NodeGrid _nGrid;
 };
+
 }  // namespace router
 }  // namespace pfaedle
 
diff --git a/src/pfaedle/router/Stats.h b/src/pfaedle/router/Stats.h
new file mode 100644
index 0000000..c01f0e2
--- /dev/null
+++ b/src/pfaedle/router/Stats.h
@@ -0,0 +1,33 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef PFAEDLE_ROUTER_STATS_H_
+#define PFAEDLE_ROUTER_STATS_H_
+
+#include <algorithm>
+#include <iostream>
+#include <string>
+#include "util/String.h"
+
+namespace pfaedle {
+namespace router {
+
+struct Stats {
+  Stats()
+      : totNumTrips(0),
+        numTries(0),
+        numTrieLeafs(0),
+        solveTime(0),
+        dijkstraIters(0) {}
+  size_t totNumTrips;
+  size_t numTries;
+  size_t numTrieLeafs;
+  double solveTime;
+  size_t dijkstraIters;
+};
+
+}  // namespace router
+}  // namespace pfaedle
+
+#endif  // PFAEDLE_ROUTER_STATS_H_
diff --git a/src/pfaedle/router/TripTrie.cpp b/src/pfaedle/router/TripTrie.cpp
new file mode 100644
index 0000000..470ee09
--- /dev/null
+++ b/src/pfaedle/router/TripTrie.cpp
@@ -0,0 +1,219 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <map>
+#include <string>
+#include <vector>
+#include "TripTrie.h"
+#include "ad/cppgtfs/gtfs/Feed.h"
+#include "pfaedle/gtfs/Feed.h"
+#include "pfaedle/gtfs/StopTime.h"
+#include "pfaedle/router/TripTrie.h"
+
+using pfaedle::gtfs::Trip;
+using pfaedle::router::TripTrie;
+
+// _____________________________________________________________________________
+bool TripTrie::addTrip(pfaedle::gtfs::Trip* trip, const RoutingAttrs& rAttrs,
+                       bool timeEx, bool degen) {
+  if (!degen) return add(trip, rAttrs, timeEx);
+
+  // check if trip is already fully and uniquely contained, if not, fail
+  size_t existing = get(trip, timeEx);
+  if (existing && _nds[existing].childs.size() == 0) {
+    _tripNds[trip] = existing;
+    _ndTrips[existing].push_back(trip);
+    return true;
+  } else {
+    return false;
+  }
+}
+
+// _____________________________________________________________________________
+bool TripTrie::add(pfaedle::gtfs::Trip* trip, const RoutingAttrs& rAttrs,
+                   bool timeEx) {
+  if (trip->getStopTimes().size() == 0) return false;
+
+  int startSecs = trip->getStopTimes().front().getDepartureTime().seconds();
+
+  size_t curNdId = 0;
+  for (size_t stId = 0; stId < trip->getStopTimes().size(); stId++) {
+    const auto st = trip->getStopTimes()[stId];
+
+    std::string name = st.getStop()->getName();
+    std::string platform = st.getStop()->getPlatformCode();
+    POINT pos = util::geo::latLngToWebMerc<PFDL_PREC>(st.getStop()->getLat(),
+                                                      st.getStop()->getLng());
+
+    if (stId > 0) {
+      int arrTime = st.getArrivalTime().seconds() - startSecs;
+
+      size_t arrChild =
+          getMatchChild(curNdId, name, platform, pos, arrTime, timeEx);
+
+      if (arrChild) {
+        curNdId = arrChild;
+
+        _nds[arrChild].accTime += arrTime;
+        _nds[arrChild].trips += 1;
+
+        _nds[arrChild].rAttrs.merge(rAttrs);
+      } else {
+        curNdId = insert(st.getStop(), rAttrs, pos, arrTime, true, curNdId);
+      }
+    }
+
+    if (stId < trip->getStopTimes().size() - 1) {
+      int depTime = st.getDepartureTime().seconds() - startSecs;
+
+      size_t depChild =
+          getMatchChild(curNdId, name, platform, pos, depTime, timeEx);
+
+      if (depChild) {
+        curNdId = depChild;
+
+        _nds[depChild].accTime += depTime;
+        _nds[depChild].trips += 1;
+
+        _nds[depChild].rAttrs.merge(rAttrs);
+      } else {
+        if (stId == 0 && _tripNds.size() > 0) return false;
+        curNdId = insert(st.getStop(), rAttrs, pos, depTime, false, curNdId);
+      }
+    }
+  }
+
+  // curNdId is now the last matching node, insert the trip here
+  _tripNds[trip] = curNdId;
+  _ndTrips[curNdId].push_back(trip);
+
+  return true;
+}
+
+// _____________________________________________________________________________
+size_t TripTrie::get(pfaedle::gtfs::Trip* trip, bool timeEx) {
+  if (trip->getStopTimes().size() == 0) return false;
+
+  int startSecs = trip->getStopTimes().front().getDepartureTime().seconds();
+
+  size_t curNdId = 0;
+  for (size_t stId = 0; stId < trip->getStopTimes().size(); stId++) {
+    const auto st = trip->getStopTimes()[stId];
+
+    std::string name = st.getStop()->getName();
+    std::string platform = st.getStop()->getPlatformCode();
+    POINT pos = util::geo::latLngToWebMerc<PFDL_PREC>(st.getStop()->getLat(),
+                                                      st.getStop()->getLng());
+
+    if (stId > 0) {
+      int arrTime = st.getArrivalTime().seconds() - startSecs;
+
+      size_t arrChild =
+          getMatchChild(curNdId, name, platform, pos, arrTime, timeEx);
+
+      if (arrChild) {
+        curNdId = arrChild;
+      } else {
+        return 0;
+      }
+    }
+
+    if (stId < trip->getStopTimes().size() - 1) {
+      int depTime = st.getDepartureTime().seconds() - startSecs;
+
+      size_t depChild =
+          getMatchChild(curNdId, name, platform, pos, depTime, timeEx);
+
+      if (depChild) {
+        curNdId = depChild;
+      } else {
+        return 0;
+      }
+    }
+  }
+
+  return curNdId;
+}
+
+// _____________________________________________________________________________
+size_t TripTrie::insert(const ad::cppgtfs::gtfs::Stop* stop,
+                        const RoutingAttrs& rAttrs, const POINT& pos, int time,
+                        bool arr, size_t parent) {
+  _nds.emplace_back(TripTrieNd{stop,
+                               stop->getName(),
+                               stop->getPlatformCode(),
+                               pos,
+                               stop->getLat(),
+                               stop->getLng(),
+                               time,
+                               arr,
+                               time,
+                               1,
+                               parent,
+                               {},
+                               rAttrs});
+  _nds[parent].childs.push_back(_nds.size() - 1);
+  return _nds.size() - 1;
+}
+
+// _____________________________________________________________________________
+const std::vector<pfaedle::router::TripTrieNd>& TripTrie::getNds() const {
+  return _nds;
+}
+
+// _____________________________________________________________________________
+size_t TripTrie::getMatchChild(size_t parentNid, const std::string& stopName,
+                               const std::string& platform, POINT pos, int time,
+                               bool timeEx) const {
+  for (size_t child : _nds[parentNid].childs) {
+    // TODO(patrick): use similarity classification here?
+    if (_nds[child].stopName == stopName && _nds[child].platform == platform &&
+        util::geo::dist(_nds[child].pos, pos) < 1 &&
+        (!timeEx || _nds[child].time == time)) {
+      return child;
+    }
+  }
+
+  return 0;
+}
+
+// _____________________________________________________________________________
+void TripTrie::toDot(std::ostream& os, const std::string& rootName,
+                     size_t gid) const {
+  os << "digraph triptrie" << gid << " {";
+
+  for (size_t nid = 0; nid < _nds.size(); nid++) {
+    std::string color = "white";
+    if (_ndTrips.count(nid)) color = "red";
+    if (nid == 0) {
+      os << "\"" << gid << ":0\" [label=\"" << rootName << "\"];\n";
+    } else {
+      os << "\"" << gid << ":" << nid
+         << "\" [shape=\"box\" style=\"filled\" fillcolor=\"" << color
+         << "\" label=\"#" << nid << ", " << _nds[nid].stopName << "@"
+         << util::geo::getWKT(_nds[nid].pos) << " t=" << _nds[nid].time
+         << "\"];\n";
+    }
+  }
+
+  for (size_t nid = 0; nid < _nds.size(); nid++) {
+    for (size_t child : _nds[nid].childs) {
+      os << "\"" << gid << ":" << nid << "\" -> \"" << gid << ":" << child
+         << "\";\n";
+    }
+  }
+
+  os << "}";
+}
+
+// _____________________________________________________________________________
+const std::map<size_t, std::vector<pfaedle::gtfs::Trip*>>&
+TripTrie::getNdTrips() const {
+  return _ndTrips;
+}
+
+// _____________________________________________________________________________
+const pfaedle::router::TripTrieNd& TripTrie::getNd(size_t nid) const {
+  return _nds[nid];
+}
diff --git a/src/pfaedle/router/TripTrie.h b/src/pfaedle/router/TripTrie.h
new file mode 100644
index 0000000..e03217f
--- /dev/null
+++ b/src/pfaedle/router/TripTrie.h
@@ -0,0 +1,65 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef PFAEDLE_ROUTER_TRIPTRIE_H_
+#define PFAEDLE_ROUTER_TRIPTRIE_H_
+
+#include <vector>
+#include <map>
+#include <string>
+#include "ad/cppgtfs/gtfs/Feed.h"
+#include "pfaedle/gtfs/Feed.h"
+#include "pfaedle/gtfs/StopTime.h"
+#include "pfaedle/router/RoutingAttrs.h"
+
+namespace pfaedle {
+namespace router {
+
+struct TripTrieNd {
+  const ad::cppgtfs::gtfs::Stop* reprStop;
+  std::string stopName;  // the stop name at this node
+  std::string platform;  // the platform of node
+  POINT pos;             // the position of this node
+  double lat, lng;
+  int time;
+  bool arr;
+  int accTime;
+  size_t trips;
+  size_t parent;
+  std::vector<size_t> childs;
+  RoutingAttrs rAttrs;
+};
+
+class TripTrie {
+ public:
+  // init node 0, this is the first decision node
+  TripTrie() : _nds(1) {}
+  bool addTrip(pfaedle::gtfs::Trip* trip, const RoutingAttrs& rAttrs,
+               bool timeEx, bool degen);
+
+  const std::vector<TripTrieNd>& getNds() const;
+  const TripTrieNd& getNd(size_t nid) const;
+
+  void toDot(std::ostream& os, const std::string& rootName, size_t gid) const;
+  const std::map<size_t, std::vector<pfaedle::gtfs::Trip*>>& getNdTrips() const;
+
+ private:
+  std::vector<TripTrieNd> _nds;
+  std::map<pfaedle::gtfs::Trip*, size_t> _tripNds;
+  std::map<size_t, std::vector<pfaedle::gtfs::Trip*>> _ndTrips;
+
+  bool add(pfaedle::gtfs::Trip* trip, const RoutingAttrs& rAttrs, bool timeEx);
+  size_t get(pfaedle::gtfs::Trip* trip, bool timeEx);
+
+  size_t getMatchChild(size_t parentNid, const std::string& stopName,
+                       const std::string& platform, POINT pos, int time,
+                       bool timeEx) const;
+  size_t insert(const ad::cppgtfs::gtfs::Stop* stop, const RoutingAttrs& rAttrs,
+                const POINT& pos, int time, bool arr, size_t parent);
+};
+
+}  // namespace router
+}  // namespace pfaedle
+
+#endif  // PFAEDLE_ROUTER_TRIPTRIE_H_
diff --git a/src/pfaedle/router/Weights.cpp b/src/pfaedle/router/Weights.cpp
new file mode 100644
index 0000000..70a3aef
--- /dev/null
+++ b/src/pfaedle/router/Weights.cpp
@@ -0,0 +1,261 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <limits>
+#include "pfaedle/router/Weights.h"
+
+using pfaedle::router::DistDiffTransWeight;
+using pfaedle::router::ExpoTransWeight;
+using pfaedle::router::LineSimilarity;
+using pfaedle::router::NormDistrTransWeight;
+using util::geo::haversine;
+
+// _____________________________________________________________________________
+ExpoTransWeight::DistHeur::DistHeur(double maxV, const RoutingOpts& rOpts,
+                                    const std::set<trgraph::Edge*>& tos)
+    : _rOpts(rOpts), _maxV(maxV), _maxCentD(0), _lastE(0) {
+  size_t c = 0;
+  double x = 0, y = 0;
+
+  for (const auto to : tos) {
+    x += to->getFrom()->pl().getGeom()->getX();
+    y += to->getFrom()->pl().getGeom()->getY();
+    c++;
+  }
+
+  x /= c;
+  y /= c;
+
+  _center = POINT{x, y};
+
+  for (const auto to : tos) {
+    const double cur = haversine(*to->getFrom()->pl().getGeom(), _center);
+    if (cur > _maxCentD) _maxCentD = cur;
+  }
+
+  _maxCentD /= _maxV;
+}
+
+// _____________________________________________________________________________
+uint32_t ExpoTransWeight::DistHeur::operator()(
+    const trgraph::Edge* a, const std::set<trgraph::Edge*>& b) const {
+  UNUSED(b);
+
+  // avoid repeated calculation for the same edge over and over again
+  if (a == _lastE) return _lastC;
+
+  _lastE = a;
+
+  const double d = haversine(*a->getFrom()->pl().getGeom(), _center);
+  const double heur = fmax(0, (d / _maxV - _maxCentD) * 10);
+
+  // avoid overflow
+  if (heur > std::numeric_limits<uint32_t>::max()) {
+    _lastC = std::numeric_limits<uint32_t>::max();
+    ;
+    return _lastC;
+  }
+
+  _lastC = heur;
+  return heur;
+}
+
+// _____________________________________________________________________________
+uint32_t ExpoTransWeight::CostFunc::operator()(const trgraph::Edge* from,
+                                               const trgraph::Node* n,
+                                               const trgraph::Edge* to) const {
+  if (!from) return 0;
+
+  uint32_t c = from->pl().getCost();
+
+  if (c == std::numeric_limits<uint32_t>::max()) return c;
+
+  if (from == _lastFrom) {
+    // the transit line simi calculation is independent of the "to" edge, so if
+    // the last "from" edge was the same, skip it!
+    c = _lastC;
+  } else if (!_noLineSimiPen) {
+    const auto& simi = transitLineSimi(from);
+
+    if (!simi.nameSimilar) {
+      if (_rOpts.lineUnmatchedPunishFact < 1) {
+        c = std::ceil(static_cast<double>(c) * _rOpts.lineUnmatchedPunishFact);
+      } else if (_rOpts.lineUnmatchedPunishFact > 1) {
+        double a =
+            std::round(static_cast<double>(c) * _rOpts.lineUnmatchedPunishFact);
+        if (a > std::numeric_limits<uint32_t>::max())
+          return std::numeric_limits<uint32_t>::max();
+        c = a;
+      }
+    }
+
+    if (!simi.fromSimilar) {
+      if (_rOpts.lineNameFromUnmatchedPunishFact < 1) {
+        c = std::ceil(static_cast<double>(c) *
+                      _rOpts.lineNameFromUnmatchedPunishFact);
+      } else if (_rOpts.lineNameFromUnmatchedPunishFact > 1) {
+        double a = std::round(static_cast<double>(c) *
+                              _rOpts.lineNameFromUnmatchedPunishFact);
+        if (a > std::numeric_limits<uint32_t>::max())
+          return std::numeric_limits<uint32_t>::max();
+        c = a;
+      }
+    }
+
+    if (!simi.toSimilar) {
+      if (_rOpts.lineNameToUnmatchedPunishFact < 1) {
+        c = std::ceil(static_cast<double>(c) *
+                      _rOpts.lineNameToUnmatchedPunishFact);
+      } else if (_rOpts.lineNameToUnmatchedPunishFact > 1) {
+        double a = std::round(static_cast<double>(c) *
+                              _rOpts.lineNameToUnmatchedPunishFact);
+        if (a > std::numeric_limits<uint32_t>::max())
+          return std::numeric_limits<uint32_t>::max();
+        c = a;
+      }
+    }
+
+    _lastC = c;
+    _lastFrom = from;
+  }
+
+  uint32_t overflowCheck = c;
+
+  if (n && !n->pl().isTurnCycle()) {
+    if (_rOpts.fullTurnPunishFac != 0 && from->getFrom() == to->getTo() &&
+        from->getTo() == to->getFrom()) {
+      // trivial full turn
+      c += _rOpts.fullTurnPunishFac;
+
+      if (c <= overflowCheck) return std::numeric_limits<uint32_t>::max();
+      overflowCheck = c;
+    } else if (_rOpts.fullTurnPunishFac != 0 && n->getDeg() > 2) {
+      // otherwise, only intersection angles will be punished
+
+      double ang = util::geo::innerProd(
+          *n->pl().getGeom(), from->pl().backHop(), to->pl().frontHop());
+
+      if (ang < _rOpts.fullTurnAngle) {
+        c += _rOpts.fullTurnPunishFac;
+        if (c <= overflowCheck) return std::numeric_limits<uint32_t>::max();
+        overflowCheck = c;
+      }
+    }
+
+    // turn restriction cost
+    if (_rOpts.turnRestrCost > 0 && from->pl().isRestricted() &&
+        !_res.may(from, to, n)) {
+      c += _rOpts.turnRestrCost;
+      if (c <= overflowCheck) return std::numeric_limits<uint32_t>::max();
+    }
+  }
+
+  return c;
+}
+
+// _____________________________________________________________________________
+LineSimilarity ExpoTransWeight::CostFunc::transitLineSimi(
+    const trgraph::Edge* e) const {
+  if (_rAttrs.shortName.empty() && _rAttrs.lineFrom.empty() &&
+      _rAttrs.lineTo.empty())
+    return {true, true, true};
+
+  LineSimilarity best = {false, false, false};
+  for (const auto* l : e->pl().getLines()) {
+    auto simi = _rAttrs.simi(l);
+    if (simi.nameSimilar && simi.toSimilar && simi.fromSimilar) return simi;
+    if (best < simi) best = simi;
+  }
+
+  return best;
+}
+
+// _____________________________________________________________________________
+double ExpoTransWeight::weight(uint32_t c, double d, double t0, double d0,
+                               const RoutingOpts& rOpts) {
+  UNUSED(t0);
+  UNUSED(d);
+  UNUSED(d0);
+  return rOpts.transitionPen * static_cast<double>(c) / 10.0;
+}
+
+// _____________________________________________________________________________
+uint32_t ExpoTransWeight::invWeight(double c, const RoutingOpts& rOpts) {
+  return std::round((c / rOpts.transitionPen) * 10);
+}
+
+// _____________________________________________________________________________
+uint32_t ExpoTransWeight::maxCost(double tTime, const RoutingOpts& rOpts) {
+  // abort after 3 times the scheduled time, but assume a min time of
+  // 1 minute!
+  return std::ceil(fmax(tTime, 60) * 3 * rOpts.lineUnmatchedPunishFact *
+                   rOpts.lineNameToUnmatchedPunishFact *
+                   rOpts.lineNameFromUnmatchedPunishFact * 10);
+}
+
+// _____________________________________________________________________________
+
+// _____________________________________________________________________________
+double NormDistrTransWeight::weight(uint32_t cs, double d, double t0, double d0,
+                                    const RoutingOpts& rOpts) {
+  UNUSED(d);
+  UNUSED(d0);
+  UNUSED(rOpts);
+
+  double t = static_cast<double>(cs) / 10.0;
+
+  // standard deviation of normal distribution
+  double standarddev = 1;
+
+  // no backwards time travel!
+  if (t0 < 0) return std::numeric_limits<double>::infinity();
+
+  // always assume it takes at least 10 seconds to travel
+  t0 = fmax(10, t0);
+
+  double cNorm = (t / t0 - 1) / standarddev;
+  double normWeight = cNorm * cNorm;
+
+  double expWeight = ExpoTransWeight::weight(cs, d, t0, d0, rOpts);
+
+  return normWeight + expWeight;
+}
+
+// _____________________________________________________________________________
+uint32_t NormDistrTransWeight::invWeight(double c, const RoutingOpts& rOpts) {
+  UNUSED(rOpts);
+  UNUSED(c);
+
+  throw(std::runtime_error("Cannot apply inv weight to DistDiffTransWeight"));
+}
+
+// _____________________________________________________________________________
+
+// _____________________________________________________________________________
+double DistDiffTransWeight::weight(uint32_t c, double d, double t0, double d0,
+                                   const RoutingOpts& rOpts) {
+  UNUSED(t0);
+  UNUSED(c);
+  // double mean = 250;  // expectation value of 250 meters for buses
+  // double lambda = 1.0 / mean;
+
+  double w = fabs(d - d0);
+
+  return rOpts.transitionPen * w;
+}
+
+// _____________________________________________________________________________
+uint32_t DistDiffTransWeight::invWeight(double c, const RoutingOpts& rOpts) {
+  UNUSED(rOpts);
+  UNUSED(c);
+
+  throw(std::runtime_error("Cannot apply inv weight to DistDiffTransWeight"));
+}
+
+// _____________________________________________________________________________
+uint32_t DistDiffTransWeight::maxCost(double tTime, const RoutingOpts& rOpts) {
+  UNUSED(tTime);
+  UNUSED(rOpts);
+  return std::numeric_limits<uint32_t>::max();
+}
diff --git a/src/pfaedle/router/Weights.h b/src/pfaedle/router/Weights.h
new file mode 100644
index 0000000..646f93b
--- /dev/null
+++ b/src/pfaedle/router/Weights.h
@@ -0,0 +1,161 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef PFAEDLE_ROUTER_WEIGHTS_H_
+#define PFAEDLE_ROUTER_WEIGHTS_H_
+
+#include <set>
+#include "pfaedle/osm/Restrictor.h"
+#include "pfaedle/router/Misc.h"
+#include "pfaedle/router/RoutingAttrs.h"
+#include "pfaedle/trgraph/Graph.h"
+#include "util/graph/EDijkstra.h"
+
+namespace pfaedle {
+namespace router {
+
+typedef util::graph::EDijkstra::CostFunc<trgraph::NodePL, trgraph::EdgePL,
+                                         uint32_t>
+    RCostFunc;
+typedef util::graph::EDijkstra::HeurFunc<trgraph::NodePL, trgraph::EdgePL,
+                                         uint32_t>
+    RHeurFunc;
+
+class ExpoTransWeight {
+ public:
+  struct CostFunc : public RCostFunc {
+    CostFunc(const RoutingAttrs& rAttrs, const RoutingOpts& rOpts,
+             const osm::Restrictor& res, uint32_t max)
+        : _rAttrs(rAttrs),
+          _rOpts(rOpts),
+          _res(res),
+          _inf(max),
+          _noLineSimiPen(false),
+          _lastFrom(0) {
+      if (_rAttrs.lineFrom.empty() && _rAttrs.lineTo.empty() &&
+          _rAttrs.shortName.empty()) {
+        _noLineSimiPen = true;
+      }
+      if (_rOpts.lineUnmatchedPunishFact == 1) {
+        _noLineSimiPen = true;
+      }
+    }
+
+    const RoutingAttrs& _rAttrs;
+    const RoutingOpts& _rOpts;
+    const osm::Restrictor& _res;
+    uint32_t _inf;
+    bool _noLineSimiPen;
+    mutable const trgraph::Edge* _lastFrom;
+    mutable uint32_t _lastC;
+
+    uint32_t operator()(const trgraph::Edge* from, const trgraph::Node* n,
+                        const trgraph::Edge* to) const;
+    uint32_t inf() const { return _inf; }
+
+    LineSimilarity transitLineSimi(const trgraph::Edge* e) const;
+  };
+
+  struct DistHeur : RHeurFunc {
+    DistHeur(double maxV, const RoutingOpts& rOpts,
+             const std::set<trgraph::Edge*>& tos);
+
+    const RoutingOpts& _rOpts;
+    double _maxV;
+    POINT _center;
+    double _maxCentD;
+    uint32_t operator()(const trgraph::Edge* a,
+                        const std::set<trgraph::Edge*>& b) const;
+    mutable const trgraph::Edge* _lastE;
+    mutable uint32_t _lastC;
+  };
+
+  static uint32_t maxCost(double tTime, const RoutingOpts& rOpts);
+  static double weight(uint32_t c, double d, double t0, double d0,
+                       const RoutingOpts& rOpts);
+  static uint32_t invWeight(double cost, const RoutingOpts& rOpts);
+  static const bool ALLOWS_FAST_ROUTE = true;
+  static const bool NEED_DIST = false;
+};
+
+class ExpoTransWeightNoHeur : public ExpoTransWeight {
+ public:
+  struct DistHeur : RHeurFunc {
+    DistHeur(double maxV, const RoutingOpts& rOpts,
+             const std::set<trgraph::Edge*>& tos) {
+      UNUSED(maxV);
+      UNUSED(rOpts);
+      UNUSED(tos);
+    }
+
+    uint32_t operator()(const trgraph::Edge* a,
+                        const std::set<trgraph::Edge*>& b) const {
+      UNUSED(a);
+      UNUSED(b);
+      return 0;
+    }
+  };
+};
+
+class NormDistrTransWeight : public ExpoTransWeight {
+ public:
+  static double weight(uint32_t c, double d, double t0, double d0,
+                       const RoutingOpts& rOpts);
+  static uint32_t invWeight(double cost, const RoutingOpts& rOpts);
+  static const bool ALLOWS_FAST_ROUTE = false;
+  static const bool NEED_DIST = false;
+};
+
+class NormDistrTransWeightNoHeur : public NormDistrTransWeight {
+ public:
+  struct DistHeur : RHeurFunc {
+    DistHeur(double maxV, const RoutingOpts& rOpts,
+             const std::set<trgraph::Edge*>& tos) {
+      UNUSED(maxV);
+      UNUSED(rOpts);
+      UNUSED(tos);
+    }
+
+    uint32_t operator()(const trgraph::Edge* a,
+                        const std::set<trgraph::Edge*>& b) const {
+      UNUSED(a);
+      UNUSED(b);
+      return 0;
+    }
+  };
+};
+
+class DistDiffTransWeight : public ExpoTransWeight {
+ public:
+  static uint32_t maxCost(double tTime, const RoutingOpts& rOpts);
+  static double weight(uint32_t c, double d, double t0, double d0,
+                       const RoutingOpts& rOpts);
+  static uint32_t invWeight(double cost, const RoutingOpts& rOpts);
+  static const bool ALLOWS_FAST_ROUTE = false;
+  static const bool NEED_DIST = true;
+};
+
+class DistDiffTransWeightNoHeur : public DistDiffTransWeight {
+ public:
+  struct DistHeur : RHeurFunc {
+    DistHeur(double maxV, const RoutingOpts& rOpts,
+             const std::set<trgraph::Edge*>& tos) {
+      UNUSED(maxV);
+      UNUSED(rOpts);
+      UNUSED(tos);
+    }
+
+    uint32_t operator()(const trgraph::Edge* a,
+                        const std::set<trgraph::Edge*>& b) const {
+      UNUSED(a);
+      UNUSED(b);
+      return 0;
+    }
+  };
+};
+
+}  // namespace router
+}  // namespace pfaedle
+
+#endif  // PFAEDLE_ROUTER_WEIGHTS_H_
diff --git a/src/pfaedle/statsimi-classifier/StatsimiClassifier.cpp b/src/pfaedle/statsimi-classifier/StatsimiClassifier.cpp
new file mode 100644
index 0000000..f354311
--- /dev/null
+++ b/src/pfaedle/statsimi-classifier/StatsimiClassifier.cpp
@@ -0,0 +1,30 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <codecvt>
+#include <exception>
+#include <locale>
+#include "pfaedle/Def.h"
+#include "pfaedle/statsimi-classifier/StatsimiClassifier.h"
+#include "util/geo/Geo.h"
+
+using pfaedle::statsimiclassifier::JaccardClassifier;
+
+// _____________________________________________________________________________
+bool JaccardClassifier::similar(const std::string& nameA, const POINT& posA,
+                                const std::string& nameB,
+                                const POINT& posB) const {
+  UNUSED(posA);
+  UNUSED(posB);
+  return similar(nameA, nameB);
+}
+
+// _____________________________________________________________________________
+bool JaccardClassifier::similar(const std::string& nameA,
+                                const std::string& nameB) const {
+  // hard similarity
+  if (nameA == nameB) return true;
+
+  return util::jaccardSimi(nameA, nameB) > 0.45;  // 0.45 from paper
+}
diff --git a/src/pfaedle/statsimi-classifier/StatsimiClassifier.h b/src/pfaedle/statsimi-classifier/StatsimiClassifier.h
new file mode 100644
index 0000000..dac508b
--- /dev/null
+++ b/src/pfaedle/statsimi-classifier/StatsimiClassifier.h
@@ -0,0 +1,35 @@
+// Copyright 2020, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef PFAEDLE_STATSIMI_CLASSIFIER_STATSIMICLASSIFIER_H_
+#define PFAEDLE_STATSIMI_CLASSIFIER_STATSIMICLASSIFIER_H_
+
+#include <string>
+#include "pfaedle/Def.h"
+#include "util/geo/Geo.h"
+
+namespace pfaedle {
+namespace statsimiclassifier {
+
+class StatsimiClassifier {
+ public:
+  virtual bool similar(const std::string& nameA, const POINT& posA,
+                       const std::string& nameB, const POINT& posB) const = 0;
+
+  virtual bool similar(const std::string& nameA,
+                       const std::string& nameB) const = 0;
+};
+
+class JaccardClassifier : public StatsimiClassifier {
+ public:
+  virtual bool similar(const std::string& nameA, const POINT& posA,
+                       const std::string& nameB, const POINT& posB) const;
+  virtual bool similar(const std::string& nameA,
+                       const std::string& nameB) const;
+};
+
+}  // namespace statsimiclassifier
+}  // namespace pfaedle
+
+#endif  // PFAEDLE_STATSIMI_CLASSIFIER_STATSIMICLASSIFIER_H_
diff --git a/src/pfaedle/tests/CMakeLists.txt b/src/pfaedle/tests/CMakeLists.txt
new file mode 100644
index 0000000..deb3632
--- /dev/null
+++ b/src/pfaedle/tests/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_executable(pfaedleTest TestMain.cpp)
+target_link_libraries(pfaedleTest pfaedle_dep util)
diff --git a/src/pfaedle/tests/TestMain.cpp b/src/pfaedle/tests/TestMain.cpp
new file mode 100644
index 0000000..4187a9b
--- /dev/null
+++ b/src/pfaedle/tests/TestMain.cpp
@@ -0,0 +1,329 @@
+// Copyright 2020
+// Author: Patrick Brosi
+
+#include "pfaedle/osm/Restrictor.h"
+
+#define private public
+#include "pfaedle/router/Router.h"
+#undef private
+#define private private
+
+using pfaedle::osm::Restrictor;
+using pfaedle::router::CostMatrix;
+using pfaedle::router::EdgeCandGroup;
+using pfaedle::router::ExpoTransWeight;
+using pfaedle::router::LayerCostsDAG;
+using pfaedle::router::RouterImpl;
+using pfaedle::router::RoutingAttrs;
+using pfaedle::router::RoutingOpts;
+using util::approx;
+
+// _____________________________________________________________________________
+uint32_t cmGet(const CostMatrix& m, size_t i, size_t j) {
+  for (const auto& e : m) {
+    if (e.first.first == i && e.first.second == j) return e.second;
+  }
+
+  return -1;
+}
+
+// _____________________________________________________________________________
+int main(int argc, char** argv) {
+  UNUSED(argc);
+  UNUSED(argv);
+  RouterImpl<ExpoTransWeight> router;
+
+  RoutingAttrs rAttrs;
+  RoutingOpts rOpts;
+  Restrictor restr;
+  LayerCostsDAG initCosts;
+
+  // to make sure we always underestimate the cost in the heuristic for testing
+  pfaedle::trgraph::NodePL::comps.emplace_back(
+      pfaedle::trgraph::Component{9999999});
+
+  // build transit graph
+  pfaedle::trgraph::Graph g;
+  auto a = g.addNd(POINT{0, 0});
+  auto b = g.addNd(POINT{0, 10});
+  auto c = g.addNd(POINT{10, 0});
+  auto d = g.addNd(POINT{20, 0});
+
+  a->pl().setComp(1);
+  b->pl().setComp(1);
+  c->pl().setComp(1);
+  d->pl().setComp(1);
+
+  auto eA = g.addEdg(a, c);
+  auto eB = g.addEdg(b, c);
+  auto eC = g.addEdg(c, d);
+
+  eA->pl().setCost(10);
+  eB->pl().setCost(6);
+  eC->pl().setCost(100);
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hops(froms, tos, &costM, &dists, rAttrs, rOpts, restr, &c, maxTime);
+
+    TEST(cmGet(costM, 0, 0), ==, approx(10));
+    TEST(cmGet(costM, 1, 0), ==, approx(6));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0.5, {}, 0, {}});
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hops(froms, tos, &costM, &dists, rAttrs, rOpts, restr, &c, maxTime);
+
+    TEST(cmGet(costM, 0, 0), ==, approx(50 + 10));
+    TEST(cmGet(costM, 1, 0), ==, approx(50 + 6));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eB, 0, 2.0 / 3.0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hops(froms, tos, &costM, &dists, rAttrs, rOpts, restr, &c, maxTime);
+
+    TEST(cmGet(costM, 0, 0), ==, approx(5));
+    TEST(cmGet(costM, 1, 0), ==, approx(2));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eB, 0, 2.0 / 3.0, {}, 0, {}});
+    tos.push_back({eC, 0, 0.9, {}, 0, {}});
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hops(froms, tos, &costM, &dists, rAttrs, rOpts, restr, &c, maxTime);
+
+    TEST(cmGet(costM, 0, 0), ==, approx(90 + 5));
+    TEST(cmGet(costM, 1, 0), ==, approx(90 + 2));
+  }
+
+  // with hopsfast
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    LayerCostsDAG initCost{0, 0};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    TEST(cmGet(costM, 0, 0), >=, maxTime);
+    TEST(cmGet(costM, 1, 0), ==, approx(6));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0.5, {}, 0, {}});
+
+    LayerCostsDAG initCost{0, 0};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    TEST(cmGet(costM, 0, 0), >=, maxTime);
+    TEST(cmGet(costM, 1, 0), ==, approx(50 + 6));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eB, 0, 2.0 / 3.0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    LayerCostsDAG initCost{0, 0};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    TEST(cmGet(costM, 0, 0), >=, maxTime);
+    TEST(cmGet(costM, 1, 0), ==, approx(2));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eB, 0, 2.0 / 3.0, {}, 0, {}});
+    tos.push_back({eC, 0, 0.9, {}, 0, {}});
+
+    LayerCostsDAG initCost{0, 0};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    TEST(cmGet(costM, 0, 0), >=, maxTime);
+    TEST(cmGet(costM, 1, 0), ==, approx(90 + 2));
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    LayerCostsDAG initCost{0, 0};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    TEST(cmGet(costM, 0, 0), ==, approx(5));
+    TEST(cmGet(costM, 1, 0), >=, maxTime);
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    LayerCostsDAG initCost{9999, 0};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    TEST(cmGet(costM, 0, 0), ==, approx(5));
+    TEST(cmGet(costM, 1, 0), >=, maxTime);
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 0, {}, 0, {}});
+
+    LayerCostsDAG initCost{6, 0, 20};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    // we also get this, because the edge is the same!
+    TEST(cmGet(costM, 0, 0), ==, approx(5));
+    TEST(cmGet(costM, 1, 0), ==, approx(10));
+    TEST(cmGet(costM, 2, 0), >=, maxTime);
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+    tos.push_back({eC, 0, 1, {}, 0, {}});
+
+    LayerCostsDAG initCost{6, 0, 20};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    // we also get this, because the edge is the same!
+    TEST(cmGet(costM, 0, 0), ==, approx(5 + 100));
+    TEST(cmGet(costM, 1, 0), ==, approx(10 + 100));
+    TEST(cmGet(costM, 2, 0), >=, maxTime);
+  }
+
+  {
+    EdgeCandGroup froms, tos;
+    CostMatrix costM, dists;
+    froms.push_back({eA, 0, 0.5, {}, 0, {}});
+    froms.push_back({eA, 0, 0, {}, 0, {}});
+    froms.push_back({eB, 0, 0, {}, 0, {}});
+
+    tos.push_back({eC, 0, 1, {}, 0, {}});
+    tos.push_back({eC, 0, 0.5, {}, 0, {}});
+
+    LayerCostsDAG initCost{6, 0, 20};
+
+    double maxTime = 9999;
+
+    pfaedle::router::HopCache c;
+
+    router.hopsFast(froms, tos, initCost, &costM, rAttrs, rOpts, restr, &c,
+                    maxTime);
+
+    // we also get this, because the edge is the same!
+    TEST(cmGet(costM, 0, 0), ==, approx(5 + 100));
+    TEST(cmGet(costM, 1, 0), ==, approx(10 + 100));
+    TEST(cmGet(costM, 0, 1), ==, approx(5 + 50));
+    TEST(cmGet(costM, 1, 1), ==, approx(10 + 50));
+    TEST(cmGet(costM, 2, 0), >=, maxTime);
+    TEST(cmGet(costM, 2, 1), >=, maxTime);
+  }
+
+  exit(0);
+}
diff --git a/src/pfaedle/trgraph/EdgePL.cpp b/src/pfaedle/trgraph/EdgePL.cpp
index cd6c241..7c5b613 100644
--- a/src/pfaedle/trgraph/EdgePL.cpp
+++ b/src/pfaedle/trgraph/EdgePL.cpp
@@ -11,15 +11,12 @@
 using pfaedle::trgraph::EdgePL;
 using pfaedle::trgraph::TransitEdgeLine;
 
-
 std::map<LINE*, size_t> EdgePL::_flines;
 std::map<const TransitEdgeLine*, size_t> EdgePL::_tlines;
 
 // _____________________________________________________________________________
 EdgePL::EdgePL()
-    : _length(0), _oneWay(0), _hasRestr(false), _rev(false), _lvl(0) {
-  _l = new LINE();
-  _flines[_l] = 1;
+    : _oneWay(0), _hasRestr(false), _rev(false), _lvl(0), _cost(0), _l(0) {
 }
 
 // _____________________________________________________________________________
@@ -27,17 +24,20 @@ EdgePL::EdgePL(const EdgePL& pl) : EdgePL(pl, false) {}
 
 // _____________________________________________________________________________
 EdgePL::EdgePL(const EdgePL& pl, bool geoflat)
-    : _length(pl._length),
-      _oneWay(pl._oneWay),
+    : _oneWay(pl._oneWay),
       _hasRestr(pl._hasRestr),
       _rev(pl._rev),
-      _lvl(pl._lvl) {
-  if (geoflat) {
-    _l = pl._l;
-  } else {
-    _l = new LINE(*pl._l);
+      _lvl(pl._lvl),
+      _cost(pl._cost),
+      _l(0) {
+  if (pl._l) {
+    if (geoflat) {
+      _l = pl._l;
+    } else {
+      _l = new LINE(*pl._l);
+    }
+    _flines[_l]++;
   }
-  _flines[_l]++;
 
   for (auto l : pl._lines) addLine(l);
 }
@@ -75,16 +75,23 @@ EdgePL EdgePL::revCopy() const {
 }
 
 // _____________________________________________________________________________
-void EdgePL::setLength(double d) { _length = d; }
+double EdgePL::getLength() const {
+  double len = 0;
 
-// _____________________________________________________________________________
-double EdgePL::getLength() const { return _length; }
+  for (size_t i = 1; i < _l->size(); i++) {
+    len += haversine((*_l)[i-1], (*_l)[i]);
+  }
+
+  return len;
+}
 
 // _____________________________________________________________________________
 void EdgePL::addLine(const TransitEdgeLine* l) {
-  if (std::find(_lines.begin(), _lines.end(), l) == _lines.end()) {
+  auto lb = std::lower_bound(_lines.begin(), _lines.end(), l);
+  if (lb == _lines.end() || *lb != l) {
     _lines.reserve(_lines.size() + 1);
-    _lines.push_back(l);
+    lb = std::lower_bound(_lines.begin(), _lines.end(), l);
+    _lines.insert(lb, l);
     if (_tlines.count(l))
       _tlines[l]++;
     else
@@ -103,7 +110,13 @@ const std::vector<const TransitEdgeLine*>& EdgePL::getLines() const {
 }
 
 // _____________________________________________________________________________
-void EdgePL::addPoint(const POINT& p) { _l->push_back(p); }
+void EdgePL::addPoint(const POINT& p) {
+  if (!_l) {
+    _l = new LINE();
+    _flines[_l] = 1;
+  }
+  _l->push_back(p);
+}
 
 // _____________________________________________________________________________
 const LINE* EdgePL::getGeom() const { return _l; }
@@ -114,8 +127,9 @@ LINE* EdgePL::getGeom() { return _l; }
 // _____________________________________________________________________________
 util::json::Dict EdgePL::getAttrs() const {
   util::json::Dict obj;
-  obj["m_length"] = std::to_string(_length);
+  obj["m_length"] = std::to_string(getLength());
   obj["oneway"] = std::to_string(static_cast<int>(_oneWay));
+  obj["cost"] = std::to_string(static_cast<double>(_cost) / 10.0);
   obj["level"] = std::to_string(_lvl);
   obj["restriction"] = isRestricted() ? "yes" : "no";
 
@@ -152,10 +166,10 @@ void EdgePL::setOneWay(uint8_t dir) { _oneWay = dir; }
 void EdgePL::setOneWay() { _oneWay = 1; }
 
 // _____________________________________________________________________________
-void EdgePL::setLvl(uint8_t lvl) { _lvl = lvl; }
+uint32_t EdgePL::getCost() const { return _cost; }
 
 // _____________________________________________________________________________
-uint8_t EdgePL::lvl() const { return _lvl; }
+void EdgePL::setCost(uint32_t c) { _cost = c; }
 
 // _____________________________________________________________________________
 void EdgePL::setRev() { _rev = true; }
diff --git a/src/pfaedle/trgraph/EdgePL.h b/src/pfaedle/trgraph/EdgePL.h
index 368ac2f..3c71fea 100644
--- a/src/pfaedle/trgraph/EdgePL.h
+++ b/src/pfaedle/trgraph/EdgePL.h
@@ -16,8 +16,6 @@
 
 using util::geograph::GeoEdgePL;
 
-
-
 namespace pfaedle {
 namespace trgraph {
 
@@ -28,14 +26,17 @@ struct TransitEdgeLine {
   std::string fromStr;
   std::string toStr;
   std::string shortName;
+  uint32_t color;
 };
 
 inline bool operator==(const TransitEdgeLine& a, const TransitEdgeLine& b) {
+  // ignoring color here!
   return a.fromStr == b.fromStr && a.toStr == b.toStr &&
          a.shortName == b.shortName;
 }
 
 inline bool operator<(const TransitEdgeLine& a, const TransitEdgeLine& b) {
+  // ignoring color here!
   return a.fromStr < b.fromStr ||
          (a.fromStr == b.fromStr && a.toStr < b.toStr) ||
          (a.fromStr == b.fromStr && a.toStr == b.toStr &&
@@ -65,14 +66,20 @@ class EdgePL {
   // Return the length in meters stored for this edge payload
   double getLength() const;
 
-  // Set the length in meters for this edge payload
-  void setLength(double d);
-
   // Set this edge as a one way node, either in the default direction of
   // the edge (no arg), or the direction specified in dir
   void setOneWay();
   void setOneWay(uint8_t dir);
 
+  void setLvl(uint8_t lvl) { assert(lvl < 9); _lvl = lvl; }
+  uint8_t lvl() const { return _lvl; }
+
+  // Return the cost for this edge payload
+  uint32_t getCost() const;
+
+  // Set the cost for this edge payload
+  void setCost(uint32_t d);
+
   // Mark this payload' edge as having some restrictions
   void setRestricted();
 
@@ -85,12 +92,6 @@ class EdgePL {
   // True if this edge is restricted
   bool isRestricted() const;
 
-  // Set the level of this edge.
-  void setLvl(uint8_t lvl);
-
-  // Return the level of this edge.
-  uint8_t lvl() const;
-
   // Return the one-way code stored for this edge.
   uint8_t oneWay() const;
 
@@ -115,11 +116,11 @@ class EdgePL {
   EdgePL revCopy() const;
 
  private:
-  float _length;
   uint8_t _oneWay : 2;
   bool _hasRestr : 1;
   bool _rev : 1;
-  uint8_t _lvl : 3;
+  uint8_t _lvl: 4;
+  uint32_t _cost;  // costs in 1/10th seconds
 
   LINE* _l;
 
diff --git a/src/pfaedle/trgraph/Graph.h b/src/pfaedle/trgraph/Graph.h
index 7e3baba..7f7d50a 100644
--- a/src/pfaedle/trgraph/Graph.h
+++ b/src/pfaedle/trgraph/Graph.h
@@ -24,8 +24,8 @@ namespace trgraph {
 typedef util::graph::Edge<NodePL, EdgePL> Edge;
 typedef util::graph::Node<NodePL, EdgePL> Node;
 typedef util::graph::DirGraph<NodePL, EdgePL> Graph;
-typedef Grid<Node*, Point, PFAEDLE_PRECISION> NodeGrid;
-typedef Grid<Edge*, Line, PFAEDLE_PRECISION> EdgeGrid;
+typedef Grid<Node*, Point, PFDL_PREC> NodeGrid;
+typedef Grid<Edge*, Line, PFDL_PREC> EdgeGrid;
 
 }  // namespace trgraph
 }  // namespace pfaedle
diff --git a/src/pfaedle/trgraph/NodePL.cpp b/src/pfaedle/trgraph/NodePL.cpp
index a0aec0a..b4bba8b 100644
--- a/src/pfaedle/trgraph/NodePL.cpp
+++ b/src/pfaedle/trgraph/NodePL.cpp
@@ -3,22 +3,19 @@
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 #include <string>
+#include <vector>
+#include <limits>
 #include <unordered_map>
 #include "pfaedle/trgraph/NodePL.h"
-#include "pfaedle/trgraph/StatGroup.h"
 #include "pfaedle/trgraph/StatInfo.h"
 #include "util/String.h"
 
-using pfaedle::trgraph::StatInfo;
-using pfaedle::trgraph::NodePL;
 using pfaedle::trgraph::Component;
+using pfaedle::trgraph::NodePL;
+using pfaedle::trgraph::StatInfo;
 
-// we use the adress of this dummy station info as a special value
-// of this node, meaning "is a station block". Re-using the _si field here
-// saves some memory
-StatInfo NodePL::_blockerSI = StatInfo();
-
-std::unordered_map<const Component*, size_t> NodePL::_comps;
+std::vector<Component> NodePL::comps;
+std::vector<StatInfo> NodePL::_statInfos;
 
 // _____________________________________________________________________________
 NodePL::NodePL()
@@ -32,19 +29,6 @@ NodePL::NodePL()
 {
 }
 
-// _____________________________________________________________________________
-NodePL::NodePL(const NodePL& pl)
-    : _geom(pl._geom),
-      _si(0),
-      _component(pl._component)
-#ifdef PFAEDLE_DBG
-      ,
-      _vis(pl._vis)
-#endif
-{
-  if (pl._si) setSI(*(pl._si));
-}
-
 // _____________________________________________________________________________
 NodePL::NodePL(const POINT& geom)
     : _geom(geom),
@@ -70,18 +54,6 @@ NodePL::NodePL(const POINT& geom, const StatInfo& si)
   setSI(si);
 }
 
-// _____________________________________________________________________________
-NodePL::~NodePL() {
-  if (getSI()) delete _si;
-  if (_component) {
-    _comps[_component]--;
-    if (_comps[_component] == 0) {
-      delete _component;
-      _comps.erase(_comps.find(_component));
-    }
-  }
-}
-
 // _____________________________________________________________________________
 void NodePL::setVisited() const {
 #ifdef PFAEDLE_DBG
@@ -93,18 +65,14 @@ void NodePL::setVisited() const {
 void NodePL::setNoStat() { _si = 0; }
 
 // _____________________________________________________________________________
-const Component* NodePL::getComp() const { return _component; }
+const Component& NodePL::getComp() const { return comps[_component - 1]; }
 
 // _____________________________________________________________________________
-void NodePL::setComp(const Component* c) {
-  if (_component == c) return;
-  _component = c;
+uint32_t NodePL::getCompId() const { return _component; }
 
-  // NOT thread safe!
-  if (!_comps.count(c))
-    _comps[c] = 1;
-  else
-    _comps[c]++;
+// _____________________________________________________________________________
+void NodePL::setComp(uint32_t id) {
+  _component = id;
 }
 
 // _____________________________________________________________________________
@@ -116,54 +84,59 @@ void NodePL::setGeom(const POINT& geom) { _geom = geom; }
 // _____________________________________________________________________________
 util::json::Dict NodePL::getAttrs() const {
   util::json::Dict obj;
-  obj["component"] = std::to_string(reinterpret_cast<size_t>(_component));
+  obj["component"] = std::to_string(_component);
 #ifdef PFAEDLE_DBG
   obj["dijkstra_vis"] = _vis ? "yes" : "no";
 #endif
   if (getSI()) {
     obj["station_info_ptr"] = util::toString(_si);
-    obj["station_name"] = _si->getName();
-    obj["station_alt_names"] = util::implode(_si->getAltNames(), ",");
-    obj["from_osm"] = _si->isFromOsm() ? "yes" : "no";
-    obj["station_platform"] = _si->getTrack();
-    obj["station_group"] =
-        std::to_string(reinterpret_cast<size_t>(_si->getGroup()));
+    obj["station_name"] = getSI()->getName();
+    obj["station_alt_names"] =
+        util::implode(getSI()->getAltNames(), ",");
+    obj["station_platform"] = getSI()->getTrack();
 
 #ifdef PFAEDLE_STATION_IDS
     // only print this in debug mode
-    obj["station_id"] = _si->getId();
+    obj["station_id"] = getSI()->getId();
 #endif
-
-
-    std::stringstream gtfsIds;
-    if (_si->getGroup()) {
-      for (auto* s : _si->getGroup()->getStops()) {
-        gtfsIds << s->getId() << " (" << s->getName() << "),";
-      }
-    }
-
-    obj["station_group_stops"] = gtfsIds.str();
   }
   return obj;
 }
 
 // _____________________________________________________________________________
-void NodePL::setSI(const StatInfo& si) { _si = new StatInfo(si); }
+void NodePL::setSI(const StatInfo& si) {
+  _statInfos.emplace_back(si);
+  _si = _statInfos.size();
+}
 
 // _____________________________________________________________________________
 const StatInfo* NodePL::getSI() const {
   if (isBlocker()) return 0;
-  return _si;
+  if (isTurnCycle()) return 0;
+  if (_si == 0) return 0;
+  return &_statInfos[_si - 1];
 }
 
 // _____________________________________________________________________________
 StatInfo* NodePL::getSI() {
   if (isBlocker()) return 0;
-  return _si;
+  if (isTurnCycle()) return 0;
+  if (_si == 0) return 0;
+  return &_statInfos[_si - 1];
 }
 
 // _____________________________________________________________________________
-void NodePL::setBlocker() { _si = &_blockerSI; }
+void NodePL::setTurnCycle() { _si = std::numeric_limits<uint32_t>::max() - 1; }
 
 // _____________________________________________________________________________
-bool NodePL::isBlocker() const { return _si == &_blockerSI; }
+bool NodePL::isTurnCycle() const {
+  return _si == (std::numeric_limits<uint32_t>::max() - 1);
+}
+
+// _____________________________________________________________________________
+void NodePL::setBlocker() { _si = std::numeric_limits<uint32_t>::max(); }
+
+// _____________________________________________________________________________
+bool NodePL::isBlocker() const {
+  return _si == std::numeric_limits<uint32_t>::max();
+}
diff --git a/src/pfaedle/trgraph/NodePL.h b/src/pfaedle/trgraph/NodePL.h
index 7c1cdb0..8d4efa9 100644
--- a/src/pfaedle/trgraph/NodePL.h
+++ b/src/pfaedle/trgraph/NodePL.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 #include <unordered_map>
+#include <vector>
 #include "ad/cppgtfs/gtfs/Feed.h"
 #include "pfaedle/Def.h"
 #include "pfaedle/trgraph/StatInfo.h"
@@ -20,7 +21,7 @@ namespace pfaedle {
 namespace trgraph {
 
 struct Component {
-  uint8_t minEdgeLvl : 3;
+  float maxSpeed;
 };
 
 /*
@@ -29,10 +30,8 @@ struct Component {
 class NodePL {
  public:
   NodePL();
-  NodePL(const NodePL& pl);   // NOLINT
   NodePL(const POINT& geom);  // NOLINT
   NodePL(const POINT& geom, const StatInfo& si);
-  ~NodePL();
 
   // Return the geometry of this node.
   const POINT* getGeom() const;
@@ -52,10 +51,13 @@ class NodePL {
   void setNoStat();
 
   // Get the component of this node
-  const Component* getComp() const;
+  const Component& getComp() const;
+
+  // Get the component of this node
+  uint32_t getCompId() const;
 
   // Set the component of this node
-  void setComp(const Component* c);
+  void setComp(uint32_t c);
 
   // Make this node a blocker
   void setBlocker();
@@ -63,21 +65,27 @@ class NodePL {
   // Check if this node is a blocker
   bool isBlocker() const;
 
+  // Make this node a turning cycle
+  void setTurnCycle();
+
+  // Check if this node is a blocker
+  bool isTurnCycle() const;
+
   // Mark this node as visited (usefull for counting search space in Dijkstra)
   // (only works for DEBUG build type)
   void setVisited() const;
 
+  static std::vector<Component> comps;
+
  private:
   POINT _geom;
-  StatInfo* _si;
-  const Component* _component;
+  uint32_t _si;
+  uint32_t _component;
 
 #ifdef PFAEDLE_DBG
   mutable bool _vis;
 #endif
-
-  static StatInfo _blockerSI;
-  static std::unordered_map<const Component*, size_t> _comps;
+  static std::vector<StatInfo> _statInfos;
 };
 }  // namespace trgraph
 }  // namespace pfaedle
diff --git a/src/pfaedle/trgraph/Normalizer.cpp b/src/pfaedle/trgraph/Normalizer.cpp
index 5e254a0..5daaa80 100644
--- a/src/pfaedle/trgraph/Normalizer.cpp
+++ b/src/pfaedle/trgraph/Normalizer.cpp
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cassert>
 #include <iostream>
-#include <mutex>
 #include <regex>
 #include <sstream>
 #include <stdexcept>
@@ -37,17 +36,6 @@ Normalizer& Normalizer::operator=(Normalizer other) {
   return *this;
 }
 
-// _____________________________________________________________________________
-std::string Normalizer::operator()(std::string sn) const {
-  return normTS(sn);
-}
-
-// _____________________________________________________________________________
-std::string Normalizer::normTS(const std::string& sn) const {
-  std::lock_guard<std::mutex> lock(_mutex);
-  return norm(sn);
-}
-
 // _____________________________________________________________________________
 std::string Normalizer::norm(const std::string& sn) const {
   auto i = _cache.find(sn);
diff --git a/src/pfaedle/trgraph/Normalizer.h b/src/pfaedle/trgraph/Normalizer.h
index 6546963..ae02d5a 100644
--- a/src/pfaedle/trgraph/Normalizer.h
+++ b/src/pfaedle/trgraph/Normalizer.h
@@ -10,7 +10,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <mutex>
 
 namespace pfaedle {
 namespace trgraph {
@@ -37,19 +36,13 @@ class Normalizer {
 
   // Normalize sn, not thread safe
   std::string norm(const std::string& sn) const;
-  // Normalize sn, thread safe
-  std::string normTS(const std::string& sn) const;
 
-  // Normalize sn based on the rules of this normalizer, uses the thread safe
-  // version of norm() internally
-  std::string operator()(std::string sn) const;
   bool operator==(const Normalizer& b) const;
 
  private:
   ReplRulesComp _rules;
   ReplRules _rulesOrig;
   mutable std::unordered_map<std::string, std::string> _cache;
-  mutable std::mutex _mutex;
 
   void buildRules(const ReplRules& rules);
 };
diff --git a/src/pfaedle/trgraph/StatGroup.cpp b/src/pfaedle/trgraph/StatGroup.cpp
deleted file mode 100644
index 75b45d4..0000000
--- a/src/pfaedle/trgraph/StatGroup.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#include <set>
-#include "pfaedle/trgraph/StatGroup.h"
-#include "util/geo/Geo.h"
-
-using pfaedle::trgraph::StatGroup;
-using pfaedle::trgraph::Node;
-using pfaedle::router::NodeCandGroup;
-using ad::cppgtfs::gtfs::Stop;
-
-// _____________________________________________________________________________
-StatGroup::StatGroup() {}
-
-// _____________________________________________________________________________
-void StatGroup::addStop(const Stop* s) { _stops.insert(s); }
-
-// _____________________________________________________________________________
-void StatGroup::addNode(trgraph::Node* n) { _nodes.insert(n); }
-
-// _____________________________________________________________________________
-void StatGroup::merge(StatGroup* other) {
-  if (other == this) return;
-
-  std::set<Node*> nds = other->getNodes();
-  std::set<const Stop*> stops = other->getStops();
-
-  for (auto on : nds) {
-    on->pl().getSI()->setGroup(this);
-    addNode(on);
-  }
-
-  for (auto* os : stops) {
-    addStop(os);
-  }
-}
-
-// _____________________________________________________________________________
-const NodeCandGroup& StatGroup::getNodeCands(const Stop* s) const {
-  return _stopNodePens.at(s);
-}
-
-// _____________________________________________________________________________
-const std::set<Node*>& StatGroup::getNodes() const { return _nodes; }
-
-// _____________________________________________________________________________
-void StatGroup::remNode(trgraph::Node* n) {
-  auto it = _nodes.find(n);
-  if (it != _nodes.end()) _nodes.erase(it);
-}
-
-// _____________________________________________________________________________
-std::set<Node*>& StatGroup::getNodes() { return _nodes; }
-
-// _____________________________________________________________________________
-const std::set<const Stop*>& StatGroup::getStops() const { return _stops; }
-
-// _____________________________________________________________________________
-double StatGroup::getPen(const Stop* s, trgraph::Node* n,
-                         const trgraph::Normalizer& platformNorm,
-                         double trackPen, double distPenFac,
-                         double nonOsmPen) const {
-  POINT p =
-      util::geo::latLngToWebMerc<PFAEDLE_PRECISION>(s->getLat(), s->getLng());
-
-  double distPen = util::geo::webMercMeterDist(p, *n->pl().getGeom());
-  distPen *= distPenFac;
-
-  std::string platform = platformNorm.norm(s->getPlatformCode());
-
-  if (!platform.empty() && !n->pl().getSI()->getTrack().empty() &&
-      n->pl().getSI()->getTrack() == platform) {
-    trackPen = 0;
-  }
-
-  if (n->pl().getSI()->isFromOsm()) nonOsmPen = 0;
-
-  return distPen + trackPen + nonOsmPen;
-}
-
-// _____________________________________________________________________________
-void StatGroup::writePens(const trgraph::Normalizer& platformNorm,
-                          double trackPen, double distPenFac,
-                          double nonOsmPen) {
-  if (_stopNodePens.size()) return;  // already written
-  for (auto* s : _stops) {
-    for (auto* n : _nodes) {
-      _stopNodePens[s].push_back(router::NodeCand{
-          n, getPen(s, n, platformNorm, trackPen, distPenFac, nonOsmPen)});
-    }
-  }
-}
diff --git a/src/pfaedle/trgraph/StatGroup.h b/src/pfaedle/trgraph/StatGroup.h
deleted file mode 100644
index a3341af..0000000
--- a/src/pfaedle/trgraph/StatGroup.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2018, University of Freiburg,
-// Chair of Algorithms and Data Structures.
-// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
-
-#ifndef PFAEDLE_TRGRAPH_STATGROUP_H_
-#define PFAEDLE_TRGRAPH_STATGROUP_H_
-
-#include <string>
-#include <unordered_map>
-#include <set>
-#include "ad/cppgtfs/gtfs/Feed.h"
-#include "pfaedle/router/Router.h"
-#include "pfaedle/trgraph/Graph.h"
-#include "pfaedle/trgraph/Normalizer.h"
-
-namespace pfaedle {
-namespace trgraph {
-
-using ad::cppgtfs::gtfs::Stop;
-
-/*
- * A group of stations that belong together semantically (for example, multiple
- * stop points of a larger bus station)
- */
-class StatGroup {
- public:
-  StatGroup();
-  StatGroup(const StatGroup& a) = delete;
-
-  // Add a stop s to this station group
-  void addStop(const Stop* s);
-
-  // Add a node n to this station group
-  void addNode(trgraph::Node* n);
-
-  // Return all nodes contained in this group
-  const std::set<trgraph::Node*>& getNodes() const;
-  std::set<trgraph::Node*>& getNodes();
-
-  // Return all stops contained in this group
-  const std::set<const Stop*>& getStops() const;
-
-  // Remove a node from this group
-  void remNode(trgraph::Node* n);
-
-  // All nodes in other will be in this group, their SI's updated, and the
-  // "other" group deleted.
-  void merge(StatGroup* other);
-
-  // Return node candidates for stop s from this group
-  const router::NodeCandGroup& getNodeCands(const Stop* s) const;
-
-  // Write the penalties for all stops contained in this group so far.
-  void writePens(const trgraph::Normalizer& platformNorm, double trackPen,
-                 double distPenFac, double nonOsmPen);
-
- private:
-  std::set<trgraph::Node*> _nodes;
-  std::set<const Stop*> _stops;
-
-  // for each stop in this group, a penalty for each of the nodes here, based on
-  // its distance and optionally the track number
-  std::unordered_map<const Stop*, router::NodeCandGroup> _stopNodePens;
-
-  double getPen(const Stop* s, trgraph::Node* n,
-                const trgraph::Normalizer& norm, double trackPen,
-                double distPenFac, double nonOsmPen) const;
-};
-}  // namespace trgraph
-}  // namespace pfaedle
-
-#endif  // PFAEDLE_TRGRAPH_STATGROUP_H_
diff --git a/src/pfaedle/trgraph/StatInfo.cpp b/src/pfaedle/trgraph/StatInfo.cpp
index 0b642b6..132c985 100644
--- a/src/pfaedle/trgraph/StatInfo.cpp
+++ b/src/pfaedle/trgraph/StatInfo.cpp
@@ -3,66 +3,24 @@
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
 #include "pfaedle/router/Comp.h"
-#include "pfaedle/trgraph/StatGroup.h"
 #include "pfaedle/trgraph/StatInfo.h"
 
 using pfaedle::trgraph::StatInfo;
-using pfaedle::trgraph::StatGroup;
-
-std::unordered_map<const StatGroup*, size_t> StatInfo::_groups;
 
 // _____________________________________________________________________________
-StatInfo::StatInfo() : _name(""), _track(""), _fromOsm(false), _group(0) {}
+StatInfo::StatInfo() : _name(""), _track("") {}
 
 // _____________________________________________________________________________
 StatInfo::StatInfo(const StatInfo& si)
-    : _name(si._name),
-      _altNames(si._altNames),
-      _track(si._track),
-      _fromOsm(si._fromOsm),
-      _group(0) {
-  setGroup(si._group);
+    : _name(si._name), _altNames(si._altNames), _track(si._track) {
 #ifdef PFAEDLE_STATION_IDS
   _id = si._id;
 #endif
 }
 
 // _____________________________________________________________________________
-StatInfo::StatInfo(const std::string& name, const std::string& track,
-                   bool fromOsm)
-    : _name(name), _track(track), _fromOsm(fromOsm), _group(0) {}
-
-// _____________________________________________________________________________
-StatInfo::~StatInfo() { unRefGroup(_group); }
-
-// _____________________________________________________________________________
-void StatInfo::unRefGroup(StatGroup* g) {
-  if (g) {
-    _groups[g]--;
-    if (_groups[g] == 0) {
-      // std::cout << "Deleting " << g << std::endl;
-      delete g;
-      _groups.erase(_groups.find(g));
-    }
-  }
-}
-
-// _____________________________________________________________________________
-void StatInfo::setGroup(StatGroup* g) {
-  if (_group == g) return;
-  unRefGroup(_group);
-
-  _group = g;
-
-  // NOT thread safe!
-  if (!_groups.count(g))
-    _groups[g] = 1;
-  else
-    _groups[g]++;
-}
-
-// _____________________________________________________________________________
-StatGroup* StatInfo::getGroup() const { return _group; }
+StatInfo::StatInfo(const std::string& name, const std::string& track)
+    : _name(name), _track(track) {}
 
 // _____________________________________________________________________________
 const std::string& StatInfo::getName() const { return _name; }
@@ -70,12 +28,6 @@ const std::string& StatInfo::getName() const { return _name; }
 // _____________________________________________________________________________
 const std::string& StatInfo::getTrack() const { return _track; }
 
-// _____________________________________________________________________________
-bool StatInfo::isFromOsm() const { return _fromOsm; }
-
-// _____________________________________________________________________________
-void StatInfo::setIsFromOsm(bool is) { _fromOsm = is; }
-
 // _____________________________________________________________________________
 double StatInfo::simi(const StatInfo* other) const {
   if (!other) return 0;
diff --git a/src/pfaedle/trgraph/StatInfo.h b/src/pfaedle/trgraph/StatInfo.h
index de0bbcf..dcd5ba7 100644
--- a/src/pfaedle/trgraph/StatInfo.h
+++ b/src/pfaedle/trgraph/StatInfo.h
@@ -6,24 +6,20 @@
 #define PFAEDLE_TRGRAPH_STATINFO_H_
 
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace pfaedle {
 namespace trgraph {
 
-// forward declaration
-class StatGroup;
-
 /*
- * Meta information (name, alternative names, track, group...) of a single stop
+ * Meta information (name, alternative names, track, ...) of a single stop
  */
 class StatInfo {
  public:
   StatInfo();
   StatInfo(const StatInfo& si);
-  StatInfo(const std::string& name, const std::string& track, bool _fromOsm);
-  ~StatInfo();
+  StatInfo(const std::string& name, const std::string& track);
 
   // Return this stops names.
   const std::string& getName() const;
@@ -43,18 +39,6 @@ class StatInfo {
   // Return the similarity between this stop and other
   double simi(const StatInfo* other) const;
 
-  // Set this stations group.
-  void setGroup(StatGroup* g);
-
-  // Return this stations group.
-  StatGroup* getGroup() const;
-
-  // True if this stop was from osm
-  bool isFromOsm() const;
-
-  // Set this stop as coming from osm
-  void setIsFromOsm(bool is);
-
 #ifdef PFAEDLE_STATION_IDS
   const std::string& getId() const { return _id; }
   void setId(const std::string& id) { _id = id; }
@@ -64,17 +48,12 @@ class StatInfo {
   std::string _name;
   std::vector<std::string> _altNames;
   std::string _track;
-  bool _fromOsm;
-  StatGroup* _group;
 
 #ifdef PFAEDLE_STATION_IDS
   // debug feature to store station ids from both OSM
   // and GTFS
   std::string _id;
 #endif
-
-  static std::unordered_map<const StatGroup*, size_t> _groups;
-  static void unRefGroup(StatGroup* g);
 };
 }  // namespace trgraph
 }  // namespace pfaedle
diff --git a/src/shapevl/CMakeLists.txt b/src/shapevl/CMakeLists.txt
new file mode 100644
index 0000000..e6bdc17
--- /dev/null
+++ b/src/shapevl/CMakeLists.txt
@@ -0,0 +1,15 @@
+file(GLOB_RECURSE shapevl_SRC *.cpp)
+
+set(shapevl_main ShapevlMain.cpp)
+
+list(REMOVE_ITEM shapevl_SRC ${shapevl_main})
+
+include_directories(
+	${PFAEDLE_INCLUDE_DIR}
+)
+
+add_executable(shapevl ${shapevl_main})
+add_library(shapevl_dep ${shapevl_SRC})
+
+include_directories(shapevl_dep PUBLIC ${PROJECT_SOURCE_DIR}/src/cppgtfs/src)
+target_link_libraries(shapevl shapevl_dep util ad_cppgtfs -lpthread)
diff --git a/src/shapevl/Collector.cpp b/src/shapevl/Collector.cpp
new file mode 100644
index 0000000..610192d
--- /dev/null
+++ b/src/shapevl/Collector.cpp
@@ -0,0 +1,373 @@
+// Copyright 2018, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <fstream>
+#include <set>
+#include <string>
+#include <utility>
+#include "ad/cppgtfs/gtfs/Feed.h"
+#include "pfaedle/Def.h"
+#include "shapevl/Collector.h"
+#include "shapevl/Result.h"
+#include "util/geo/Geo.h"
+#include "util/geo/PolyLine.h"
+#include "util/geo/output/GeoJsonOutput.h"
+#include "util/log/Log.h"
+
+using util::geo::PolyLine;
+
+using ad::cppgtfs::gtfs::Shape;
+using ad::cppgtfs::gtfs::Trip;
+using pfaedle::eval::Collector;
+using pfaedle::eval::Result;
+using util::geo::output::GeoJsonOutput;
+
+// _____________________________________________________________________________
+double Collector::add(const Trip* oldT, const Shape* oldS, const Trip* newT,
+                      const Shape* newS) {
+  // This adds a new trip with a new shape to our evaluation.
+
+  _trips++;
+
+  if (!oldS) {
+    // If there is no original shape, we cannot compare them - abort!
+    _noOrigShp++;
+    return 0;
+  }
+
+  for (auto st : oldT->getStopTimes()) {
+    if (st.getShapeDistanceTravelled() < 0) {
+      // we cannot safely compare trips without shape dist travelled
+      // information - abort!
+      _noOrigShp++;
+      return 0;
+    }
+  }
+
+  for (auto st : newT->getStopTimes()) {
+    if (st.getShapeDistanceTravelled() < 0) {
+      // we cannot safely compare trips without shape dist travelled
+      // information - abort!
+      _noOrigShp++;
+      return 0;
+    }
+  }
+
+  double fd = 0;
+
+  // A "segment" is a path from station s_i to station s_{i+1}
+
+  size_t unmatchedSegments;        // number of unmatched segments
+  double unmatchedSegmentsLength;  // total _acc. length of unmatched segments
+
+  std::vector<double> oldDists;
+  LINE oldL = getWebMercLine(oldS, &oldDists);
+
+  std::vector<double> newDists;
+  LINE newL = getWebMercLine(newS, &newDists);
+
+  auto oldSegs = segmentize(oldT, oldL, oldDists);
+  auto newSegs = segmentize(newT, newL, newDists);
+
+  // new lines build from cleaned-up shapes
+  LINE oldLCut;
+  LINE newLCut;
+
+  for (auto oldL : oldSegs)
+    oldLCut.insert(oldLCut.end(), oldL.begin(), oldL.end());
+
+  for (auto newL : newSegs)
+    newLCut.insert(newLCut.end(), newL.begin(), newL.end());
+
+  // determine the scale factor between the distance in projected
+  // coordinates and the real-world distance in meters
+  auto avgY =
+      (oldSegs.front().front().getY() + oldSegs.back().back().getY()) / 2;
+  double fac = cos(2 * atan(exp(avgY / 6378137.0)) - 1.5707965);
+
+  double SEGL = 10;
+
+  if (_dCache.count(oldS) && _dCache.find(oldS)->second.count(newS->getId())) {
+    fd = _dCache[oldS][newS->getId()];
+  } else {
+    fd = util::geo::accFrechetDistC(oldLCut, newLCut, SEGL / fac) * fac;
+    _dCache[oldS][newS->getId()] = fd;
+  }
+
+  if (_dACache.count(oldS) &&
+      _dACache.find(oldS)->second.count(newS->getId())) {
+    unmatchedSegments = _dACache[oldS][newS->getId()].first;
+    unmatchedSegmentsLength = _dACache[oldS][newS->getId()].second;
+  } else {
+    auto dA = getDa(oldSegs, newSegs);
+    _dACache[oldS][newS->getId()] = dA;
+    unmatchedSegments = dA.first;
+    unmatchedSegmentsLength = dA.second;
+  }
+
+  double totL = 0;
+  for (auto l : oldSegs) totL += util::geo::len(l) * fac;
+
+  // filter out shapes with a length of under 5 meters - they are most likely
+  // artifacts
+  if (totL < 5) {
+    _noOrigShp++;
+    return 0;
+  }
+
+  _fdSum += fd / totL;
+  _unmatchedSegSum += unmatchedSegments;
+  _unmatchedSegLengthSum += unmatchedSegmentsLength;
+
+  double avgFd = fd / totL;
+  double AN = static_cast<double>(unmatchedSegments) /
+              static_cast<double>(oldSegs.size());
+  double AL = unmatchedSegmentsLength / totL;
+
+  _results.insert(Result(oldT, avgFd));
+
+  if (AN <= 0.0001) _acc0++;
+  if (AN <= 0.1) _acc10++;
+  if (AN <= 0.2) _acc20++;
+  if (AN <= 0.4) _acc40++;
+  if (AN <= 0.8) _acc80++;
+
+  LOG(VDEBUG) << "This result (" << oldT->getId()
+              << "): A_N/N = " << unmatchedSegments << "/" << oldSegs.size()
+              << " = " << AN << " A_L/L = " << unmatchedSegmentsLength << "/"
+              << totL << " = " << AL << " d_f = " << avgFd;
+
+  if (_reportOut) {
+    (*_reportOut) << oldT->getId() << "\t" << AN << "\t" << AL << "\t" << avgFd
+                  << "\t" << util::geo::getWKT(oldSegs) << "\t"
+                  << util::geo::getWKT(newSegs) << "\n";
+  }
+
+  return avgFd;
+}
+
+// _____________________________________________________________________________
+std::vector<LINE> Collector::segmentize(const Trip* t, const LINE& shape,
+                                        const std::vector<double>& dists) {
+  // The straightforward way to segmentize the shape would be to just cut it at
+  // the exact measurements in stop_times.txt. We have tried that, but found
+  // that it produces misleading results for the following reason:
+  //
+  // 1) The measurement specifies an exact position on the shape.
+  // 2) Even if we consider correct rail or bus tracks, the "right" position
+  //    where a vehicle may come to a halt is not a point - its a line segment,
+  //    basically the entire track in railroad term
+  // 3) The position point on the shape in real-world feeds may be either a) the
+  //    position where a train comes to a halt, b) the position where a carriage
+  //    comes to a halt, c) the beginning of the tracks line segment, d) the end
+  //    of the tracks line segment, e) the center of the tracks line segment, f)
+  //    ... (any position on the tracks line segment.
+  // 4) The "correct" position is NOT well-defined.
+  // 5) As tracks are often longer than 20 meters, this will dillute our AN
+  //    measure, although the shape is CORRECT (because the ground truth uses
+  //    a different position philosophy than the test data)
+  // 6) To normalize this, we always the following approach:
+  //      a) Get the exact progression of the measurment on the shape
+  //      b) Extract a segment of 200 meters, with the measurement progress in the middle
+  //      c) Project the GROUND TRUTH station coordinate to this segment
+  //      d) The result is the cutting point
+  // 7) If a completely wrong track was chosen, the frechet distance will still
+  //    be greater than 20 meters and AN will measure an unmatch.
+  // 8) TODO: implement this, explain this in diss
+  std::vector<LINE> ret;
+
+  if (t->getStopTimes().size() < 2) return ret;
+
+  POLYLINE pl(shape);
+  std::vector<std::pair<POINT, double> > cuts;
+
+  size_t i = 0;
+  for (auto st : t->getStopTimes()) {
+    cuts.push_back(std::pair<POINT, double>(
+        util::geo::latLngToWebMerc<PFDL_PREC>(st.getStop()->getLat(),
+                                              st.getStop()->getLng()),
+        st.getShapeDistanceTravelled()));
+    i++;
+  }
+
+  // get first half of geometry, and search for start point there!
+  size_t before = std::upper_bound(dists.begin(), dists.end(), cuts[1].second) -
+                  dists.begin();
+  if (before + 1 > shape.size()) before = shape.size() - 1;
+  assert(shape.begin() + before + 1 <= shape.end());
+  POLYLINE l(LINE(shape.begin(), shape.begin() + before + 1));
+  auto lastLp = l.projectOn(cuts.front().first);
+
+  for (size_t i = 1; i < cuts.size(); i++) {
+    size_t before = shape.size();
+    if (i < cuts.size() - 1 && cuts[i + 1].second > -0.5) {
+      before =
+          std::upper_bound(dists.begin(), dists.end(), cuts[i + 1].second) -
+          dists.begin();
+    }
+
+    POLYLINE beforePl(LINE(shape.begin(), shape.begin() + before));
+
+    auto curLp = beforePl.projectOnAfter(cuts[i].first, lastLp.lastIndex);
+
+    ret.push_back(pl.getSegment(lastLp, curLp).getLine());
+    lastLp = curLp;
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+LINE Collector::getWebMercLine(const Shape* s, std::vector<double>* dists) {
+  LINE ret;
+
+  for (size_t i = 0; i < s->getPoints().size(); i++) {
+    ret.push_back(util::geo::latLngToWebMerc<PFDL_PREC>(s->getPoints()[i].lat,
+                                                        s->getPoints()[i].lng));
+    (*dists).push_back(s->getPoints()[i].travelDist);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+const std::set<Result>& Collector::getResults() const { return _results; }
+
+// _____________________________________________________________________________
+double Collector::getAvgDist() const { return _fdSum / _results.size(); }
+
+// _____________________________________________________________________________
+std::vector<double> Collector::getBins(double mind, double maxd, size_t steps) {
+  double bin = (maxd - mind) / steps;
+  double curE = mind + bin;
+
+  std::vector<double> ret;
+  while (curE <= maxd) {
+    ret.push_back(curE);
+    curE += bin;
+  }
+  return ret;
+}
+
+// _____________________________________________________________________________
+void Collector::printCsv(std::ostream* os,
+                         const std::set<Result>& result) const {
+  for (auto r : result) (*os) << r.getDist() << "\n";
+}
+
+// _____________________________________________________________________________
+double Collector::getAcc() const {
+  return static_cast<double>(_acc0) / static_cast<double>(_results.size());
+}
+
+// _____________________________________________________________________________
+void Collector::printShortStats(std::ostream* os) const {
+  if (_results.size()) {
+    (*os) << "acc-0: "
+          << (static_cast<double>(_acc0) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %";
+    (*os) << " acc-10: "
+          << (static_cast<double>(_acc10) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %";
+    (*os) << " acc-20: "
+          << (static_cast<double>(_acc20) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %";
+    (*os) << " acc-40: "
+          << (static_cast<double>(_acc40) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %";
+    (*os) << " acc-80: "
+          << (static_cast<double>(_acc80) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %";
+  }
+}
+
+// _____________________________________________________________________________
+void Collector::printStats(std::ostream* os) const {
+  (*os) << std::setfill(' ') << std::setw(50) << "  # of trips: " << _trips
+        << "\n";
+  (*os) << std::setfill(' ') << std::setw(50)
+        << "  # of trips new shapes were matched for: " << _results.size()
+        << "\n";
+  (*os) << std::setw(50) << "  # of trips without input shapes: " << _noOrigShp
+        << "\n";
+
+  if (_results.size()) {
+    (*os) << std::setw(50) << "  highest avg frechet distance to input shapes: "
+          << (--_results.end())->getDist() << " (on trip #"
+          << (--_results.end())->getTrip()->getId() << ")\n";
+    (*os) << std::setw(50) << "  lowest distance to input shapes: "
+          << (_results.begin())->getDist() << " (on trip #"
+          << (_results.begin())->getTrip()->getId() << ")\n";
+    (*os) << std::setw(50)
+          << "  averaged avg frechet distance: " << getAvgDist() << "\n";
+
+    (*os) << "\n";
+    (*os) << "  acc-0: "
+          << (static_cast<double>(_acc0) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %"
+          << "\n";
+    (*os) << "  acc-10: "
+          << (static_cast<double>(_acc10) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %"
+          << "\n";
+    (*os) << "  acc-20: "
+          << (static_cast<double>(_acc20) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %"
+          << "\n";
+    (*os) << "  acc-40: "
+          << (static_cast<double>(_acc40) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %"
+          << "\n";
+    (*os) << "  acc-80: "
+          << (static_cast<double>(_acc80) /
+              static_cast<double>(_results.size())) *
+                 100
+          << " %"
+          << "\n";
+  }
+
+  (*os) << std::endl;
+}
+
+// _____________________________________________________________________________
+std::pair<size_t, double> Collector::getDa(const std::vector<LINE>& a,
+                                           const std::vector<LINE>& b) {
+  assert(a.size() == b.size());
+  std::pair<size_t, double> ret{0, 0};
+
+  // euclidean distance on web mercator is in meters on equator,
+  // and proportional to cos(lat) in both y directions
+  double fac =
+      cos(2 * atan(exp((a.front().front().getY() + a.back().back().getY()) /
+                       6378137.0)) -
+          1.5707965);
+
+  for (size_t i = 0; i < a.size(); i++) {
+    double fd = util::geo::frechetDist(a[i], b[i], 3 / fac) * fac;
+    if (fd >= 20) {
+      ret.first++;
+      ret.second += util::geo::len(a[i]) * fac;
+    }
+  }
+
+  return ret;
+}
diff --git a/src/pfaedle/eval/Collector.h b/src/shapevl/Collector.h
similarity index 64%
rename from src/pfaedle/eval/Collector.h
rename to src/shapevl/Collector.h
index 853314e..876ccbf 100644
--- a/src/pfaedle/eval/Collector.h
+++ b/src/shapevl/Collector.h
@@ -5,6 +5,7 @@
 #ifndef PFAEDLE_EVAL_COLLECTOR_H_
 #define PFAEDLE_EVAL_COLLECTOR_H_
 
+#include <fstream>
 #include <map>
 #include <ostream>
 #include <set>
@@ -12,13 +13,12 @@
 #include <utility>
 #include <vector>
 #include "ad/cppgtfs/gtfs/Feed.h"
-#include "pfaedle/gtfs/Feed.h"
 #include "pfaedle/Def.h"
-#include "pfaedle/eval/Result.h"
+#include "shapevl/Result.h"
 #include "util/geo/Geo.h"
 
-using pfaedle::gtfs::Trip;
 using ad::cppgtfs::gtfs::Shape;
+using ad::cppgtfs::gtfs::Trip;
 
 namespace pfaedle {
 namespace eval {
@@ -28,18 +28,23 @@ namespace eval {
  */
 class Collector {
  public:
-  Collector(const std::string& evalOutPath, const std::vector<double>& dfBins)
-      : _noOrigShp(0),
+  Collector(std::ostream* reportOut)
+      : _trips(0),
+        _noOrigShp(0),
         _fdSum(0),
         _unmatchedSegSum(0),
         _unmatchedSegLengthSum(0),
-        _evalOutPath(evalOutPath),
-        _dfBins(dfBins) {}
+        _acc0(0),
+        _acc10(0),
+        _acc20(0),
+        _acc40(0),
+        _acc80(0),
+        _reportOut(reportOut) {}
 
   // Add a shape found by our tool newS for a trip t with newly calculated
   // station dist values with the old shape oldS
-  double add(const Trip* t, const Shape* oldS, const Shape& newS,
-             const std::vector<double>& newDists);
+  double add(const Trip* oldT, const Shape* oldS, const Trip* newT,
+             const Shape* newS);
 
   // Return the set of all Result objects
   const std::set<Result>& getResults() const;
@@ -47,44 +52,44 @@ class Collector {
   // Print general stats to os
   void printStats(std::ostream* os) const;
 
-  // Print histogramgs for the results to os
-  void printHisto(std::ostream* os, const std::set<Result>& result,
-                  const std::vector<double>& bins) const;
+  // Print general stats to os
+  void printShortStats(std::ostream* os) const;
 
   // Print a CSV for the results to os
-  void printCsv(std::ostream* os, const std::set<Result>& result,
-                const std::vector<double>& bins) const;
+  void printCsv(std::ostream* os, const std::set<Result>& result) const;
 
   // Return the averaged average frechet distance
   double getAvgDist() const;
 
-  static LINE getWebMercLine(const Shape* s, double from, double to);
-  static LINE getWebMercLine(const Shape* s, double from, double to,
-                             std::vector<double>* dists);
+  static LINE getWebMercLine(const Shape* s, std::vector<double>* dists);
+
+  double getAcc() const;
 
  private:
   std::set<Result> _results;
-  std::set<Result> _resultsAN;
-  std::set<Result> _resultsAL;
   std::map<const Shape*, std::map<std::string, double> > _dCache;
   std::map<const Shape*, std::map<std::string, std::pair<size_t, double> > >
       _dACache;
+  size_t _trips;
   size_t _noOrigShp;
 
   double _fdSum;
   size_t _unmatchedSegSum;
   double _unmatchedSegLengthSum;
 
-  std::string _evalOutPath;
+  size_t _acc0;
+  size_t _acc10;
+  size_t _acc20;
+  size_t _acc40;
+  size_t _acc80;
 
-  std::vector<double> _dfBins;
+  std::ostream* _reportOut;
 
   static std::pair<size_t, double> getDa(const std::vector<LINE>& a,
                                          const std::vector<LINE>& b);
 
   static std::vector<LINE> segmentize(const Trip* t, const LINE& shape,
-                                      const std::vector<double>& dists,
-                                      const std::vector<double>* newTripDists);
+                                      const std::vector<double>& dists);
 
   static std::vector<double> getBins(double mind, double maxd, size_t steps);
 };
diff --git a/src/pfaedle/eval/Result.h b/src/shapevl/Result.h
similarity index 93%
rename from src/pfaedle/eval/Result.h
rename to src/shapevl/Result.h
index b039234..0bfa667 100644
--- a/src/pfaedle/eval/Result.h
+++ b/src/shapevl/Result.h
@@ -5,10 +5,9 @@
 #ifndef PFAEDLE_EVAL_RESULT_H_
 #define PFAEDLE_EVAL_RESULT_H_
 
-#include "pfaedle/gtfs/Feed.h"
 #include "ad/cppgtfs/gtfs/Feed.h"
 
-using pfaedle::gtfs::Trip;
+using ad::cppgtfs::gtfs::Trip;
 using ad::cppgtfs::gtfs::Shape;
 
 namespace pfaedle {
diff --git a/src/shapevl/ShapevlMain.cpp b/src/shapevl/ShapevlMain.cpp
new file mode 100644
index 0000000..3b94342
--- /dev/null
+++ b/src/shapevl/ShapevlMain.cpp
@@ -0,0 +1,174 @@
+// Copyright 2020, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include <limits.h>
+#include <stdlib.h>
+#include <atomic>
+#include <iostream>
+#include <string>
+#include <thread>
+#include <vector>
+#include "ad/cppgtfs/Parser.h"
+#include "shapevl/Collector.h"
+#include "util/Misc.h"
+#include "util/log/Log.h"
+
+std::atomic<int> count(0);
+
+// _____________________________________________________________________________
+void printHelp(int argc, char** argv) {
+  UNUSED(argc);
+  std::cout << "Usage: " << argv[0]
+            << " [-f <reportpath>] -g <gtfs> [-s] <test feeds>"
+            << "\n";
+  std::cout
+      << "\nAllowed arguments:\n    -g <gtfs>     Ground truth GTFS file\n";
+  std::cout << "     -s           Only output summary\n";
+  std::cout << "     -f <folder>  Output full reports (per feed) to <folder>\n";
+  std::cout
+      << "     -m           MOTs to match (GTFS MOT or string, default: all)\n";
+}
+
+// _____________________________________________________________________________
+void eval(const std::vector<std::string>* paths,
+          std::vector<pfaedle::eval::Collector>* colls,
+          const std::set<Route::TYPE>* mots,
+          const ad::cppgtfs::gtfs::Feed* evalFeed) {
+  while (1) {
+    int myFeed = count-- - 1;
+    if (myFeed < 0) return;
+    std::string path = (*paths)[myFeed];
+    LOG(DEBUG) << "Reading eval feed " << path << " "
+               << " ...";
+    ad::cppgtfs::gtfs::Feed feed;
+    ad::cppgtfs::Parser p;
+
+    try {
+      p.parse(&feed, path);
+    } catch (const ad::cppgtfs::ParserException& ex) {
+      LOG(ERROR) << "Could not parse GTFS feed " << path << ", reason was:";
+      std::cerr << ex.what() << std::endl;
+      exit(1);
+    }
+
+    LOG(DEBUG) << "Evaluating " << path << "...";
+    for (const auto oldTrip : evalFeed->getTrips()) {
+      if (!mots->count(oldTrip.second->getRoute()->getType())) continue;
+      auto newTrip = feed.getTrips().get(oldTrip.first);
+      if (!newTrip)
+        LOG(ERROR) << "Trip #" << oldTrip.first << " not present in " << path;
+      (*colls)[myFeed].add(oldTrip.second, oldTrip.second->getShape(), newTrip,
+                           newTrip->getShape());
+    }
+  }
+}
+
+// _____________________________________________________________________________
+int main(int argc, char** argv) {
+  // disable output buffering for standard output
+  setbuf(stdout, NULL);
+
+  // initialize randomness
+  srand(time(NULL) + rand());  // NOLINT
+
+  std::string groundTruthFeedPath, motStr;
+  motStr = "all";
+  ad::cppgtfs::gtfs::Feed groundTruthFeed;
+  std::string fullReportPath = "";
+  std::vector<std::string> evlFeedPaths;
+  std::set<std::string> evlFeedPathsUniq;
+  std::vector<pfaedle::eval::Collector> evalColls;
+  std::vector<std::ofstream> reportStreams;
+  bool summarize = false;
+
+  for (int i = 1; i < argc; i++) {
+    std::string cur = argv[i];
+    if (cur == "-h" || cur == "--help") {
+      printHelp(argc, argv);
+      exit(0);
+    } else if (cur == "-g") {
+      if (++i >= argc) {
+        LOG(ERROR) << "Missing argument for ground truth (-g).";
+        exit(1);
+      }
+      groundTruthFeedPath = argv[i];
+    } else if (cur == "-s") {
+      summarize = true;
+    } else if (cur == "-f") {
+      if (++i >= argc) {
+        LOG(ERROR) << "Missing argument for full reports (-f).";
+        exit(1);
+      }
+      fullReportPath = argv[i];
+    } else if (cur == "-m") {
+      if (++i >= argc) {
+        LOG(ERROR) << "Missing argument for mot (-m).";
+        exit(1);
+      }
+      motStr = argv[i];
+    } else {
+      char fullPath[PATH_MAX + 1];
+      if (!realpath(cur.c_str(), fullPath)) {
+        LOG(ERROR) << "Error while reading " << fullPath;
+        exit(1);
+      }
+      evlFeedPathsUniq.insert(fullPath);
+    }
+  }
+
+  for (const auto& feedPath : evlFeedPathsUniq) {
+    evlFeedPaths.push_back(feedPath);
+    if (fullReportPath.size()) {
+      reportStreams.emplace_back();
+      reportStreams.back().open(fullReportPath + "/" +
+                                util::split(feedPath, '/').back() +
+                                ".fullreport.tsv");
+      evalColls.push_back({&reportStreams.back()});
+    } else {
+      evalColls.push_back({0});
+    }
+    count++;
+  }
+
+  if (groundTruthFeedPath.size() == 0) {
+    LOG(ERROR) << "No ground truth feed path given (-g).";
+    exit(1);
+  }
+
+  std::set<Route::TYPE> mots =
+      ad::cppgtfs::gtfs::flat::Route::getTypesFromString(util::trim(motStr));
+
+  std::vector<ad::cppgtfs::gtfs::Feed> evlFeeds(evlFeedPaths.size());
+
+  try {
+    LOG(DEBUG) << "Reading ground truth feed" << groundTruthFeedPath << " ...";
+    ad::cppgtfs::Parser p;
+    p.parse(&groundTruthFeed, groundTruthFeedPath);
+  } catch (const ad::cppgtfs::ParserException& ex) {
+    LOG(ERROR) << "Could not parse input GTFS feed, reason was:";
+    std::cerr << ex.what() << std::endl;
+    exit(1);
+  }
+
+  size_t THREADS = std::thread::hardware_concurrency();
+
+  std::vector<std::thread> thrds(THREADS);
+  for (auto& thr : thrds)
+    thr =
+        std::thread(&eval, &evlFeedPaths, &evalColls, &mots, &groundTruthFeed);
+
+  for (auto& thr : thrds) thr.join();
+
+  for (size_t i = 0; i < evalColls.size(); i++) {
+    if (summarize) {
+      std::cout << evlFeedPaths[i] << ": ";
+      evalColls[i].printShortStats(&std::cout);
+      std::cout << std::endl;
+    } else {
+      std::cout << " == Evaluation results for " << evlFeedPaths[i]
+                << " ===" << std::endl;
+      evalColls[i].printStats(&std::cout);
+    }
+  }
+}
diff --git a/src/util/3rdparty/MurmurHash3.cpp b/src/util/3rdparty/MurmurHash3.cpp
new file mode 100644
index 0000000..aa7982d
--- /dev/null
+++ b/src/util/3rdparty/MurmurHash3.cpp
@@ -0,0 +1,335 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+// Note - The x86 and x64 versions do _not_ produce the same results, as the
+// algorithms are optimized for their respective platforms. You can still
+// compile and run any of them on any platform, but your performance with the
+// non-native version will be less than optimal.
+
+#include "MurmurHash3.h"
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER)
+
+#define FORCE_INLINE	__forceinline
+
+#include <stdlib.h>
+
+#define ROTL32(x,y)	_rotl(x,y)
+#define ROTL64(x,y)	_rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x)
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#define	FORCE_INLINE inline __attribute__((always_inline))
+
+inline uint32_t rotl32 ( uint32_t x, int8_t r )
+{
+  return (x << r) | (x >> (32 - r));
+}
+
+inline uint64_t rotl64 ( uint64_t x, int8_t r )
+{
+  return (x << r) | (x >> (64 - r));
+}
+
+#define	ROTL32(x,y)	rotl32(x,y)
+#define ROTL64(x,y)	rotl64(x,y)
+
+#define BIG_CONSTANT(x) (x##LLU)
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+// Block read - if your platform needs to do endian-swapping or can only
+// handle aligned reads, do the conversion here
+
+FORCE_INLINE uint32_t getblock32 ( const uint32_t * p, int i )
+{
+  return p[i];
+}
+
+FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
+{
+  return p[i];
+}
+
+//-----------------------------------------------------------------------------
+// Finalization mix - force all bits of a hash block to avalanche
+
+FORCE_INLINE uint32_t fmix32 ( uint32_t h )
+{
+  h ^= h >> 16;
+  h *= 0x85ebca6b;
+  h ^= h >> 13;
+  h *= 0xc2b2ae35;
+  h ^= h >> 16;
+
+  return h;
+}
+
+//----------
+
+FORCE_INLINE uint64_t fmix64 ( uint64_t k )
+{
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xff51afd7ed558ccd);
+  k ^= k >> 33;
+  k *= BIG_CONSTANT(0xc4ceb9fe1a85ec53);
+  k ^= k >> 33;
+
+  return k;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32 ( const void * key, int len,
+                          uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 4;
+
+  uint32_t h1 = seed;
+
+  const uint32_t c1 = 0xcc9e2d51;
+  const uint32_t c2 = 0x1b873593;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock32(blocks,i);
+
+    k1 *= c1;
+    k1 = ROTL32(k1,15);
+    k1 *= c2;
+    
+    h1 ^= k1;
+    h1 = ROTL32(h1,13); 
+    h1 = h1*5+0xe6546b64;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
+
+  uint32_t k1 = 0;
+
+  switch(len & 3)
+  {
+  case 3: k1 ^= tail[2] << 16;
+  case 2: k1 ^= tail[1] << 8;
+  case 1: k1 ^= tail[0];
+          k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len;
+
+  h1 = fmix32(h1);
+
+  *(uint32_t*)out = h1;
+} 
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_128 ( const void * key, const int len,
+                           uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint32_t h1 = seed;
+  uint32_t h2 = seed;
+  uint32_t h3 = seed;
+  uint32_t h4 = seed;
+
+  const uint32_t c1 = 0x239b961b; 
+  const uint32_t c2 = 0xab0e9789;
+  const uint32_t c3 = 0x38b34ae5; 
+  const uint32_t c4 = 0xa1e38b93;
+
+  //----------
+  // body
+
+  const uint32_t * blocks = (const uint32_t *)(data + nblocks*16);
+
+  for(int i = -nblocks; i; i++)
+  {
+    uint32_t k1 = getblock32(blocks,i*4+0);
+    uint32_t k2 = getblock32(blocks,i*4+1);
+    uint32_t k3 = getblock32(blocks,i*4+2);
+    uint32_t k4 = getblock32(blocks,i*4+3);
+
+    k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL32(h1,19); h1 += h2; h1 = h1*5+0x561ccd1b;
+
+    k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+    h2 = ROTL32(h2,17); h2 += h3; h2 = h2*5+0x0bcaa747;
+
+    k3 *= c3; k3  = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+    h3 = ROTL32(h3,15); h3 += h4; h3 = h3*5+0x96cd1c35;
+
+    k4 *= c4; k4  = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+    h4 = ROTL32(h4,13); h4 += h1; h4 = h4*5+0x32ac3b17;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint32_t k1 = 0;
+  uint32_t k2 = 0;
+  uint32_t k3 = 0;
+  uint32_t k4 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k4 ^= tail[14] << 16;
+  case 14: k4 ^= tail[13] << 8;
+  case 13: k4 ^= tail[12] << 0;
+           k4 *= c4; k4  = ROTL32(k4,18); k4 *= c1; h4 ^= k4;
+
+  case 12: k3 ^= tail[11] << 24;
+  case 11: k3 ^= tail[10] << 16;
+  case 10: k3 ^= tail[ 9] << 8;
+  case  9: k3 ^= tail[ 8] << 0;
+           k3 *= c3; k3  = ROTL32(k3,17); k3 *= c4; h3 ^= k3;
+
+  case  8: k2 ^= tail[ 7] << 24;
+  case  7: k2 ^= tail[ 6] << 16;
+  case  6: k2 ^= tail[ 5] << 8;
+  case  5: k2 ^= tail[ 4] << 0;
+           k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
+
+  case  4: k1 ^= tail[ 3] << 24;
+  case  3: k1 ^= tail[ 2] << 16;
+  case  2: k1 ^= tail[ 1] << 8;
+  case  1: k1 ^= tail[ 0] << 0;
+           k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  h1 = fmix32(h1);
+  h2 = fmix32(h2);
+  h3 = fmix32(h3);
+  h4 = fmix32(h4);
+
+  h1 += h2; h1 += h3; h1 += h4;
+  h2 += h1; h3 += h1; h4 += h1;
+
+  ((uint32_t*)out)[0] = h1;
+  ((uint32_t*)out)[1] = h2;
+  ((uint32_t*)out)[2] = h3;
+  ((uint32_t*)out)[3] = h4;
+}
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x64_128 ( const void * key, const int len,
+                           const uint32_t seed, void * out )
+{
+  const uint8_t * data = (const uint8_t*)key;
+  const int nblocks = len / 16;
+
+  uint64_t h1 = seed;
+  uint64_t h2 = seed;
+
+  const uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
+  const uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
+
+  //----------
+  // body
+
+  const uint64_t * blocks = (const uint64_t *)(data);
+
+  for(int i = 0; i < nblocks; i++)
+  {
+    uint64_t k1 = getblock64(blocks,i*2+0);
+    uint64_t k2 = getblock64(blocks,i*2+1);
+
+    k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+
+    h1 = ROTL64(h1,27); h1 += h2; h1 = h1*5+0x52dce729;
+
+    k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+    h2 = ROTL64(h2,31); h2 += h1; h2 = h2*5+0x38495ab5;
+  }
+
+  //----------
+  // tail
+
+  const uint8_t * tail = (const uint8_t*)(data + nblocks*16);
+
+  uint64_t k1 = 0;
+  uint64_t k2 = 0;
+
+  switch(len & 15)
+  {
+  case 15: k2 ^= ((uint64_t)tail[14]) << 48;
+  case 14: k2 ^= ((uint64_t)tail[13]) << 40;
+  case 13: k2 ^= ((uint64_t)tail[12]) << 32;
+  case 12: k2 ^= ((uint64_t)tail[11]) << 24;
+  case 11: k2 ^= ((uint64_t)tail[10]) << 16;
+  case 10: k2 ^= ((uint64_t)tail[ 9]) << 8;
+  case  9: k2 ^= ((uint64_t)tail[ 8]) << 0;
+           k2 *= c2; k2  = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
+
+  case  8: k1 ^= ((uint64_t)tail[ 7]) << 56;
+  case  7: k1 ^= ((uint64_t)tail[ 6]) << 48;
+  case  6: k1 ^= ((uint64_t)tail[ 5]) << 40;
+  case  5: k1 ^= ((uint64_t)tail[ 4]) << 32;
+  case  4: k1 ^= ((uint64_t)tail[ 3]) << 24;
+  case  3: k1 ^= ((uint64_t)tail[ 2]) << 16;
+  case  2: k1 ^= ((uint64_t)tail[ 1]) << 8;
+  case  1: k1 ^= ((uint64_t)tail[ 0]) << 0;
+           k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
+  };
+
+  //----------
+  // finalization
+
+  h1 ^= len; h2 ^= len;
+
+  h1 += h2;
+  h2 += h1;
+
+  h1 = fmix64(h1);
+  h2 = fmix64(h2);
+
+  h1 += h2;
+  h2 += h1;
+
+  ((uint64_t*)out)[0] = h1;
+  ((uint64_t*)out)[1] = h2;
+}
+
+//-----------------------------------------------------------------------------
+
diff --git a/src/util/3rdparty/MurmurHash3.h b/src/util/3rdparty/MurmurHash3.h
new file mode 100644
index 0000000..e1c6d34
--- /dev/null
+++ b/src/util/3rdparty/MurmurHash3.h
@@ -0,0 +1,37 @@
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+
+#ifndef _MURMURHASH3_H_
+#define _MURMURHASH3_H_
+
+//-----------------------------------------------------------------------------
+// Platform-specific functions and macros
+
+// Microsoft Visual Studio
+
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+
+typedef unsigned char uint8_t;
+typedef unsigned int uint32_t;
+typedef unsigned __int64 uint64_t;
+
+// Other compilers
+
+#else	// defined(_MSC_VER)
+
+#include <stdint.h>
+
+#endif // !defined(_MSC_VER)
+
+//-----------------------------------------------------------------------------
+
+void MurmurHash3_x86_32  ( const void * key, int len, uint32_t seed, void * out );
+
+void MurmurHash3_x86_128 ( const void * key, int len, uint32_t seed, void * out );
+
+void MurmurHash3_x64_128 ( const void * key, int len, uint32_t seed, void * out );
+
+//-----------------------------------------------------------------------------
+
+#endif // _MURMURHASH3_H_
diff --git a/src/util/3rdparty/dtoa_milo.h b/src/util/3rdparty/dtoa_milo.h
new file mode 100644
index 0000000..1ed2670
--- /dev/null
+++ b/src/util/3rdparty/dtoa_milo.h
@@ -0,0 +1,454 @@
+// based on
+// https://github.com/miloyip/dtoa-benchmark/blob/master/src/milo/dtoa_milo.h
+
+#pragma once
+#include <assert.h>
+#include <math.h>
+#include <cmath>
+
+#if defined(_MSC_VER)
+#include <intrin.h>
+#include "msinttypes/stdint.h"
+#else
+#include <stdint.h>
+#endif
+
+namespace gcc_ints {
+__extension__ typedef __int128 int128;
+__extension__ typedef unsigned __int128 uint128;
+}  // namespace gcc_ints
+
+#define UINT64_C2(h, l) \
+  ((static_cast<uint64_t>(h) << 32) | static_cast<uint64_t>(l))
+
+namespace util {
+
+struct DiyFp {
+  DiyFp() {}
+
+  DiyFp(uint64_t f, int e) : f(f), e(e) {}
+
+  DiyFp(double d) {
+    union {
+      double d;
+      uint64_t u64;
+    } u = {d};
+
+    int biased_e = (u.u64 & kDpExponentMask) >> kDpSignificandSize;
+    uint64_t significand = (u.u64 & kDpSignificandMask);
+    if (biased_e != 0) {
+      f = significand + kDpHiddenBit;
+      e = biased_e - kDpExponentBias;
+    } else {
+      f = significand;
+      e = kDpMinExponent + 1;
+    }
+  }
+
+  DiyFp operator-(const DiyFp& rhs) const {
+    assert(e == rhs.e);
+    assert(f >= rhs.f);
+    return DiyFp(f - rhs.f, e);
+  }
+
+  DiyFp operator*(const DiyFp& rhs) const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+    uint64_t h;
+    uint64_t l = _umul128(f, rhs.f, &h);
+    if (l & (uint64_t(1) << 63))  // rounding
+      h++;
+    return DiyFp(h, e + rhs.e + 64);
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && \
+    defined(__x86_64__)
+    gcc_ints::uint128 p = static_cast<gcc_ints::uint128>(f) *
+                          static_cast<gcc_ints::uint128>(rhs.f);
+    uint64_t h = p >> 64;
+    uint64_t l = static_cast<uint64_t>(p);
+    if (l & (uint64_t(1) << 63))  // rounding
+      h++;
+    return DiyFp(h, e + rhs.e + 64);
+#else
+    const uint64_t M32 = 0xFFFFFFFF;
+    const uint64_t a = f >> 32;
+    const uint64_t b = f & M32;
+    const uint64_t c = rhs.f >> 32;
+    const uint64_t d = rhs.f & M32;
+    const uint64_t ac = a * c;
+    const uint64_t bc = b * c;
+    const uint64_t ad = a * d;
+    const uint64_t bd = b * d;
+    uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
+    tmp += 1U << 31;  /// mult_round
+    return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
+#endif
+  }
+
+  DiyFp Normalize() const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+    unsigned long index;
+    _BitScanReverse64(&index, f);
+    return DiyFp(f << (63 - index), e - (63 - index));
+#elif defined(__GNUC__)
+    int s = __builtin_clzll(f);
+    return DiyFp(f << s, e - s);
+#else
+    DiyFp res = *this;
+    while (!(res.f & kDpHiddenBit)) {
+      res.f <<= 1;
+      res.e--;
+    }
+    res.f <<= (kDiySignificandSize - kDpSignificandSize - 1);
+    res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 1);
+    return res;
+#endif
+  }
+
+  DiyFp NormalizeBoundary() const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+    unsigned long index;
+    _BitScanReverse64(&index, f);
+    return DiyFp(f << (63 - index), e - (63 - index));
+#else
+    DiyFp res = *this;
+    while (!(res.f & (kDpHiddenBit << 1))) {
+      res.f <<= 1;
+      res.e--;
+    }
+    res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
+    res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
+    return res;
+#endif
+  }
+
+  void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
+    DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
+    DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2)
+                                   : DiyFp((f << 1) - 1, e - 1);
+    mi.f <<= mi.e - pl.e;
+    mi.e = pl.e;
+    *plus = pl;
+    *minus = mi;
+  }
+
+  static const int kDiySignificandSize = 64;
+  static const int kDpSignificandSize = 52;
+  static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
+  static const int kDpMinExponent = -kDpExponentBias;
+  static const uint64_t kDpExponentMask = UINT64_C2(0x7FF00000, 0x00000000);
+  static const uint64_t kDpSignificandMask = UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
+  static const uint64_t kDpHiddenBit = UINT64_C2(0x00100000, 0x00000000);
+
+  uint64_t f;
+  int e;
+};
+
+inline DiyFp GetCachedPower(int e, int* K) {
+  // 10^-348, 10^-340, ..., 10^340
+  static const uint64_t kCachedPowers_F[] = {
+      UINT64_C2(0xfa8fd5a0, 0x081c0288), UINT64_C2(0xbaaee17f, 0xa23ebf76),
+      UINT64_C2(0x8b16fb20, 0x3055ac76), UINT64_C2(0xcf42894a, 0x5dce35ea),
+      UINT64_C2(0x9a6bb0aa, 0x55653b2d), UINT64_C2(0xe61acf03, 0x3d1a45df),
+      UINT64_C2(0xab70fe17, 0xc79ac6ca), UINT64_C2(0xff77b1fc, 0xbebcdc4f),
+      UINT64_C2(0xbe5691ef, 0x416bd60c), UINT64_C2(0x8dd01fad, 0x907ffc3c),
+      UINT64_C2(0xd3515c28, 0x31559a83), UINT64_C2(0x9d71ac8f, 0xada6c9b5),
+      UINT64_C2(0xea9c2277, 0x23ee8bcb), UINT64_C2(0xaecc4991, 0x4078536d),
+      UINT64_C2(0x823c1279, 0x5db6ce57), UINT64_C2(0xc2109436, 0x4dfb5637),
+      UINT64_C2(0x9096ea6f, 0x3848984f), UINT64_C2(0xd77485cb, 0x25823ac7),
+      UINT64_C2(0xa086cfcd, 0x97bf97f4), UINT64_C2(0xef340a98, 0x172aace5),
+      UINT64_C2(0xb23867fb, 0x2a35b28e), UINT64_C2(0x84c8d4df, 0xd2c63f3b),
+      UINT64_C2(0xc5dd4427, 0x1ad3cdba), UINT64_C2(0x936b9fce, 0xbb25c996),
+      UINT64_C2(0xdbac6c24, 0x7d62a584), UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
+      UINT64_C2(0xf3e2f893, 0xdec3f126), UINT64_C2(0xb5b5ada8, 0xaaff80b8),
+      UINT64_C2(0x87625f05, 0x6c7c4a8b), UINT64_C2(0xc9bcff60, 0x34c13053),
+      UINT64_C2(0x964e858c, 0x91ba2655), UINT64_C2(0xdff97724, 0x70297ebd),
+      UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), UINT64_C2(0xf8a95fcf, 0x88747d94),
+      UINT64_C2(0xb9447093, 0x8fa89bcf), UINT64_C2(0x8a08f0f8, 0xbf0f156b),
+      UINT64_C2(0xcdb02555, 0x653131b6), UINT64_C2(0x993fe2c6, 0xd07b7fac),
+      UINT64_C2(0xe45c10c4, 0x2a2b3b06), UINT64_C2(0xaa242499, 0x697392d3),
+      UINT64_C2(0xfd87b5f2, 0x8300ca0e), UINT64_C2(0xbce50864, 0x92111aeb),
+      UINT64_C2(0x8cbccc09, 0x6f5088cc), UINT64_C2(0xd1b71758, 0xe219652c),
+      UINT64_C2(0x9c400000, 0x00000000), UINT64_C2(0xe8d4a510, 0x00000000),
+      UINT64_C2(0xad78ebc5, 0xac620000), UINT64_C2(0x813f3978, 0xf8940984),
+      UINT64_C2(0xc097ce7b, 0xc90715b3), UINT64_C2(0x8f7e32ce, 0x7bea5c70),
+      UINT64_C2(0xd5d238a4, 0xabe98068), UINT64_C2(0x9f4f2726, 0x179a2245),
+      UINT64_C2(0xed63a231, 0xd4c4fb27), UINT64_C2(0xb0de6538, 0x8cc8ada8),
+      UINT64_C2(0x83c7088e, 0x1aab65db), UINT64_C2(0xc45d1df9, 0x42711d9a),
+      UINT64_C2(0x924d692c, 0xa61be758), UINT64_C2(0xda01ee64, 0x1a708dea),
+      UINT64_C2(0xa26da399, 0x9aef774a), UINT64_C2(0xf209787b, 0xb47d6b85),
+      UINT64_C2(0xb454e4a1, 0x79dd1877), UINT64_C2(0x865b8692, 0x5b9bc5c2),
+      UINT64_C2(0xc83553c5, 0xc8965d3d), UINT64_C2(0x952ab45c, 0xfa97a0b3),
+      UINT64_C2(0xde469fbd, 0x99a05fe3), UINT64_C2(0xa59bc234, 0xdb398c25),
+      UINT64_C2(0xf6c69a72, 0xa3989f5c), UINT64_C2(0xb7dcbf53, 0x54e9bece),
+      UINT64_C2(0x88fcf317, 0xf22241e2), UINT64_C2(0xcc20ce9b, 0xd35c78a5),
+      UINT64_C2(0x98165af3, 0x7b2153df), UINT64_C2(0xe2a0b5dc, 0x971f303a),
+      UINT64_C2(0xa8d9d153, 0x5ce3b396), UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
+      UINT64_C2(0xbb764c4c, 0xa7a44410), UINT64_C2(0x8bab8eef, 0xb6409c1a),
+      UINT64_C2(0xd01fef10, 0xa657842c), UINT64_C2(0x9b10a4e5, 0xe9913129),
+      UINT64_C2(0xe7109bfb, 0xa19c0c9d), UINT64_C2(0xac2820d9, 0x623bf429),
+      UINT64_C2(0x80444b5e, 0x7aa7cf85), UINT64_C2(0xbf21e440, 0x03acdd2d),
+      UINT64_C2(0x8e679c2f, 0x5e44ff8f), UINT64_C2(0xd433179d, 0x9c8cb841),
+      UINT64_C2(0x9e19db92, 0xb4e31ba9), UINT64_C2(0xeb96bf6e, 0xbadf77d9),
+      UINT64_C2(0xaf87023b, 0x9bf0ee6b)};
+  static const int16_t kCachedPowers_E[] = {
+      -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954,
+      -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,  -688, -661,
+      -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,  -422,  -396, -369,
+      -343,  -316,  -289,  -263,  -236,  -210,  -183,  -157,  -130,  -103, -77,
+      -50,   -24,   3,     30,    56,    83,    109,   136,   162,   189,  216,
+      242,   269,   295,   322,   348,   375,   402,   428,   455,   481,  508,
+      534,   561,   588,   614,   641,   667,   694,   720,   747,   774,  800,
+      827,   853,   880,   907,   933,   960,   986,   1013,  1039,  1066};
+
+  // int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
+  double dk = (-61 - e) * 0.30102999566398114 +
+              347;  // dk must be positive, so can do ceiling in positive
+  int k = static_cast<int>(dk);
+  if (dk - k > 0.0) k++;
+
+  unsigned index = static_cast<unsigned>((k >> 3) + 1);
+  *K = -(-348 + static_cast<int>(
+                    index << 3));  // decimal exponent no need lookup table
+
+  assert(index < sizeof(kCachedPowers_F) / sizeof(kCachedPowers_F[0]));
+  return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
+}
+
+inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest,
+                       uint64_t ten_kappa, uint64_t wp_w) {
+  while (rest < wp_w && delta - rest >= ten_kappa &&
+         (rest + ten_kappa < wp_w ||  /// closer
+          wp_w - rest > rest + ten_kappa - wp_w)) {
+    buffer[len - 1]--;
+    rest += ten_kappa;
+  }
+}
+
+inline unsigned CountDecimalDigit32(uint32_t n) {
+  // Simple pure C++ implementation was faster than __builtin_clz version in
+  // this situation.
+  if (n < 10) return 1;
+  if (n < 100) return 2;
+  if (n < 1000) return 3;
+  if (n < 10000) return 4;
+  if (n < 100000) return 5;
+  if (n < 1000000) return 6;
+  if (n < 10000000) return 7;
+  if (n < 100000000) return 8;
+  if (n < 1000000000) return 9;
+  return 10;
+}
+
+inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta,
+                     char* buffer, int* len, int* K) {
+  static const uint64_t kPow10[] = {1,
+                                    10,
+                                    100,
+                                    1000,
+                                    10000,
+                                    100000,
+                                    1000000,
+                                    10000000,
+                                    100000000,
+                                    1000000000,
+                                    10000000000,
+                                    100000000000,
+                                    1000000000000,
+                                    10000000000000,
+                                    100000000000000};
+  const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
+  const DiyFp wp_w = Mp - W;
+  uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
+  uint64_t p2 = Mp.f & (one.f - 1);
+  int kappa = static_cast<int>(CountDecimalDigit32(p1));
+  *len = 0;
+
+  while (kappa > 0) {
+    uint32_t d;
+    switch (kappa) {
+      case 10:
+        d = p1 / 1000000000;
+        p1 %= 1000000000;
+        break;
+      case 9:
+        d = p1 / 100000000;
+        p1 %= 100000000;
+        break;
+      case 8:
+        d = p1 / 10000000;
+        p1 %= 10000000;
+        break;
+      case 7:
+        d = p1 / 1000000;
+        p1 %= 1000000;
+        break;
+      case 6:
+        d = p1 / 100000;
+        p1 %= 100000;
+        break;
+      case 5:
+        d = p1 / 10000;
+        p1 %= 10000;
+        break;
+      case 4:
+        d = p1 / 1000;
+        p1 %= 1000;
+        break;
+      case 3:
+        d = p1 / 100;
+        p1 %= 100;
+        break;
+      case 2:
+        d = p1 / 10;
+        p1 %= 10;
+        break;
+      case 1:
+        d = p1;
+        p1 = 0;
+        break;
+      default:
+#if defined(_MSC_VER)
+        __assume(0);
+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+        __builtin_unreachable();
+#else
+        d = 0;
+#endif
+    }
+    if (d || *len) buffer[(*len)++] = '0' + static_cast<char>(d);
+    kappa--;
+    uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
+    if (tmp <= delta) {
+      *K += kappa;
+      GrisuRound(buffer, *len, delta, tmp,
+                 static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
+      return;
+    }
+  }
+
+  // kappa = 0
+  for (;;) {
+    p2 *= 10;
+    delta *= 10;
+    char d = static_cast<char>(p2 >> -one.e);
+    if (d || *len) buffer[(*len)++] = '0' + d;
+    p2 &= one.f - 1;
+    kappa--;
+    if (p2 < delta) {
+      *K += kappa;
+      GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * kPow10[-kappa]);
+      return;
+    }
+  }
+}
+
+inline void Grisu2(double value, char* buffer, int* length, int* K) {
+  const DiyFp v(value);
+  DiyFp w_m, w_p;
+  v.NormalizedBoundaries(&w_m, &w_p);
+
+  const DiyFp c_mk = GetCachedPower(w_p.e, K);
+  const DiyFp W = v.Normalize() * c_mk;
+  DiyFp Wp = w_p * c_mk;
+  DiyFp Wm = w_m * c_mk;
+  Wm.f++;
+  Wp.f--;
+  DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
+}
+
+inline const char* GetDigitsLut() {
+  static const char cDigitsLut[200] = {
+      '0', '0', '0', '1', '0', '2', '0', '3', '0', '4', '0', '5', '0', '6', '0',
+      '7', '0', '8', '0', '9', '1', '0', '1', '1', '1', '2', '1', '3', '1', '4',
+      '1', '5', '1', '6', '1', '7', '1', '8', '1', '9', '2', '0', '2', '1', '2',
+      '2', '2', '3', '2', '4', '2', '5', '2', '6', '2', '7', '2', '8', '2', '9',
+      '3', '0', '3', '1', '3', '2', '3', '3', '3', '4', '3', '5', '3', '6', '3',
+      '7', '3', '8', '3', '9', '4', '0', '4', '1', '4', '2', '4', '3', '4', '4',
+      '4', '5', '4', '6', '4', '7', '4', '8', '4', '9', '5', '0', '5', '1', '5',
+      '2', '5', '3', '5', '4', '5', '5', '5', '6', '5', '7', '5', '8', '5', '9',
+      '6', '0', '6', '1', '6', '2', '6', '3', '6', '4', '6', '5', '6', '6', '6',
+      '7', '6', '8', '6', '9', '7', '0', '7', '1', '7', '2', '7', '3', '7', '4',
+      '7', '5', '7', '6', '7', '7', '7', '8', '7', '9', '8', '0', '8', '1', '8',
+      '2', '8', '3', '8', '4', '8', '5', '8', '6', '8', '7', '8', '8', '8', '9',
+      '9', '0', '9', '1', '9', '2', '9', '3', '9', '4', '9', '5', '9', '6', '9',
+      '7', '9', '8', '9', '9'};
+  return cDigitsLut;
+}
+
+inline void WriteExponent(int K, char* buffer) {
+  if (K < 0) {
+    *buffer++ = '-';
+    K = -K;
+  }
+
+  if (K >= 100) {
+    *buffer++ = '0' + static_cast<char>(K / 100);
+    K %= 100;
+    const char* d = GetDigitsLut() + K * 2;
+    *buffer++ = d[0];
+    *buffer++ = d[1];
+  } else if (K >= 10) {
+    const char* d = GetDigitsLut() + K * 2;
+    *buffer++ = d[0];
+    *buffer++ = d[1];
+  } else
+    *buffer++ = '0' + static_cast<char>(K);
+
+  *buffer = '\0';
+}
+
+inline void Prettify(char* buffer, int length, int k) {
+  const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
+
+  if (length <= kk && kk <= 21) {
+    // 1234e7 -> 12340000000
+    for (int i = length; i < kk; i++) buffer[i] = '0';
+    buffer[kk] = '.';
+    buffer[kk + 1] = '0';
+    buffer[kk + 2] = '\0';
+  } else if (0 < kk && kk <= 21) {
+    // 1234e-2 -> 12.34
+    memmove(&buffer[kk + 1], &buffer[kk], length - kk);
+    buffer[kk] = '.';
+    buffer[length + 1] = '\0';
+  } else if (-6 < kk && kk <= 0) {
+    // 1234e-6 -> 0.001234
+    const int offset = 2 - kk;
+    memmove(&buffer[offset], &buffer[0], length);
+    buffer[0] = '0';
+    buffer[1] = '.';
+    for (int i = 2; i < offset; i++) buffer[i] = '0';
+    buffer[length + offset] = '\0';
+  } else if (length == 1) {
+    // 1e30
+    buffer[1] = 'e';
+    WriteExponent(kk - 1, &buffer[2]);
+  } else {
+    // 1234e30 -> 1.234e33
+    memmove(&buffer[2], &buffer[1], length - 1);
+    buffer[1] = '.';
+    buffer[length + 1] = 'e';
+    WriteExponent(kk - 1, &buffer[0 + length + 2]);
+  }
+}
+
+inline void dtoa_milo(double value, char* buffer) {
+  // Not handling NaN and inf
+  assert(!std::isnan(value));
+  assert(!std::isinf(value));
+
+  if (value == 0) {
+    buffer[0] = '0';
+    buffer[1] = '.';
+    buffer[2] = '0';
+    buffer[3] = '\0';
+  } else {
+    if (value < 0) {
+      *buffer++ = '-';
+      value = -value;
+    }
+    int length, K;
+    Grisu2(value, buffer, &length, &K);
+    Prettify(buffer, length, K);
+  }
+}
+}  // namespace util
diff --git a/src/util/Misc.h b/src/util/Misc.h
index 6bac94b..feb3207 100644
--- a/src/util/Misc.h
+++ b/src/util/Misc.h
@@ -9,18 +9,81 @@
 #include <cstring>
 #include <chrono>
 #include <sstream>
+#include <immintrin.h>
+#include <iostream>
+#include <vector>
 #include <unistd.h>
 #include <sys/types.h>
 #include <pwd.h>
+#include <map>
+#include <thread>
+#include "3rdparty/dtoa_milo.h"
 
 #define UNUSED(expr) do { (void)(expr); } while (0)
 #define TIME() std::chrono::high_resolution_clock::now()
-#define TOOK(t1, t2) (std::chrono::duration_cast<microseconds>(t2 - t1).count() / 1000.0)
+#define TOOK(t1, t2) (std::chrono::duration_cast<std::chrono::microseconds>(t2 - t1).count() / 1000.0)
 #define T_START(n)  auto _tstart_##n = std::chrono::high_resolution_clock::now()
-#define T_STOP(n) (std::chrono::duration_cast<microseconds>(std::chrono::high_resolution_clock::now() - _tstart_##n).count() / 1000.0)
+#define T_STOP(n) (std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - _tstart_##n).count() / 1000.0)
+
+#define _TEST3(s, o, e) if (!(s o e)) {  std::cerr << "\n" << __FILE__ << ":" << __LINE__ << ": Test failed!\n  Expected " << #s << " " << #o " " << (e) << ", got " << (s) << std::endl;  exit(1);}
+#define _TEST2(s, e) _TEST3(s, ==, o)
+#define _TEST1(s) _TEST3(static_cast<bool>(s), ==, true)
+
+#define _GET_TEST_MACRO(_1,_2,_3,NAME,...) NAME
+#define TEST(...) _GET_TEST_MACRO(__VA_ARGS__, _TEST3, _TEST2, _TEST1, UNUSED)(__VA_ARGS__)
+
+#define TODO(msg) std::cerr << "\n" __FILE__ << ":" << __LINE__ << ": TODO: " << #msg << std::endl;
+
+#if defined(_WIN32)
+#include <windows.h>
+#include <psapi.h>
+#elif defined(__unix__) || defined(__unix) || defined(unix) || (defined(__APPLE__) && defined(__MACH__))
+#include <unistd.h>
+#include <sys/resource.h>
+#if defined(__APPLE__) && defined(__MACH__)
+#include <mach/mach.h>
+#elif (defined(_AIX) || defined(__TOS__AIX__)) || (defined(__sun__) || defined(__sun) || defined(sun) && (defined(__SVR4) || defined(__svr4__)))
+#include <fcntl.h>
+#include <procfs.h>
+#elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__gnu_linux__)
+#include <stdio.h>
+#endif
+#else
+#error "Cannot define getPeakRSS( ) or getCurrentRSS( ) for an unknown OS."
+#endif
 
 namespace util {
 
+struct hashPair {
+  template <class T1, class T2>
+  size_t operator()(const std::pair<T1, T2>& p) const {
+    auto h1 = std::hash<T1>{}(p.first);
+    auto h2 = std::hash<T2>{}(p.second);
+    return h1 ^  h2;
+  }
+};
+
+template<typename Key, typename Val, Val Def>
+class SparseMatrix {
+ public:
+  Val get(const Key& x, const Key& y) const {
+    auto a = _m.find(std::pair<Key, Key>(x, y));
+    if (a == _m.end()) return Def;
+    return a->second;
+  }
+
+  void set(Key x, Key y, Val v) {
+    _m[std::pair<Key, Key>(x, y)] = v;
+  }
+
+	const std::map<std::pair<Key, Key>, Val>& vals() const {
+    return _m;
+  }
+
+ private:
+	std::map<std::pair<Key, Key>, Val> _m;
+};
+
 // cached first 10 powers of 10
 static int pow10[10] = {
     1,           10,          100,           1000,          10000,
@@ -28,7 +91,7 @@ static int pow10[10] = {
 
 // _____________________________________________________________________________
 inline uint64_t factorial(uint64_t n) {
-  if (n == 1) return n;
+  if (n < 2) return 1;
   return n * factorial(n - 1);
 }
 
@@ -89,6 +152,82 @@ inline double atof(const char* p, uint8_t mn) {
 // _____________________________________________________________________________
 inline double atof(const char* p) { return atof(p, 38); }
 
+// _____________________________________________________________________________
+template <typename V>
+int merge(V* lst, V* tmpLst, size_t l, size_t m, size_t r) {
+  size_t ret = 0;
+
+  size_t lp = l;
+  size_t rp = m;
+  size_t outp = l;
+
+  while (lp < m && rp < r + 1) {
+    if (lst[lp] <= lst[rp]) {
+      // if left element is smaller or equal, add it to return list,
+      // increase left pointer
+      tmpLst[outp] = lst[lp];
+      lp++;
+    } else {
+      // if left element is bigger, add the right element, add it to ret,
+      // increase right pointer
+      tmpLst[outp] = lst[rp];
+      rp++;
+
+      // if the left element was bigger, everything to the right in the
+      // left list is also bigger, and all these m - i elements were
+      // initially in the wrong order! Count these inversions.
+      ret += m - lp;
+    }
+
+    outp++;
+  }
+
+  // fill in remaining values
+  if (lp < m) std::memcpy(tmpLst + outp, lst + lp, (m - lp) * sizeof(V));
+  if (rp <= r) std::memcpy(tmpLst + outp, lst + rp, ((r + 1) - rp) * sizeof(V));
+
+  // copy to output
+  std::memcpy(lst + l, tmpLst + l, ((r + 1) - l) * sizeof(V));
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename V>
+size_t mergeInvCount(V* lst, V* tmpLst, size_t l, size_t r) {
+  size_t ret = 0;
+  if (l < r) {
+    size_t m = (r + l) / 2;
+
+    ret += mergeInvCount(lst, tmpLst, l, m);
+    ret += mergeInvCount(lst, tmpLst, m + 1, r);
+
+    ret += merge(lst, tmpLst, l, m + 1, r);
+  }
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename V>
+size_t inversions(const std::vector<V>& v) {
+  if (v.size() < 2) return 0;  // no inversions possible
+
+  // unroll some simple cases
+  if (v.size() == 2) return v[1] < v[0];
+  if (v.size() == 3) return (v[0] > v[1]) + (v[0] > v[2]) + (v[1] > v[2]);
+
+  auto tmpLst = new V[v.size()];
+  auto lst = new V[v.size()];
+
+  for (size_t i = 0; i < v.size(); i++) lst[i] = v[i];
+
+  size_t ret = mergeInvCount<V>(lst, tmpLst, 0, v.size() - 1);
+  delete[] tmpLst;
+  delete[] lst;
+  return ret;
+}
+
+
 // _____________________________________________________________________________
 inline std::string getHomeDir() {
   // parse implicit paths
@@ -115,6 +254,29 @@ inline std::string getHomeDir() {
   return ret;
 }
 
+// _____________________________________________________________________________
+inline char* readableSize(double size, char* buf) {
+  int i = 0;
+  const char* units[] = {"B", "kB", "MB", "GB", "TB", "PB"};
+  while (size > 1024 && i < 5) {
+    size /= 1024;
+    i++;
+  }
+  sprintf(buf, "%.*f %s", i, size, units[i]);
+  return buf;
+}
+
+// _____________________________________________________________________________
+inline std::string readableSize(double size) {
+  char buffer[30];
+  return readableSize(size, buffer);
+}
+
+// _____________________________________________________________________________
+inline float f_rsqrt(float x) {
+  return _mm_cvtss_f32(_mm_rsqrt_ss(_mm_set_ss(x)));
+}
+
 // _____________________________________________________________________________
 inline std::string getTmpDir() {
   // first, check if an env variable is set
@@ -131,6 +293,150 @@ inline std::string getTmpDir() {
   return getHomeDir();
 }
 
+// _____________________________________________________________________________
+class approx {
+ public:
+  explicit approx(double magnitude)
+      : _epsilon{std::numeric_limits<float>::epsilon() * 100},
+        _magnitude{magnitude} {}
+
+  friend bool operator==(double lhs, approx const& rhs) {
+    return std::abs(lhs - rhs._magnitude) < rhs._epsilon;
+  }
+
+  friend bool operator==(approx const& lhs, double rhs) {
+    return operator==(rhs, lhs);
+  }
+
+  friend bool operator!=(double lhs, approx const& rhs) {
+    return !operator==(lhs, rhs);
+  }
+
+  friend bool operator!=(approx const& lhs, double rhs) {
+    return !operator==(rhs, lhs);
+  }
+
+  friend bool operator<=(double lhs, approx const& rhs) {
+    return lhs < rhs._magnitude || lhs == rhs;
+  }
+
+  friend bool operator<=(approx const& lhs, double rhs) {
+    return lhs._magnitude < rhs || lhs == rhs;
+  }
+
+  friend bool operator>=(double lhs, approx const& rhs) {
+    return lhs > rhs._magnitude || lhs == rhs;
+  }
+
+  friend bool operator>=(approx const& lhs, double rhs) {
+    return lhs._magnitude > rhs || lhs == rhs;
+  }
+
+  friend std::ostream& operator<< (std::ostream &out, const approx &a) {
+    out << "~" << a._magnitude;
+    return out;
+  }
+
+ private:
+  double _epsilon;
+  double _magnitude;
+};
+
+/*
+ * Author:  David Robert Nadeau
+ * Site:    http://NadeauSoftware.com/
+ * License: Creative Commons Attribution 3.0 Unported License
+ *          http://creativecommons.org/licenses/by/3.0/deed.en_US
+ */
+
+/**
+ * Returns the peak (maximum so far) resident set size (physical
+ * memory use) measured in bytes, or zero if the value cannot be
+ * determined on this OS.
+ */
+
+// _____________________________________________________________________________
+inline size_t getPeakRSS() {
+#if defined(_WIN32)
+  /* Windows -------------------------------------------------- */
+  PROCESS_MEMORY_COUNTERS info;
+  GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+  return (size_t)info.PeakWorkingSetSize;
+
+#elif (defined(_AIX) || defined(__TOS__AIX__)) || \
+    (defined(__sun__) || defined(__sun) ||        \
+     defined(sun) && (defined(__SVR4) || defined(__svr4__)))
+  /* AIX and Solaris ------------------------------------------ */
+  struct psinfo psinfo;
+  int fd = -1;
+  if ((fd = open("/proc/self/psinfo", O_RDONLY)) == -1)
+    return (size_t)0L; /* Can't open? */
+  if (read(fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
+    close(fd);
+    return (size_t)0L; /* Can't read? */
+  }
+  close(fd);
+  return (size_t)(psinfo.pr_rssize * 1024L);
+
+#elif defined(__unix__) || defined(__unix) || defined(unix) || \
+    (defined(__APPLE__) && defined(__MACH__))
+  /* BSD, Linux, and OSX -------------------------------------- */
+  struct rusage rusage;
+  getrusage(RUSAGE_SELF, &rusage);
+#if defined(__APPLE__) && defined(__MACH__)
+  return (size_t)rusage.ru_maxrss;
+#else
+  return (size_t)(rusage.ru_maxrss * 1024L);
+#endif
+
+#else
+  /* Unknown OS ----------------------------------------------- */
+  return (size_t)0L; /* Unsupported. */
+#endif
+}
+
+/*
+ * Returns the current resident set size (physical memory use) measured
+ * in bytes, or zero if the value cannot be determined on this OS.
+ */
+
+// _____________________________________________________________________________
+inline size_t getCurrentRSS() {
+#if defined(_WIN32)
+  /* Windows -------------------------------------------------- */
+  PROCESS_MEMORY_COUNTERS info;
+  GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
+  return (size_t)info.WorkingSetSize;
+
+#elif defined(__APPLE__) && defined(__MACH__)
+  /* OSX ------------------------------------------------------ */
+  struct mach_task_basic_info info;
+  mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
+  if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info,
+                &infoCount) != KERN_SUCCESS)
+    return (size_t)0L; /* Can't access? */
+  return (size_t)info.resident_size;
+
+#elif defined(__linux__) || defined(__linux) || defined(linux) || \
+    defined(__gnu_linux__)
+  /* Linux ---------------------------------------------------- */
+  long rss = 0L;
+  FILE* fp = NULL;
+  if ((fp = fopen("/proc/self/statm", "r")) == NULL)
+    return (size_t)0L; /* Can't open? */
+  if (fscanf(fp, "%*s%ld", &rss) != 1) {
+    fclose(fp);
+    return (size_t)0L; /* Can't read? */
+  }
+  fclose(fp);
+  return (size_t)rss * (size_t)sysconf(_SC_PAGESIZE);
+
+#else
+  /* AIX, BSD, Solaris, and Unknown OS ------------------------ */
+  return (size_t)0L; /* Unsupported. */
+#endif
+}
+
 }  // namespace util
 
 #endif  // UTIL_MISC_H_
diff --git a/src/util/PriorityQueue.h b/src/util/PriorityQueue.h
new file mode 100644
index 0000000..13bd973
--- /dev/null
+++ b/src/util/PriorityQueue.h
@@ -0,0 +1,39 @@
+// Copyright 2019, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef UTIL_PRIORITYQUEUE_H_
+#define UTIL_PRIORITYQUEUE_H_
+
+#include<iomanip>
+#include<queue>
+#include<iostream>
+
+namespace util {
+template <typename K, typename V>
+class PriorityQueue {
+  struct _ByFirst {
+    bool operator()(const std::pair<K, V>& a, const std::pair<K, V>& b) {
+      return a.first > b.first;
+    }
+  };
+
+
+ public:
+  PriorityQueue() : _last(std::numeric_limits<K>::lowest()) {}
+  void push(K k, const V& v);
+  const K topKey() ;
+  const V& topVal() ;
+  void pop();
+
+  bool empty() const;
+
+ private:
+  K _last;
+  std::priority_queue<std::pair<K, V>, std::vector<std::pair<K, V>>, _ByFirst>
+      _pq;
+};
+#include "util/PriorityQueue.tpp"
+}  // namespace util
+
+#endif
diff --git a/src/util/PriorityQueue.tpp b/src/util/PriorityQueue.tpp
new file mode 100644
index 0000000..a46adbb
--- /dev/null
+++ b/src/util/PriorityQueue.tpp
@@ -0,0 +1,41 @@
+// Copyright 2019, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+// _____________________________________________________________________________
+template <typename K, typename V>
+void PriorityQueue<K, V>::push(K key, const V& val) {
+  // if (_last - key > 0) key = _last; 
+  if (key < _last) {
+    std::cout << std::setprecision(10) << _last << " vs " << key << std::endl;
+    key = _last;
+  }
+  // assert(key >= _last);
+  _pq.emplace(std::pair<K, V>(key, val));
+}
+
+// _____________________________________________________________________________
+template <typename K, typename V>
+const K PriorityQueue<K, V>::topKey() {
+  _last = _pq.top().first;
+  return _pq.top().first;
+}
+
+// _____________________________________________________________________________
+template <typename K, typename V>
+const V& PriorityQueue<K, V>::topVal() {
+  _last = _pq.top().first;
+  return _pq.top().second;
+}
+
+// _____________________________________________________________________________
+template <typename K, typename V>
+bool PriorityQueue<K, V>::empty() const {
+  return _pq.empty();
+}
+
+// _____________________________________________________________________________
+template <typename K, typename V>
+void PriorityQueue<K, V>::pop() {
+  _pq.pop();
+}
diff --git a/src/util/String.h b/src/util/String.h
index 536b713..379785f 100644
--- a/src/util/String.h
+++ b/src/util/String.h
@@ -6,11 +6,17 @@
 #define UTIL_STRING_H_
 
 #include <algorithm>
+#include <cassert>
+#include <codecvt>
 #include <cstring>
+#include <exception>
 #include <iomanip>
+#include <iostream>
+#include <locale>
 #include <sstream>
 #include <string>
 #include <vector>
+#include <set>
 
 namespace util {
 
@@ -169,7 +175,8 @@ inline size_t editDist(const std::string& s1, const std::string& s2) {
 }
 
 // _____________________________________________________________________________
-inline size_t prefixEditDist(const std::string& prefix, const std::string& s,
+template <class String>
+inline size_t prefixEditDist(const String& prefix, const String& s,
                              size_t deltaMax) {
   // https://en.wikibooks.org/wiki/Algorithm_Implementation/Strings/Levenshtein_distance#C++
   size_t len1 = prefix.size();
@@ -200,10 +207,45 @@ inline size_t prefixEditDist(const std::string& prefix, const std::string& s,
 }
 
 // _____________________________________________________________________________
-inline size_t prefixEditDist(const std::string& prefix, const std::string& s) {
+template <class String>
+inline size_t prefixEditDist(const String& prefix, const String& s) {
   return prefixEditDist(prefix, s, s.size());
 }
 
+// _____________________________________________________________________________
+inline size_t prefixEditDist(const char* prefix, const char* s) {
+  return prefixEditDist<std::string>(std::string(prefix), std::string(s));
+}
+
+// _____________________________________________________________________________
+inline size_t prefixEditDist(const char* prefix, const char* s,
+                             size_t deltaMax) {
+  return prefixEditDist<std::string>(std::string(prefix), std::string(s),
+                                     deltaMax);
+}
+
+// _____________________________________________________________________________
+inline size_t prefixEditDist(const char* prefix, const std::string& s) {
+  return prefixEditDist<std::string>(std::string(prefix), s);
+}
+
+// _____________________________________________________________________________
+inline size_t prefixEditDist(const char* prefix, const std::string& s,
+                             size_t deltaMax) {
+  return prefixEditDist<std::string>(std::string(prefix), s, deltaMax);
+}
+
+// _____________________________________________________________________________
+inline size_t prefixEditDist(const std::string& prefix, const char* s) {
+  return prefixEditDist<std::string>(prefix, std::string(s));
+}
+
+// _____________________________________________________________________________
+inline size_t prefixEditDist(const std::string& prefix, const char* s,
+                             size_t deltaMax) {
+  return prefixEditDist<std::string>(prefix, std::string(s), deltaMax);
+}
+
 // _____________________________________________________________________________
 inline std::string toUpper(std::string str) {
   std::transform(str.begin(), str.end(), str.begin(), toupper);
@@ -251,10 +293,66 @@ inline std::string normalizeWhiteSpace(const std::string& input) {
 }
 
 // _____________________________________________________________________________
-template <typename T>
+inline std::wstring toWStr(const std::string& str) {
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+  return converter.from_bytes(str);
+}
+
+// _____________________________________________________________________________
+inline std::string toNStr(const std::wstring& wstr) {
+  std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+  return converter.to_bytes(wstr);
+}
+
+// _____________________________________________________________________________
+inline std::vector<std::string> tokenize(const std::string& str) {
+  std::vector<std::string> ret;
+  std::wstring wStr = toWStr(str);
+
+  std::wstring cur;
+  for (size_t i = 0; i < wStr.size(); ++i) {
+    if (!std::iswalnum(wStr[i])) {
+      if (cur.size()) ret.push_back(toNStr(cur));
+      cur = L"";
+      continue;
+    }
+    cur += wStr[i];
+  }
+  if (cur.size()) ret.push_back(toNStr(cur));
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+inline double jaccardSimi(const std::string& a,
+                                            const std::string& b) {
+  std::set<std::string> sa, sb;
+
+  auto toksA = tokenize(a);
+  auto toksB = tokenize(b);
+
+  // 0 if both are empty
+  if (toksA.size() == 0 && toksB.size() == 0) return 0;
+
+  sa.insert(toksA.begin(), toksA.end());
+  sb.insert(toksB.begin(), toksB.end());
+
+  std::set<std::string> isect;
+
+  std::set_intersection(sa.begin(), sa.end(), sb.begin(), sb.end(),
+                        std::inserter(isect, isect.begin()));
+
+  double sInter = isect.size();
+  double s1 = sa.size();
+  double s2 = sb.size();
+  return sInter / (s1 + s2 - sInter);
+}
+
+// _____________________________________________________________________________
+template <class T>
 inline std::string implode(const std::vector<T>& vec, const char* del) {
   return implode(vec.begin(), vec.end(), del);
 }
-}
+}  // namespace util
 
 #endif  // UTIL_STRING_H_
diff --git a/src/util/geo/BezierCurve.tpp b/src/util/geo/BezierCurve.tpp
index fb7e6ca..4f08a31 100644
--- a/src/util/geo/BezierCurve.tpp
+++ b/src/util/geo/BezierCurve.tpp
@@ -64,7 +64,7 @@ const PolyLine<T>& BezierCurve<T>::render(double d) {
 }
 
 // _____________________________________________________________________________
-double CubicPolynom::valueAt(double atx) const {
+inline double CubicPolynom::valueAt(double atx) const {
   double dx = atx - x;
   return a + b * dx + c * dx * dx + d * dx * dx * dx;
 }
diff --git a/src/util/geo/CircularSegment.h b/src/util/geo/CircularSegment.h
new file mode 100644
index 0000000..b80e60d
--- /dev/null
+++ b/src/util/geo/CircularSegment.h
@@ -0,0 +1,41 @@
+// Copyright 2016, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef UTIL_GEO_CIRCULARSEGMENT_H_
+#define UTIL_GEO_CIRCULARSEGMENT_H_
+
+#include <vector>
+#include "util/geo/Geo.h"
+#include "util/geo/PolyLine.h"
+
+namespace util {
+namespace geo {
+
+/**
+ * Circular segment
+ */
+template <typename T>
+class CircularSegment {
+ public:
+  CircularSegment(const Point<T>& a, double ang, const Point<T>& c);
+
+  const PolyLine<T>& render(double d);
+
+ private:
+  // store the rendered polyline for quicker access
+  PolyLine<T> _rendered;
+
+  const Point<T>& _a, _c;
+  double _renderD;
+
+  double _ang, _rad, _s, _initAng;
+
+  Point<T> valueAt(double t) const;
+};
+
+#include "util/geo/CircularSegment.tpp"
+}
+}
+
+#endif  // UTIL_GEO_BEZIERCURVE_H_
diff --git a/src/util/geo/CircularSegment.tpp b/src/util/geo/CircularSegment.tpp
new file mode 100644
index 0000000..6058c68
--- /dev/null
+++ b/src/util/geo/CircularSegment.tpp
@@ -0,0 +1,51 @@
+// Copyright 2016, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+// _____________________________________________________________________________
+template <typename T>
+CircularSegment<T>::CircularSegment(const Point<T>& a, double ang,
+                            const Point<T>& c) : _a(a), _c(c), _renderD(0), _ang(ang)
+     {
+
+  _rad = dist(a, c);
+  _s = fabs(_ang * _rad);
+  _initAng = angBetween(c, a);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Point<T> CircularSegment<T>::valueAt(double ang) const {
+  double xPos = _c.getX() + _rad * cos(ang);
+  double yPos = _c.getY() + _rad * sin(ang);
+  return Point<T>(xPos, yPos);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+const PolyLine<T>& CircularSegment<T>::render(double d) {
+  assert(d > 0);
+  if (fabs(d - _renderD) < 0.001) return _rendered;
+  _renderD = d;
+
+  if (_s == 0) {
+    _rendered << _a << _a;
+    return _rendered;
+  }
+
+  _rendered.empty();
+  double n = _s / d, dt = 1 / n, t = 0;
+
+  bool cancel = false;
+  while (true) {
+    _rendered << valueAt(_initAng + t * _ang);
+    t += dt;
+    if (cancel) break;
+    if (t > 1) {
+      t = 1;
+      cancel = true;
+    }
+  }
+
+  return _rendered;
+}
diff --git a/src/util/geo/Geo.h b/src/util/geo/Geo.h
index ffbfada..c11557c 100644
--- a/src/util/geo/Geo.h
+++ b/src/util/geo/Geo.h
@@ -51,6 +51,11 @@ typedef Polygon<int> IPolygon;
 
 const static double EPSILON = 0.00001;
 const static double RAD = 0.017453292519943295;  // PI/180
+const static double IRAD = 180.0 / M_PI;         // 180 / PI
+const static double AVERAGING_STEP = 20;
+
+const static double M_PER_DEG = 111319.4;
+
 
 // _____________________________________________________________________________
 template <typename T>
@@ -203,6 +208,14 @@ inline Polygon<T> move(Polygon<T> geo, double x, double y) {
   return geo;
 }
 
+// _____________________________________________________________________________
+template <typename T>
+inline Box<T> move(Box<T> geo, double x, double y) {
+  geo.setLowerLeft(move(geo.getLowerLeft(), x, y));
+  geo.setUpperRight(move(geo.getUpperRight(), x, y));
+  return geo;
+}
+
 // _____________________________________________________________________________
 template <template <typename> class Geometry, typename T>
 inline std::vector<Geometry<T>> move(std::vector<Geometry<T>> multigeo,
@@ -356,8 +369,9 @@ inline bool contains(const Polygon<T>& polyC, const Polygon<T>& poly) {
   }
 
   // also check the last hop
-  if (!contains(LineSegment<T>(polyC.getOuter().back(), polyC.getOuter().front()),
-                poly))
+  if (!contains(
+          LineSegment<T>(polyC.getOuter().back(), polyC.getOuter().front()),
+          poly))
     return false;
 
   return true;
@@ -627,6 +641,34 @@ inline bool intersects(const Box<T>& b, const Point<T>& p) {
   return intersects(p, b);
 }
 
+// _____________________________________________________________________________
+template <template <typename> class GeometryA,
+          template <typename> class GeometryB, typename T>
+inline bool intersects(const std::vector<GeometryA<T>>& multigeom,
+                       const GeometryB<T>& b) {
+  for (const auto& geom : multigeom)
+    if (intersects(geom, b)) return true;
+  return false;
+}
+
+// _____________________________________________________________________________
+template <template <typename> class GeometryA,
+          template <typename> class GeometryB, typename T>
+inline bool intersects(const GeometryB<T>& b,
+                       const std::vector<GeometryA<T>>& multigeom) {
+  return intersects(multigeom, b);
+}
+
+// _____________________________________________________________________________
+template <template <typename> class GeometryA,
+          template <typename> class GeometryB, typename T>
+inline bool intersects(const std::vector<GeometryA<T>>& multigeomA,
+                       const std::vector<GeometryA<T>>& multigeomB) {
+  for (const auto& geom : multigeomA)
+    if (intersects(geom, multigeomB)) return true;
+  return false;
+}
+
 // _____________________________________________________________________________
 template <typename T>
 inline Point<T> intersection(T p1x, T p1y, T q1x, T q1y, T p2x, T p2y, T q2x,
@@ -777,6 +819,36 @@ inline double dist(const Line<T>& la, const Line<T>& lb) {
   return d;
 }
 
+// _____________________________________________________________________________
+template <template <typename> class GeometryA,
+          template <typename> class GeometryB, typename T>
+inline double dist(const std::vector<GeometryA<T>>& multigeom,
+                   const GeometryB<T>& b) {
+  double d = std::numeric_limits<double>::infinity();
+  for (const auto& geom : multigeom)
+    if (dist(geom, b) < d) d = dist(geom, b);
+  return d;
+}
+
+// _____________________________________________________________________________
+template <template <typename> class GeometryA,
+          template <typename> class GeometryB, typename T>
+inline double dist(const GeometryB<T>& b,
+                   const std::vector<GeometryA<T>>& multigeom) {
+  return dist(multigeom, b);
+}
+
+// _____________________________________________________________________________
+template <template <typename> class GeometryA,
+          template <typename> class GeometryB, typename T>
+inline double dist(const std::vector<GeometryA<T>>& multigeomA,
+                   const std::vector<GeometryB<T>>& multigeomB) {
+  double d = std::numeric_limits<double>::infinity();
+  for (const auto& geom : multigeomB)
+    if (dist(geom, multigeomA) < d) d = dist(geom, multigeomA);
+  return d;
+}
+
 // _____________________________________________________________________________
 inline double innerProd(double x1, double y1, double x2, double y2, double x3,
                         double y3) {
@@ -788,7 +860,7 @@ inline double innerProd(double x1, double y1, double x2, double y2, double x3,
   double m13 = sqrt(dx31 * dx31 + dy31 * dy31);
   double theta = acos(std::min((dx21 * dx31 + dy21 * dy31) / (m12 * m13), 1.0));
 
-  return theta * (180 / M_PI);
+  return theta * IRAD;
 }
 
 // _____________________________________________________________________________
@@ -1240,6 +1312,56 @@ inline Box<T> getBoundingBox(const std::vector<Geometry<T>>& multigeo) {
   return b;
 }
 
+// _____________________________________________________________________________
+template <typename T>
+inline Box<T> getBoundingRect(const Box<T>& b) {
+  auto box = Box<T>();
+  auto centroid = util::geo::centroid(b);
+  box = extendBox(b, box);
+  box = extendBox(rotate(convexHull(b), 180, centroid), box);
+  return box;
+}
+
+// _____________________________________________________________________________
+template <template <typename> class Geometry, typename T>
+inline Box<T> getBoundingRect(const Geometry<T> geom) {
+  return getBoundingRect<T>(getBoundingBox<T>(geom));
+}
+
+// _____________________________________________________________________________
+template <typename T>
+inline double getEnclosingRadius(const Point<T>& p, const Point<T>& pp) {
+  return dist(p, pp);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+inline double getEnclosingRadius(const Point<T>& p, const Line<T>& l) {
+  double ret = 0;
+  for (const auto& pp : l)
+    if (getEnclosingRadius(p, pp) > ret) ret = getEnclosingRadius(p, pp);
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename T>
+inline double getEnclosingRadius(const Point<T>& p, const Polygon<T>& pg) {
+  double ret = 0;
+  for (const auto& pp : pg.getOuter())
+    if (getEnclosingRadius(p, pp) > ret) ret = getEnclosingRadius(p, pp);
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <template <typename> class Geometry, typename T>
+inline double getEnclosingRadius(const Point<T>& p,
+                                 const std::vector<Geometry<T>>& multigeom) {
+  double ret = 0;
+  for (const auto& pp : multigeom)
+    if (getEnclosingRadius(p, pp) > ret) ret = getEnclosingRadius(p, pp);
+  return ret;
+}
+
 // _____________________________________________________________________________
 template <typename T>
 inline Polygon<T> convexHull(const Point<T>& p) {
@@ -1308,7 +1430,7 @@ inline Polygon<T> convexHull(const MultiPoint<T>& l) {
   convexHullImpl(l, 0, 1, &hull);
   hull.push_back(hull.front());
   convexHullImpl(l, hull.size() - 2, hull.size() - 1, &hull);
-	hull.pop_back();
+  hull.pop_back();
 
   return Polygon<T>(hull);
 }
@@ -1355,6 +1477,181 @@ inline Box<T> extendBox(const std::vector<Geometry<T>>& multigeom, Box<T> b) {
   return b;
 }
 
+// _____________________________________________________________________________
+template <typename T>
+Point<T> pointAt(const Line<T> l, double at) {
+  return pointAtDist(l, at * len(l));
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Point<T> pointAt(const Line<T> l, double at, size_t* lastI, double* totPos) {
+  return pointAtDist(l, at * len(l), lastI, totPos);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Point<T> pointAtDist(const Line<T> l, double atDist) {
+  return pointAtDist(l, atDist, 0, 0);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Point<T> pointAtDist(const Line<T> l, double atDist, size_t* lastI,
+                     double* totPos) {
+  if (l.size() == 1) {
+    if (lastI) *lastI = 0;
+    if (totPos) *totPos = 0;
+    return l[1];
+  }
+
+  if (atDist > geo::len(l)) atDist = geo::len(l);
+  if (atDist < 0) atDist = 0;
+
+  double dist = 0;
+
+  const Point<T>* last = &l[0];
+
+  for (size_t i = 1; i < l.size(); i++) {
+    const Point<T>& cur = l[i];
+    double d = geo::dist(*last, cur);
+    dist += d;
+
+    if (dist > atDist) {
+      double p = (d - (dist - atDist));
+      if (lastI) *lastI = i - 1;
+      if (totPos) *totPos = atDist / util::geo::len(l);
+      return interpolate(*last, cur, p / dist);
+    }
+
+    last = &l[i];
+  }
+
+  if (lastI) *lastI = l.size() - 1;
+  if (totPos) *totPos = 1;
+  return l.back();
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Point<T> interpolate(const Point<T>& a, const Point<T>& b, double d) {
+  double n1 = b.getX() - a.getX();
+  double n2 = b.getY() - a.getY();
+  return Point<T>(a.getX() + (n1 * d), a.getY() + (n2 * d));
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Line<T> orthoLineAtDist(const Line<T>& l, double d, double length) {
+  Point<T> avgP = pointAtDist(l, d);
+
+  double angle = angBetween(pointAtDist(l, d - 5), pointAtDist(l, d + 5));
+
+  double angleX1 = avgP.getX() + cos(angle + M_PI / 2) * length / 2;
+  double angleY1 = avgP.getY() + sin(angle + M_PI / 2) * length / 2;
+
+  double angleX2 = avgP.getX() + cos(angle + M_PI / 2) * -length / 2;
+  double angleY2 = avgP.getY() + sin(angle + M_PI / 2) * -length / 2;
+
+  return Line<T>{Point<T>(angleX1, angleY1), Point<T>(angleX2, angleY2)};
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Line<T> segment(const Line<T>& line, double a, double b) {
+  if (a > b) {
+    double c = a;
+    a = b;
+    b = c;
+  }
+  size_t startI, endI;
+  auto start = pointAt(line, a, &startI, 0);
+  auto end = pointAt(line, b, &endI, 0);
+
+  return segment(line, start, startI, end, endI);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Line<T> segment(const Line<T>& line, const Point<T>& start, size_t startI,
+                const Point<T>& end, size_t endI) {
+  Line<T> ret;
+  ret.push_back(start);
+
+  if (startI + 1 <= endI) {
+    ret.insert(ret.end(), line.begin() + startI + 1, line.begin() + endI + 1);
+  }
+  ret.push_back(end);
+
+  // find a more performant way to clear the result of above
+  ret = util::geo::simplify(ret, 0);
+
+  assert(ret.size());
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Line<T> average(const std::vector<const Line<T>*>& lines) {
+  return average(lines, std::vector<double>());
+}
+
+// _____________________________________________________________________________
+template <typename T>
+Line<T> average(const std::vector<const Line<T>*>& lines,
+                const std::vector<double>& weights) {
+  bool weighted = lines.size() == weights.size();
+  double stepSize;
+
+  double longestLength =
+      std::numeric_limits<double>::min();  // avoid recalc of length on each
+                                           // comparision
+  for (auto p : lines) {
+    if (len(*p) > longestLength) {
+      longestLength = len(*p);
+    }
+  }
+
+  Line<T> ret;
+  double total = 0;
+
+  for (size_t i = 0; i < lines.size(); ++i) {
+    if (weighted) {
+      total += weights[i];
+    } else {
+      total += 1;
+    }
+  }
+
+  stepSize = AVERAGING_STEP / longestLength;
+  bool end = false;
+  for (double a = 0; !end; a += stepSize) {
+    if (a > 1) {
+      a = 1;
+      end = true;
+    }
+    double x = 0, y = 0;
+
+    for (size_t i = 0; i < lines.size(); ++i) {
+      auto pl = lines[i];
+      Point<T> p = pointAt(*pl, a);
+      if (weighted) {
+        x += p.getX() * weights[i];
+        y += p.getY() * weights[i];
+      } else {
+        x += p.getX();
+        y += p.getY();
+      }
+    }
+    ret.push_back(Point<T>(x / total, y / total));
+  }
+
+  simplify(ret, 0);
+
+  return ret;
+}
+
 // _____________________________________________________________________________
 template <typename T>
 inline double area(const Point<T>& b) {
@@ -1510,28 +1807,30 @@ inline Line<T> densify(const Line<T>& l, double d) {
 // _____________________________________________________________________________
 template <typename T>
 inline double frechetDistC(size_t i, size_t j, const Line<T>& p,
-                           const Line<T>& q,
-                           std::vector<std::vector<double>>& ca) {
+                           const Line<T>& q, std::vector<float>& ca) {
   // based on Eiter / Mannila
   // http://www.kr.tuwien.ac.at/staff/eiter/et-archive/cdtr9464.pdf
 
-  if (ca[i][j] > -1)
-    return ca[i][j];
+  if (ca[i * q.size() + j] > -1)
+    return ca[i * q.size() + j];
   else if (i == 0 && j == 0)
-    ca[i][j] = dist(p[0], q[0]);
+    ca[i * q.size() + j] = dist(p[0], q[0]);
   else if (i > 0 && j == 0)
-    ca[i][j] = std::max(frechetDistC(i - 1, 0, p, q, ca), dist(p[i], q[0]));
+    ca[i * q.size() + j] =
+        std::max(frechetDistC(i - 1, 0, p, q, ca), dist(p[i], q[0]));
   else if (i == 0 && j > 0)
-    ca[i][j] = std::max(frechetDistC(0, j - 1, p, q, ca), dist(p[0], q[j]));
+    ca[i * q.size() + j] =
+        std::max(frechetDistC(0, j - 1, p, q, ca), dist(p[0], q[j]));
   else if (i > 0 && j > 0)
-    ca[i][j] = std::max(std::min(std::min(frechetDistC(i - 1, j, p, q, ca),
-                                          frechetDistC(i - 1, j - 1, p, q, ca)),
-                                 frechetDistC(i, j - 1, p, q, ca)),
-                        dist(p[i], q[j]));
+    ca[i * q.size() + j] =
+        std::max(std::min(std::min(frechetDistC(i - 1, j, p, q, ca),
+                                   frechetDistC(i - 1, j - 1, p, q, ca)),
+                          frechetDistC(i, j - 1, p, q, ca)),
+                 dist(p[i], q[j]));
   else
-    ca[i][j] = std::numeric_limits<double>::infinity();
+    ca[i * q.size() + j] = std::numeric_limits<float>::infinity();
 
-  return ca[i][j];
+  return ca[i * q.size() + j];
 }
 
 // _____________________________________________________________________________
@@ -1543,8 +1842,7 @@ inline double frechetDist(const Line<T>& a, const Line<T>& b, double d) {
   auto p = densify(a, d);
   auto q = densify(b, d);
 
-  std::vector<std::vector<double>> ca(p.size(),
-                                      std::vector<double>(q.size(), -1.0));
+  std::vector<float> ca(p.size() * q.size(), -1.0);
   double fd = frechetDistC(p.size() - 1, q.size() - 1, p, q, ca);
 
   return fd;
@@ -1556,24 +1854,28 @@ inline double accFrechetDistC(const Line<T>& a, const Line<T>& b, double d) {
   auto p = densify(a, d);
   auto q = densify(b, d);
 
-  std::vector<std::vector<double>> ca(p.size(),
-                                      std::vector<double>(q.size(), 0));
+  assert(p.size());
+  assert(q.size());
+
+  std::vector<float> ca(p.size() * q.size(), 0);
 
   for (size_t i = 0; i < p.size(); i++)
-    ca[i][0] = std::numeric_limits<double>::infinity();
+    ca[i * q.size() + 0] = std::numeric_limits<float>::infinity();
   for (size_t j = 0; j < q.size(); j++)
-    ca[0][j] = std::numeric_limits<double>::infinity();
-  ca[0][0] = 0;
+    ca[j] = std::numeric_limits<float>::infinity();
+  ca[0] = 0;
 
   for (size_t i = 1; i < p.size(); i++) {
     for (size_t j = 1; j < q.size(); j++) {
-      double d = util::geo::dist(p[i], q[j]) * util::geo::dist(p[i], p[i - 1]);
-      ca[i][j] =
-          d + std::min(ca[i - 1][j], std::min(ca[i][j - 1], ca[i - 1][j - 1]));
+      float d = util::geo::dist(p[i], q[j]) * util::geo::dist(p[i], p[i - 1]);
+      ca[i * q.size() + j] =
+          d + std::min(ca[(i - 1) * q.size() + j],
+                       std::min(ca[i * q.size() + (j - 1)],
+                                ca[(i - 1) * q.size() + (j - 1)]));
     }
   }
 
-  return ca[p.size() - 1][q.size() - 1];
+  return ca[p.size() * q.size() - 1];
 }
 
 // _____________________________________________________________________________
@@ -1586,23 +1888,65 @@ inline Point<T> latLngToWebMerc(double lat, double lng) {
   return Point<T>(x, y);
 }
 
+// _____________________________________________________________________________
+template <typename T>
+//TODO: rename to lngLat
+inline Point<T> latLngToWebMerc(Point<T> lngLat) {
+  return latLngToWebMerc<T>(lngLat.getY(), lngLat.getX());
+}
+
 // _____________________________________________________________________________
 template <typename T>
 inline Point<T> webMercToLatLng(double x, double y) {
-  double lat =
-      (1.5707963267948966 - (2.0 * atan(exp(-y / 6378137.0)))) * (180.0 / M_PI);
-  double lon = x / 111319.4907932735677;
+  const double lat =
+      (1.5707963267948966 - (2.0 * atan(exp(-y / 6378137.0)))) * IRAD;
+  const double lon = x / 111319.4907932735677;
   return Point<T>(lon, lat);
 }
 
+// _____________________________________________________________________________
+template <typename T>
+inline double haversine(T lat1, T lon1, T lat2, T lon2) {
+  lat1 *= RAD;
+  lat2 *= RAD;
+
+  const double dLat = lat2 - lat1;
+  const double dLon = (lon2 - lon1) * RAD;
+
+  const double sDLat = sin(dLat / 2);
+  const double sDLon = sin(dLon / 2);
+
+  const double a = (sDLat * sDLat) + (sDLon * sDLon) * cos(lat1) * cos(lat2);
+  return 6378137.0 * 2.0 * asin(sqrt(a));
+}
+
+// _____________________________________________________________________________
+template <typename T>
+inline double haversine(const Point<T>& a, const Point<T>& b) {
+  return haversine(a.getY(), a.getX(), b.getY(), b.getX());
+}
+
+// _____________________________________________________________________________
+template <typename T>
+inline double webMercMeterDist(const Point<T>& a, const Point<T>& b) {
+  const auto llA = webMercToLatLng<T>(a.getX(), a.getY());
+  const auto llB = webMercToLatLng<T>(b.getX(), b.getY());
+  return haversine(llA.getY(), llA.getX(), llB.getY(), llB.getX());
+}
+
 // _____________________________________________________________________________
 template <typename G1, typename G2>
 inline double webMercMeterDist(const G1& a, const G2& b) {
   // euclidean distance on web mercator is in meters on equator,
   // and proportional to cos(lat) in both y directions
 
-  double latA = 2 * atan(exp(a.getY() / 6378137.0)) - 1.5707965;
-  double latB = 2 * atan(exp(b.getY() / 6378137.0)) - 1.5707965;
+  // this is just an approximation
+
+  auto pa = centroid(a);
+  auto pb = centroid(b);
+
+  double latA = 2 * atan(exp(pa.getY() / 6378137.0)) - 1.5707965;
+  double latB = 2 * atan(exp(pb.getY() / 6378137.0)) - 1.5707965;
 
   return util::geo::dist(a, b) * cos((latA + latB) / 2.0);
 }
@@ -1624,7 +1968,17 @@ inline double webMercDistFactor(const G& a) {
   double lat = 2 * atan(exp(a.getY() / 6378137.0)) - 1.5707965;
   return cos(lat);
 }
-}
+
+// _____________________________________________________________________________
+template <typename G>
+inline double latLngDistFactor(const G& a) {
+  // euclidean distance on web mercator is in meters on equator,
+  // and proportional to cos(lat) in both y directions
+
+  return cos(a.getY() * RAD);
 }
 
+}  // namespace geo
+}  // namespace util
+
 #endif  // UTIL_GEO_GEO_H_
diff --git a/src/util/geo/Grid.h b/src/util/geo/Grid.h
index ba11976..9cd8465 100644
--- a/src/util/geo/Grid.h
+++ b/src/util/geo/Grid.h
@@ -5,9 +5,9 @@
 #ifndef UTIL_GEO_GRID_H_
 #define UTIL_GEO_GRID_H_
 
+#include <map>
 #include <set>
 #include <vector>
-#include <map>
 #include "util/geo/Geo.h"
 
 namespace util {
@@ -21,6 +21,39 @@ class GridException : public std::runtime_error {
 template <typename V, template <typename> class G, typename T>
 class Grid {
  public:
+  Grid(const Grid<V, G, T>&) = delete;
+  Grid(Grid<V, G, T>&& o)
+      : _width(o._width),
+        _height(o._height),
+        _cellWidth(o._cellWidth),
+        _cellHeight(o._cellHeight),
+        _bb(o._bb),
+        _xWidth(o._xWidth),
+        _yHeight(o._yHeight),
+        _hasValIdx(o._hasValIdx),
+        _grid(o._grid),
+        _index(o._index),
+        _removed(o._removed) {
+    o._grid = 0;
+  }
+
+  Grid<V, G, T>& operator=(Grid<V, G, T>&& o) {
+    _width = o._width;
+    _height = o._height;
+    _cellWidth = o._cellWidth;
+    _cellHeight = o._cellHeight;
+    _bb = o._bb;
+    _xWidth = o._xWidth;
+    _yHeight = o._yHeight;
+    _hasValIdx = o._hasValIdx;
+    _grid = o._grid;
+    _index = std::move(o._index);
+    _removed = std::move(o._removed);
+    o._grid = 0;
+
+    return *this;
+  };
+
   // initialization of a point grid with cell width w and cell height h
   // that covers the area of bounding box bbox
   Grid(double w, double h, const Box<T>& bbox);
@@ -36,6 +69,14 @@ class Grid {
   // the empty grid
   Grid(bool buildValIdx);
 
+  ~Grid() {
+    if (!_grid) return;
+    for (size_t i = 0; i < _xWidth; i++) {
+      delete[] _grid[i];
+    }
+    delete[] _grid;
+  }
+
   // add object t to this grid
   void add(G<T> geom, V val);
   void add(size_t x, size_t y, V val);
@@ -55,6 +96,9 @@ class Grid {
   size_t getXWidth() const;
   size_t getYHeight() const;
 
+  size_t getCellXFromX(double lon) const;
+  size_t getCellYFromY(double lat) const;
+
  private:
   double _width;
   double _height;
@@ -64,21 +108,17 @@ class Grid {
 
   Box<T> _bb;
 
-  size_t _counter;
-
   size_t _xWidth;
   size_t _yHeight;
 
   bool _hasValIdx;
 
-  std::vector<std::vector<std::set<V> > > _grid;
+  // raw 2d array, less memory overhead
+  std::set<V>** _grid;
   std::map<V, std::set<std::pair<size_t, size_t> > > _index;
   std::set<V> _removed;
 
   Box<T> getBox(size_t x, size_t y) const;
-
-  size_t getCellXFromX(double lon) const;
-  size_t getCellYFromY(double lat) const;
 };
 
 #include "util/geo/Grid.tpp"
diff --git a/src/util/geo/Grid.tpp b/src/util/geo/Grid.tpp
index 9e01098..1901375 100644
--- a/src/util/geo/Grid.tpp
+++ b/src/util/geo/Grid.tpp
@@ -11,7 +11,8 @@ Grid<V, G, T>::Grid(bool bldIdx)
       _cellHeight(0),
       _xWidth(0),
       _yHeight(0),
-      _hasValIdx(bldIdx) {}
+      _hasValIdx(bldIdx),
+      _grid(0) {}
 
 // _____________________________________________________________________________
 template <typename V, template <typename> class G, typename T>
@@ -28,11 +29,10 @@ Grid<V, G, T>::Grid(double w, double h, const Box<T>& bbox, bool bValIdx)
     : _cellWidth(fabs(w)),
       _cellHeight(fabs(h)),
       _bb(bbox),
-      _hasValIdx(bValIdx) {
-  _width =
-      bbox.getUpperRight().getX() - bbox.getLowerLeft().getX();
-  _height =
-      bbox.getUpperRight().getY() - bbox.getLowerLeft().getY();
+      _hasValIdx(bValIdx),
+      _grid(0) {
+  _width = bbox.getUpperRight().getX() - bbox.getLowerLeft().getX();
+  _height = bbox.getUpperRight().getY() - bbox.getLowerLeft().getY();
 
   if (_width < 0 || _height < 0) {
     _width = 0;
@@ -46,11 +46,11 @@ Grid<V, G, T>::Grid(double w, double h, const Box<T>& bbox, bool bValIdx)
   _yHeight = ceil(_height / _cellHeight);
 
   // resize rows
-  _grid.resize(_xWidth);
+  _grid = new std::set<V>*[_xWidth];
 
   // resize columns
-  for (size_t i = 0; i < _xWidth; i++) {
-    _grid[i].resize(_yHeight);
+  for (size_t x = 0; x < _xWidth; x++) {
+    _grid[x] = new std::set<V>[_yHeight];
   }
 }
 
@@ -64,8 +64,8 @@ void Grid<V, G, T>::add(G<T> geom, V val) {
   size_t neX = getCellXFromX(box.getUpperRight().getX());
   size_t neY = getCellYFromY(box.getUpperRight().getY());
 
-  for (size_t x = swX; x <= neX && x < _grid.size(); x++) {
-    for (size_t y = swY; y <= neY && y < _grid[x].size(); y++) {
+  for (size_t x = swX; x <= neX && x < _xWidth; x++) {
+    for (size_t y = swY; y <= neY && y < _yHeight; y++) {
       if (intersects(geom, getBox(x, y))) {
         add(x, y, val);
       }
@@ -97,24 +97,23 @@ void Grid<V, G, T>::get(const Box<T>& box, std::set<V>* s) const {
 template <typename V, template <typename> class G, typename T>
 void Grid<V, G, T>::get(const G<T>& geom, double d, std::set<V>* s) const {
   Box<T> a = getBoundingBox(geom);
-  Box<T> b(Point<T>(a.getLowerLeft().getX() - d,
-                    a.getLowerLeft().getY() - d),
-           Point<T>(a.getUpperRight().getX() + d,
-                    a.getUpperRight().getY() + d));
+  Box<T> b(
+      Point<T>(a.getLowerLeft().getX() - d, a.getLowerLeft().getY() - d),
+      Point<T>(a.getUpperRight().getX() + d, a.getUpperRight().getY() + d));
   return get(b, s);
 }
 
 // _____________________________________________________________________________
 template <typename V, template <typename> class G, typename T>
 void Grid<V, G, T>::get(size_t x, size_t y, std::set<V>* s) const {
-  if (_hasValIdx) {
+  if (_hasValIdx || _removed.size() == 0) {
     s->insert(_grid[x][y].begin(), _grid[x][y].end());
   } else {
     // if we dont have a value index, we have a set of deleted nodes.
     // in this case, only insert if not deleted
-    std::copy_if(_grid[x][y].begin(), _grid[x][y].end(),
-                 std::inserter(*s, s->end()),
-                 [&](const V& v) { return Grid<V, G, T>::_removed.count(v) == 0; });
+    std::copy_if(
+        _grid[x][y].begin(), _grid[x][y].end(), std::inserter(*s, s->end()),
+        [&](const V& v) { return Grid<V, G, T>::_removed.count(v) == 0; });
   }
 }
 
diff --git a/src/util/geo/PolyLine.h b/src/util/geo/PolyLine.h
index f946d7d..78c7928 100644
--- a/src/util/geo/PolyLine.h
+++ b/src/util/geo/PolyLine.h
@@ -17,7 +17,6 @@ namespace util {
 namespace geo {
 
 static const double MAX_EQ_DISTANCE = 15;
-static const double AVERAGING_STEP = 20;
 
 // legacy code, will be removed in the future
 
@@ -61,11 +60,11 @@ class PolyLine {
   PolyLine& operator>>(const Point<T>& p);
 
   void reverse();
-  PolyLine getReversed() const;
+  PolyLine reversed() const;
 
   void offsetPerp(double units);
 
-  PolyLine getPerpOffsetted(double units) const;
+  PolyLine offsetted(double units) const;
 
   const Line<T>& getLine() const;
 
diff --git a/src/util/geo/PolyLine.tpp b/src/util/geo/PolyLine.tpp
index 1563874..ee85584 100644
--- a/src/util/geo/PolyLine.tpp
+++ b/src/util/geo/PolyLine.tpp
@@ -38,7 +38,7 @@ void PolyLine<T>::reverse() {
 
 // _____________________________________________________________________________
 template <typename T>
-PolyLine<T> PolyLine<T>::getReversed() const {
+PolyLine<T> PolyLine<T>::reversed() const {
   PolyLine ret = *this;
   ret.reverse();
   return ret;
@@ -52,7 +52,7 @@ const Line<T>& PolyLine<T>::getLine() const {
 
 // _____________________________________________________________________________
 template <typename T>
-PolyLine<T> PolyLine<T>::getPerpOffsetted(double units) const {
+PolyLine<T> PolyLine<T>::offsetted(double units) const {
   PolyLine p = *this;
   p.offsetPerp(units);
   return p;
@@ -70,8 +70,6 @@ void PolyLine<T>::offsetPerp(double units) {
 
   if (fabs(units) < 0.001) return;
 
-  assert(getLength() > 0);
-
   if (_line.size() < 2) return;
 
   Line<T> ret;
@@ -180,6 +178,7 @@ template <typename T>
 PolyLine<T> PolyLine<T>::getSegment(const LinePoint<T>& start,
                                     const LinePoint<T>& end) const {
   PolyLine ret;
+
   ret << start.p;
 
   if (start.lastIndex + 1 <= end.lastIndex) {
@@ -189,7 +188,9 @@ PolyLine<T> PolyLine<T>::getSegment(const LinePoint<T>& start,
   ret << end.p;
 
   // find a more performant way to clear the result of above
-  ret.simplify(0);
+  // ret.simplify(0);
+
+  // assert(ret.getLine().size());
 
   return ret;
 }
@@ -197,9 +198,19 @@ PolyLine<T> PolyLine<T>::getSegment(const LinePoint<T>& start,
 // _____________________________________________________________________________
 template <typename T>
 LinePoint<T> PolyLine<T>::getPointAtDist(double atDist) const {
-  if (atDist > getLength()) atDist = getLength();
+  double l = getLength();
+  if (atDist > l) atDist = l;
   if (atDist < 0) atDist = 0;
 
+  // shortcuts
+  if (atDist == 0) {
+    return LinePoint<T>(0, 0, _line.front());
+  }
+
+  if (atDist == l) {
+    return LinePoint<T>(_line.size() - 1, 1, _line.back());
+  }
+
   double dist = 0;
 
   if (_line.size() == 1) return LinePoint<T>(0, 0, _line[0]);
@@ -213,8 +224,7 @@ LinePoint<T> PolyLine<T>::getPointAtDist(double atDist) const {
 
     if (dist > atDist) {
       double p = (d - (dist - atDist));
-      return LinePoint<T>(i - 1, atDist / getLength(),
-                          interpolate(*last, cur, p));
+      return LinePoint<T>(i - 1, atDist / l, interpolate(*last, cur, p));
     }
 
     last = &_line[i];
@@ -270,8 +280,9 @@ PolyLine<T> PolyLine<T>::average(const std::vector<const PolyLine<T>*>& lines,
 
   double longestLength = DBL_MIN;  // avoid recalc of length on each comparision
   for (const PolyLine* p : lines) {
-    if (p->getLength() > longestLength) {
-      longestLength = p->getLength();
+    double l = p->getLength();
+    if (l > longestLength) {
+      longestLength = l;
     }
   }
 
@@ -377,11 +388,13 @@ LinePoint<T> PolyLine<T>::projectOnAfter(const Point<T>& p, size_t a) const {
   assert(a < _line.size());
   std::pair<size_t, double> bc = nearestSegmentAfter(p, a);
 
-  Point<T> ret = geo::projectOn(_line[bc.first], p, _line[bc.first + 1]);
+  size_t next = bc.first + 1;
+  if (next >= _line.size()) next = bc.first;
 
-  if (getLength() > 0) {
-    bc.second += dist(_line[bc.first], ret) / getLength();
-  }
+  Point<T> ret = geo::projectOn(_line[bc.first], p, _line[next]);
+
+  double l = getLength();
+  if (l > 0) bc.second += dist(_line[bc.first], ret) / l;
 
   return LinePoint<T>(bc.first, bc.second, ret);
 }
@@ -475,7 +488,7 @@ SharedSegments<T> PolyLine<T>::getSharedSegments(const PolyLine<T>& pl,
    */
   double STEP_SIZE = 2;
   double MAX_SKIPS = 4;
-  double MIN_SEG_LENGTH = 1;  // dmax / 2;  // make this configurable!
+  double MIN_SEG_LENGTH = 0.1;  // dmax / 2;  // make this configurable!
 
   SharedSegments<T> ret;
 
@@ -505,7 +518,6 @@ SharedSegments<T> PolyLine<T>::getSharedSegments(const PolyLine<T>& pl,
         LinePoint<T> curCmpPointer = pl.projectOn(curPointer);
         LinePoint<T> curBackProjectedPointer = projectOn(curCmpPointer.p);
 
-
         skips = 0;
 
         if (in) {
@@ -536,7 +548,6 @@ SharedSegments<T> PolyLine<T>::getSharedSegments(const PolyLine<T>& pl,
                       curEndCand.totalPos * length) > MIN_SEG_LENGTH &&
                  fabs(curStartCandCmp.totalPos * plLength -
                       curEndCandCmp.totalPos * plLength) > MIN_SEG_LENGTH)) {
-              assert(curStartCand.totalPos < curEndCand.totalPos);
               ret.segments.push_back(
                   SharedSegment<T>(std::pair<LinePoint<T>, LinePoint<T>>(
                                        curStartCand, curStartCandCmp),
@@ -573,7 +584,6 @@ SharedSegments<T> PolyLine<T>::getSharedSegments(const PolyLine<T>& pl,
            MIN_SEG_LENGTH &&
        fabs(curStartCandCmp.totalPos * plLength -
             curEndCandCmp.totalPos * plLength) > MIN_SEG_LENGTH)) {
-    assert(curStartCand.totalPos < curEndCand.totalPos);
     ret.segments.push_back(SharedSegment<T>(
         std::pair<LinePoint<T>, LinePoint<T>>(curStartCand, curStartCandCmp),
         std::pair<LinePoint<T>, LinePoint<T>>(curEndCand, curEndCandCmp)));
@@ -661,7 +671,8 @@ std::pair<double, double> PolyLine<T>::getSlopeBetween(double ad,
 template <typename T>
 std::pair<double, double> PolyLine<T>::getSlopeBetweenDists(double ad,
                                                             double bd) const {
-  return getSlopeBetween(ad / getLength(), bd / getLength());
+  double l = getLength();
+  return getSlopeBetween(ad / l, bd / l);
 }
 
 // _____________________________________________________________________________
diff --git a/src/util/geo/Polygon.h b/src/util/geo/Polygon.h
index 1c9a905..abd8fb0 100644
--- a/src/util/geo/Polygon.h
+++ b/src/util/geo/Polygon.h
@@ -21,9 +21,10 @@ class Polygon {
   Polygon(const Line<T>& l) : _outer(l) {}
   Polygon(const Box<T>& b)
       : _outer({b.getLowerLeft(),
-                Point<T>(b.getUpperRight().getX(), b.getLowerLeft().getY()),
+                Point<T>(b.getLowerLeft().getX(), b.getUpperRight().getY()),
                 b.getUpperRight(),
-                Point<T>(b.getLowerLeft().getX(), b.getUpperRight().getY())}) {}
+                Point<T>(b.getUpperRight().getX(), b.getLowerLeft().getY()),
+                b.getLowerLeft()}) {}
 
   const Line<T>& getOuter() const { return _outer; }
   Line<T>& getOuter() { return _outer; }
diff --git a/src/util/geo/QuadTree.h b/src/util/geo/QuadTree.h
new file mode 100644
index 0000000..cb39b7d
--- /dev/null
+++ b/src/util/geo/QuadTree.h
@@ -0,0 +1,94 @@
+// Copyright 2020, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Author: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef UTIL_GEO_QUADTREE_H_
+#define UTIL_GEO_QUADTREE_H_
+
+#include <map>
+#include <set>
+#include <vector>
+#include "util/geo/Geo.h"
+#include "util/geo/output/GeoJsonOutput.h"
+
+namespace util {
+namespace geo {
+
+template <typename V, typename T>
+struct QuadValue {
+  V val;           // the actual value of this entry
+  Point<T> point;  // the value's position
+
+  int64_t nextValue;  // index of the next quad value, -1 means no next value
+};
+
+template <typename T>
+struct QuadNode {
+  int64_t numEls;  // number of elements, -1 if this is not a leaf node
+  int64_t childs;  // for leafs, points to the first value contained. for
+                   // other nodes, points to the array block containing the
+                   // 4 childs
+  Box<T> bbox;
+};
+
+template <typename V, typename T>
+struct SplitFunc {
+  virtual ~SplitFunc() = default;
+  virtual bool operator()(const QuadNode<T>& nd,
+                       const QuadValue<V, T>& newVal) const = 0;
+};
+
+template <typename V, typename T>
+struct CapaSplitFunc : SplitFunc<V, T> {
+  CapaSplitFunc(size_t c) : _c(c) {}
+  virtual bool operator()(const QuadNode<T>& nd,
+                       const QuadValue<V, T>& newVal) const {
+    UNUSED(newVal);
+    return static_cast<size_t>(nd.numEls) + 1 > _c;
+  }
+  size_t _c;
+};
+
+// QuadTree for point data (and only point data)
+template <typename V, typename T>
+class QuadTree {
+ public:
+  // initialization of a quad tree with maximum depth d and maximum node // capacity c
+  QuadTree(size_t d, size_t c, const Box<T>& bbox);
+
+  QuadTree(size_t d, const SplitFunc<V, T>& splitF, const Box<T>& bbox);
+
+  // insert into the tree
+  void insert(const V& val, const Point<T>& point);
+
+  // insert into a specific node
+  void insert(int64_t vid, int64_t nid, size_t d);
+
+  size_t size() const;
+
+  const std::vector<QuadNode<T>>& getNds() const;
+  const QuadNode<T>& getNd(size_t nid) const;
+
+  // GeoJSON output
+  void print(std::ostream& o) const;
+
+ private:
+  size_t _maxDepth;
+  std::vector<QuadValue<V, T>> _vals;
+  std::vector<QuadNode<T>> _nds;
+
+  CapaSplitFunc<V, T> _capaFunc;
+
+  const SplitFunc<V, T>& _splFunc;
+
+
+  // split a node
+  void split(size_t nid, size_t d);
+};
+
+#include "util/geo/QuadTree.tpp"
+
+}  // namespace geo
+}  // namespace util
+
+#endif  // UTIL_GEO_QUADTREE_H_
diff --git a/src/util/geo/QuadTree.tpp b/src/util/geo/QuadTree.tpp
new file mode 100644
index 0000000..00ce976
--- /dev/null
+++ b/src/util/geo/QuadTree.tpp
@@ -0,0 +1,117 @@
+// _____________________________________________________________________________
+template <typename V, typename T>
+QuadTree<V, T>::QuadTree(size_t d, size_t c, const Box<T>& bbox)
+    : _maxDepth(d), _capaFunc(c), _splFunc(_capaFunc) {
+  _nds.push_back(QuadNode<T>{0, 0, bbox});
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+QuadTree<V, T>::QuadTree(size_t d, const SplitFunc<V, T>& splitF,
+                         const Box<T>& bbox)
+    : _maxDepth(d), _capaFunc(0), _splFunc(splitF) {
+  _nds.push_back(QuadNode<T>{0, 0, bbox});
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+void QuadTree<V, T>::insert(const V& val, const Point<T>& pos) {
+  if (!intersects(pos, _nds[0].bbox)) return;
+  int64_t valId = _vals.size();
+  _vals.push_back(QuadValue<V, T>{val, pos, -1});
+  _vals[valId].nextValue = -1;
+  insert(valId, 0, 0);
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+void QuadTree<V, T>::insert(int64_t vid, int64_t nid, size_t d) {
+  if (!intersects(_vals[vid].point, _nds[nid].bbox)) return;
+
+  if (d < _maxDepth && _nds[nid].numEls > -1 &&
+      _splFunc(_nds[nid], _vals[vid])) {
+    split(nid, d);
+  }
+
+  if (_nds[nid].numEls == -1) {
+    // insert into fitting subtree
+    for (size_t i = 0; i < 4; i++) insert(vid, _nds[nid].childs + i, d + 1);
+  } else {
+    if (_nds[nid].numEls == 0) {
+      _nds[nid].childs = vid;
+    } else {
+      _vals[vid].nextValue = _nds[nid].childs;
+      _nds[nid].childs = vid;
+    }
+    _nds[nid].numEls++;
+  }
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+void QuadTree<V, T>::split(size_t nid, size_t d) {
+  const auto& box = _nds[nid].bbox;
+  T w = (box.getUpperRight().getX() - box.getLowerLeft().getX()) / T(2);
+
+  int64_t curEl = _nds[nid].numEls > 0 ? _nds[nid].childs : -1;
+
+  _nds[nid].numEls = -1;           // the node is now a leaf node
+  _nds[nid].childs = _nds.size();  // the nodes quadrant block starts here
+
+  // box at 0, 0
+  _nds.push_back(QuadNode<T>{
+      0, 0,
+      Box<T>(box.getLowerLeft(), Point<T>(box.getLowerLeft().getX() + w,
+                                          box.getLowerLeft().getY() + w))});
+  // box at 0, 1
+  _nds.push_back(QuadNode<T>{
+      0, 0,
+      Box<T>(Point<T>(box.getLowerLeft().getX() + w, box.getLowerLeft().getY()),
+             Point<T>(box.getUpperRight().getX(),
+                      box.getLowerLeft().getY() + w))});
+  // box at 1,0
+  _nds.push_back(QuadNode<T>{
+      0, 0,
+      Box<T>(Point<T>(box.getLowerLeft().getX(), box.getLowerLeft().getY() + w),
+             Point<T>(box.getLowerLeft().getX() + w,
+                      box.getUpperRight().getY()))});
+  // box at 1,1
+  _nds.push_back(QuadNode<T>{0, 0,
+                             Box<T>(Point<T>(box.getLowerLeft().getX() + w,
+                                             box.getLowerLeft().getY() + w),
+                                    box.getUpperRight())});
+
+  while (curEl > -1) {
+    _vals[curEl].nextValue = -1;
+    insert(curEl, nid, d + 1);
+    curEl = _vals[curEl].nextValue;
+  }
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+size_t QuadTree<V, T>::size() const {
+  return _vals.size();
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+const QuadNode<T>& QuadTree<V, T>::getNd(size_t nid) const {
+  return _nds[nid];
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+const std::vector<QuadNode<T>>& QuadTree<V, T>::getNds() const {
+  return _nds;
+}
+
+// _____________________________________________________________________________
+template <typename V, typename T>
+void QuadTree<V, T>::print(std::ostream& o) const {
+  util::geo::output::GeoJsonOutput out(o);
+  for (const auto& nd : _nds) {
+    if (nd.numEls == -1) continue; // don't print non-leaf nodes
+    out.print(util::geo::convexHull(nd.bbox), json::Dict{{"elements", json::Int(nd.numEls)}});
+  }
+}
diff --git a/src/util/geo/output/GeoGraphJsonOutput.h b/src/util/geo/output/GeoGraphJsonOutput.h
index 83976ce..92eb5f5 100644
--- a/src/util/geo/output/GeoGraphJsonOutput.h
+++ b/src/util/geo/output/GeoGraphJsonOutput.h
@@ -19,13 +19,22 @@ class GeoGraphJsonOutput {
  public:
   inline GeoGraphJsonOutput(){};
 
-  // print a graph to the provided path
+  // print a graph to the provided path, with optional JSON attributes
+  // written on the graph-level
   template <typename N, typename E>
   void print(const util::graph::Graph<N, E>& outG, std::ostream& str);
+  template <typename N, typename E>
+  void print(const util::graph::Graph<N, E>& outG, std::ostream& str,
+             json::Val attrs);
 
-  // print a graph to the provided path, but treat coordinates as Web Mercator coordinates and reproject to WGS84
+  // print a graph to the provided path, but treat coordinates as Web Mercator
+  // coordinates and reproject to WGS84, with optional JSON attributes
+  // written on the graph-level
   template <typename N, typename E>
   void printLatLng(const util::graph::Graph<N, E>& outG, std::ostream& str);
+  template <typename N, typename E>
+  void printLatLng(const util::graph::Graph<N, E>& outG, std::ostream& str,
+                   json::Val attrs);
 
  private:
   template <typename T>
@@ -34,12 +43,13 @@ class GeoGraphJsonOutput {
 
   // print a graph to the provided path
   template <typename N, typename E>
-  void printImpl(const util::graph::Graph<N, E>& outG, std::ostream& str, bool proj);
+  void printImpl(const util::graph::Graph<N, E>& outG, std::ostream& str,
+                 bool proj, json::Val attrs);
 };
 
 #include "util/geo/output/GeoGraphJsonOutput.tpp"
-}
-}
-}
+}  // namespace output
+}  // namespace geo
+}  // namespace util
 
 #endif  // UTIL_GEO_OUTPUT_GEOGRAPHJSONOUTPUT_H_
diff --git a/src/util/geo/output/GeoGraphJsonOutput.tpp b/src/util/geo/output/GeoGraphJsonOutput.tpp
index 803a983..4bcf941 100644
--- a/src/util/geo/output/GeoGraphJsonOutput.tpp
+++ b/src/util/geo/output/GeoGraphJsonOutput.tpp
@@ -16,21 +16,36 @@ Line<T> GeoGraphJsonOutput::createLine(const util::geo::Point<T>& a,
 template <typename N, typename E>
 void GeoGraphJsonOutput::print(const util::graph::Graph<N, E>& outG,
                                std::ostream& str) {
-  printImpl(outG, str, false);
+  printImpl(outG, str, false, {});
 }
 
 // _____________________________________________________________________________
 template <typename N, typename E>
 void GeoGraphJsonOutput::printLatLng(const util::graph::Graph<N, E>& outG,
                                std::ostream& str) {
-  printImpl(outG, str, true);
+  printImpl(outG, str, true, {});
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E>
+void GeoGraphJsonOutput::print(const util::graph::Graph<N, E>& outG,
+                               std::ostream& str, json::Val attrs) {
+  printImpl(outG, str, false, attrs);
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E>
+void GeoGraphJsonOutput::printLatLng(const util::graph::Graph<N, E>& outG,
+                               std::ostream& str, json::Val attrs) {
+  printImpl(outG, str, true, attrs);
 }
 
 // _____________________________________________________________________________
 template <typename N, typename E>
 void GeoGraphJsonOutput::printImpl(const util::graph::Graph<N, E>& outG,
-                               std::ostream& str, bool proj) {
-  GeoJsonOutput _out(str);
+                               std::ostream& str, bool proj, json::Val attrs) {
+
+  GeoJsonOutput _out(str, attrs);
 
   // first pass, nodes
   for (util::graph::Node<N, E>* n : outG.getNds()) {
diff --git a/src/util/geo/output/GeoJsonOutput.h b/src/util/geo/output/GeoJsonOutput.h
index 701521b..b9cc45c 100644
--- a/src/util/geo/output/GeoJsonOutput.h
+++ b/src/util/geo/output/GeoJsonOutput.h
@@ -28,12 +28,30 @@ class GeoJsonOutput {
   template <typename T>
   void print(const Line<T>& l, json::Val attrs);
 
+  template <typename T>
+  void print(const MultiLine<T>& l, json::Val attrs);
+
+  template <typename T>
+  void print(const Polygon<T>& l, json::Val attrs);
+
+  template <typename T>
+  void print(const MultiPolygon<T>& l, json::Val attrs);
+
   template <typename T>
   void printLatLng(const Point<T>& p, json::Val attrs);
 
   template <typename T>
   void printLatLng(const Line<T>& l, json::Val attrs);
 
+  template <typename T>
+  void printLatLng(const MultiLine<T>& l, json::Val attrs);
+
+  template <typename T>
+  void printLatLng(const Polygon<T>& l, json::Val attrs);
+
+  template <typename T>
+  void printLatLng(const MultiPolygon<T>& l, json::Val attrs);
+
   void flush();
 
  private:
@@ -41,8 +59,8 @@ class GeoJsonOutput {
 };
 
 #include "util/geo/output/GeoJsonOutput.tpp"
-}
-}
-}
+}  // namespace output
+}  // namespace geo
+}  // namespace util
 
 #endif  // UTIL_GEO_OUTPUT_GEOJSONOUTPUT_H_
diff --git a/src/util/geo/output/GeoJsonOutput.tpp b/src/util/geo/output/GeoJsonOutput.tpp
index 09f5c2a..ca61aa9 100644
--- a/src/util/geo/output/GeoJsonOutput.tpp
+++ b/src/util/geo/output/GeoJsonOutput.tpp
@@ -47,6 +47,46 @@ void GeoJsonOutput::print(const Line<T>& line, json::Val attrs) {
   _wr.close();
 }
 
+// _____________________________________________________________________________
+template <typename T>
+void GeoJsonOutput::print(const MultiLine<T>& line, json::Val attrs) {
+  for (const auto& l : line) print(l, attrs);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+void GeoJsonOutput::print(const Polygon<T>& poly, json::Val attrs) {
+  if (!poly.getOuter().size()) return;
+  _wr.obj();
+  _wr.keyVal("type", "Feature");
+
+  _wr.key("geometry");
+  _wr.obj();
+  _wr.keyVal("type", "Polygon");
+  _wr.key("coordinates");
+  _wr.arr();
+  _wr.arr();
+  for (auto p : poly.getOuter()) {
+    _wr.arr();
+    _wr.val(p.getX());
+    _wr.val(p.getY());
+    _wr.close();
+  }
+
+  _wr.close();
+  _wr.close();
+  _wr.close();
+  _wr.key("properties");
+  _wr.val(attrs);
+  _wr.close();
+}
+
+// _____________________________________________________________________________
+template <typename T>
+void GeoJsonOutput::print(const MultiPolygon<T>& mpoly, json::Val attrs) {
+  for (const auto& p : mpoly) print(p, attrs);
+}
+
 // _____________________________________________________________________________
 template <typename T>
 void GeoJsonOutput::printLatLng(const Point<T>& p, json::Val attrs) {
@@ -58,7 +98,30 @@ void GeoJsonOutput::printLatLng(const Point<T>& p, json::Val attrs) {
 template <typename T>
 void GeoJsonOutput::printLatLng(const Line<T>& line, json::Val attrs) {
   Line<T> projL;
-  for (auto p : line) projL.push_back(util::geo::webMercToLatLng<double>(p.getX(), p.getY()));
+  for (auto p : line)
+    projL.push_back(util::geo::webMercToLatLng<double>(p.getX(), p.getY()));
 
   print(projL, attrs);
 }
+
+// _____________________________________________________________________________
+template <typename T>
+void GeoJsonOutput::printLatLng(const MultiLine<T>& mline, json::Val attrs) {
+  for (const auto& l : mline) printLatLng(l, attrs);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+void GeoJsonOutput::printLatLng(const Polygon<T>& poly, json::Val attrs) {
+  Polygon<T> projP;
+  for (auto p : poly)
+    projP.push_back(util::geo::webMercToLatLng<double>(p.getX(), p.getY()));
+
+  print(projP, attrs);
+}
+
+// _____________________________________________________________________________
+template <typename T>
+void GeoJsonOutput::printLatLng(const MultiPolygon<T>& mpoly, json::Val attrs) {
+  for (const auto& p : mpoly) printLatLng(p, attrs);
+}
diff --git a/src/util/graph/Algorithm.h b/src/util/graph/Algorithm.h
index 01b23f3..f1ef820 100644
--- a/src/util/graph/Algorithm.h
+++ b/src/util/graph/Algorithm.h
@@ -7,8 +7,8 @@
 
 #include <stack>
 #include "util/graph/Edge.h"
-#include "util/graph/UndirGraph.h"
 #include "util/graph/Node.h"
+#include "util/graph/UndirGraph.h"
 
 namespace util {
 namespace graph {
@@ -20,13 +20,26 @@ using util::graph::Edge;
 // collection of general graph algorithms
 class Algorithm {
  public:
+  template <typename N, typename E>
+  struct EdgeCheckFunc {
+    virtual bool operator()(const Node<N, E>* frNd,
+                            const Edge<N, E>* edge) const {
+      UNUSED(frNd);
+      UNUSED(edge);
+      return true;
+    };
+  };
+
   template <typename N, typename E>
   static std::vector<std::set<Node<N, E>*> > connectedComponents(
       const UndirGraph<N, E>& g);
+
+  template <typename N, typename E>
+  static std::vector<std::set<Node<N, E>*> > connectedComponents(
+      const UndirGraph<N, E>& g, const EdgeCheckFunc<N, E>& checkFunc);
 };
 
 #include "util/graph/Algorithm.tpp"
-
 }
 }
 
diff --git a/src/util/graph/Algorithm.tpp b/src/util/graph/Algorithm.tpp
index 5c1f7c1..06409ea 100644
--- a/src/util/graph/Algorithm.tpp
+++ b/src/util/graph/Algorithm.tpp
@@ -1,11 +1,18 @@
 // Copyright 2017, University of Freiburg,
 // Chair of Algorithms and Data Structures.
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+//
+// _____________________________________________________________________________
+template <typename N, typename E>
+std::vector<std::set<Node<N, E>*>> Algorithm::connectedComponents(
+    const UndirGraph<N, E>& g) {
+  return connectedComponents(g, EdgeCheckFunc<N, E>());
+}
 
 // _____________________________________________________________________________
 template <typename N, typename E>
-std::vector<std::set<Node<N, E>*> > Algorithm::connectedComponents(
-    const UndirGraph<N, E>& g) {
+std::vector<std::set<Node<N, E>*>> Algorithm::connectedComponents(
+    const UndirGraph<N, E>& g, const EdgeCheckFunc<N, E>& checkFunc) {
   std::vector<std::set<Node<N, E>*>> ret;
   std::set<Node<N, E>*> visited;
 
@@ -22,6 +29,7 @@ std::vector<std::set<Node<N, E>*> > Algorithm::connectedComponents(
         visited.insert(cur);
 
         for (auto* e : cur->getAdjList()) {
+          if (!checkFunc(cur, e)) continue;
           if (!visited.count(e->getOtherNd(cur))) q.push(e->getOtherNd(cur));
         }
       }
diff --git a/src/util/graph/BiDijkstra.cpp b/src/util/graph/BiDijkstra.cpp
new file mode 100644
index 0000000..5b69e72
--- /dev/null
+++ b/src/util/graph/BiDijkstra.cpp
@@ -0,0 +1,7 @@
+// Copyright 2017, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#include "util/graph/BiDijkstra.h"
+
+size_t util::graph::BiDijkstra::ITERS = 0;
diff --git a/src/util/graph/BiDijkstra.h b/src/util/graph/BiDijkstra.h
new file mode 100644
index 0000000..1ea3827
--- /dev/null
+++ b/src/util/graph/BiDijkstra.h
@@ -0,0 +1,129 @@
+// Copyright 2017, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+#ifndef UTIL_GRAPH_BIDIJKSTRA_H_
+#define UTIL_GRAPH_BIDIJKSTRA_H_
+
+#include <limits>
+#include <list>
+#include <queue>
+#include <set>
+#include <algorithm>
+#include <unordered_map>
+#include "util/graph/Edge.h"
+#include "util/graph/Graph.h"
+#include "util/graph/Node.h"
+#include "util/graph/ShortestPath.h"
+
+namespace util {
+namespace graph {
+
+using util::graph::Edge;
+using util::graph::Graph;
+using util::graph::Node;
+
+// bidirectional dijkstras algorithm for util graph
+class BiDijkstra : public ShortestPath<BiDijkstra> {
+ public:
+  template <typename N, typename E, typename C>
+  struct RouteNode {
+    RouteNode() : n(0), parent(0), d(), h() {}
+    RouteNode(Node<N, E>* n) : n(n), parent(0), d(), h() {}
+    RouteNode(Node<N, E>* n, Node<N, E>* parent, C d)
+        : n(n), parent(parent), d(d), h() {}
+    RouteNode(Node<N, E>* n, Node<N, E>* parent, C d, C h)
+        : n(n), parent(parent), d(d), h(h) {}
+
+    Node<N, E>* n;
+    Node<N, E>* parent;
+
+    // the cost so far
+    C d;
+
+    // the heuristical remaining cost + the cost so far
+    C h;
+
+    bool operator<(const RouteNode<N, E, C>& p) const { return h > p.h; }
+  };
+
+  template <typename N, typename E, typename C>
+  using Settled = std::unordered_map<Node<N, E>*, RouteNode<N, E, C> >;
+
+  template <typename N, typename E, typename C>
+  using PQ = std::priority_queue<RouteNode<N, E, C> >;
+
+  template <typename N, typename E, typename C>
+  struct CostFunc : public util::graph::CostFunc<N, E, C> {
+    virtual ~CostFunc() = default; C operator()(const Edge<N, E>* from, const Node<N, E>* n,
+                 const Edge<N, E>* to) const {
+      UNUSED(from);
+      UNUSED(n);
+      UNUSED(to);
+      return C();
+    };
+  };
+
+  template <typename N, typename E, typename C>
+  struct HeurFunc : public util::graph::HeurFunc<N, E, C> {
+    virtual ~HeurFunc() = default;
+    C operator()(const Edge<N, E>* from,
+                 const std::set<Edge<N, E>*>& to) const {
+      UNUSED(from);
+      UNUSED(to);
+      return C();
+    };
+  };
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Node<N, E>*, C> shortestPathImpl(
+      Node<N, E>* from, const std::set<Node<N, E>*>& to,
+      const util::graph::CostFunc<N, E, C>& costFunc,
+      const util::graph::HeurFunc<N, E, C>&,
+      std::unordered_map<Node<N, E>*, EList<N, E>*> resEdges,
+      std::unordered_map<Node<N, E>*, NList<N, E>*> resNode);
+
+  template <typename N, typename E, typename C>
+  static C shortestPathImpl(const std::set<Node<N, E>*> from,
+                            const std::set<Node<N, E>*>& to,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
+                            EList<N, E>* resEdges, NList<N, E>* resNodes);
+
+  template <typename N, typename E, typename C>
+  static C shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
+                            EList<N, E>* resEdges, NList<N, E>* resNodes);
+
+  template <typename N, typename E, typename C>
+  static void relax(RouteNode<N, E, C>& cur, const std::set<Node<N, E>*>& to,
+                    const util::graph::CostFunc<N, E, C>& costFunc,
+                    const util::graph::HeurFunc<N, E, C>& heurFunc,
+                    PQ<N, E, C>& pq);
+
+  template <typename N, typename E, typename C>
+  static C relaxFwd(RouteNode<N, E, C>& cur, const std::set<Node<N, E>*>& to,
+                    const util::graph::CostFunc<N, E, C>& costFunc,
+                    const util::graph::HeurFunc<N, E, C>& heurFunc,
+                    PQ<N, E, C>& pq, const Settled<N, E, C>& settledBwd);
+
+  template <typename N, typename E, typename C>
+  static C relaxBwd(const std::set<Node<N, E>*>& froms, RouteNode<N, E, C>& cur,
+                    const util::graph::CostFunc<N, E, C>& costFunc,
+                    const util::graph::HeurFunc<N, E, C>& heurFunc,
+                    PQ<N, E, C>& pq, const Settled<N, E, C>& settledFwd);
+
+  template <typename N, typename E, typename C>
+  static void buildPath(Node<N, E>* curN, Settled<N, E, C>& settledFwd,
+                        Settled<N, E, C>& settledBwd, NList<N, E>* resNodes,
+                        EList<N, E>* resEdges);
+
+  static size_t ITERS;
+};
+
+#include "util/graph/BiDijkstra.tpp"
+}  // namespace graph
+}  // namespace util
+
+#endif  // UTIL_GRAPH_BIDIJKSTRA_H_
diff --git a/src/util/graph/BiDijkstra.tpp b/src/util/graph/BiDijkstra.tpp
new file mode 100644
index 0000000..1bb7479
--- /dev/null
+++ b/src/util/graph/BiDijkstra.tpp
@@ -0,0 +1,293 @@
+// Copyright 2017, University of Freiburg,
+// Chair of Algorithms and Data Structures.
+// Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+C BiDijkstra::shortestPathImpl(Node<N, E>* from,
+                               const std::set<Node<N, E>*>& to,
+                               const util::graph::CostFunc<N, E, C>& costFunc,
+                               const util::graph::HeurFunc<N, E, C>& heurFunc,
+                               EList<N, E>* resEdges, NList<N, E>* resNodes) {
+  if (from->getOutDeg() == 0) return costFunc.inf();
+
+  std::set<Node<N, E>*> froms;
+  froms.insert(from);
+
+  return shortestPathImpl(froms, to, costFunc, heurFunc, resEdges, resNodes);
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+C BiDijkstra::shortestPathImpl(const std::set<Node<N, E>*> from,
+                               const std::set<Node<N, E>*>& to,
+                               const util::graph::CostFunc<N, E, C>& costFunc,
+                               const util::graph::HeurFunc<N, E, C>& heurFunc,
+                               EList<N, E>* resEdges, NList<N, E>* resNodes) {
+  Settled<N, E, C> settledFwd, settledBwd;
+  PQ<N, E, C> pqFwd, pqBwd;
+  bool found = false;
+
+  // starter for forward search
+  for (auto n : from) pqFwd.emplace(n);
+
+  auto l = costFunc.inf();
+
+  // starter for backward search
+  for (auto n : to) pqBwd.emplace(n);
+
+  RouteNode<N, E, C> cur;
+
+  while (!pqFwd.empty() && !pqBwd.empty()) {
+    if (costFunc.inf() <= pqFwd.top().h && costFunc.inf() <= pqBwd.top().h)
+      return costFunc.inf();
+
+    if (pqFwd.top() < pqBwd.top()) {
+      auto se = settledBwd.find(pqBwd.top().n);
+      if (se != settledBwd.end()) {
+        // to allow non-consistent heuristics
+        if (se->second.d <= pqBwd.top().d) {
+          pqBwd.pop();
+          continue;
+        }
+      }
+    } else {
+      auto se = settledFwd.find(pqFwd.top().n);
+      if (se != settledFwd.end()) {
+        // to allow non-consistent heuristics
+        if (se->second.d <= pqFwd.top().d) {
+          pqFwd.pop();
+          continue;
+        }
+      }
+    }
+
+    BiDijkstra::ITERS++;
+
+    if (pqFwd.top() < pqBwd.top()) {
+      cur = pqBwd.top();
+      pqBwd.pop();
+      settledBwd[cur.n] = cur;
+      if (settledFwd.find(cur.n) != settledFwd.end()) {
+        auto newL = cur.d + settledFwd.find(cur.n)->second.d;
+
+        if (!(newL > l)) {
+          l = newL;
+          found = true;
+          break;
+        }
+      }
+      C bestCost = relaxBwd(from, cur, costFunc, heurFunc, pqBwd, settledFwd);
+      if (bestCost < l) l = bestCost;
+    } else {
+      cur = pqFwd.top();
+      pqFwd.pop();
+      settledFwd[cur.n] = cur;
+      if (settledBwd.find(cur.n) != settledBwd.end()) {
+        auto newL = cur.d + settledBwd.find(cur.n)->second.d;
+
+        if (!(newL > l)) {
+          l = newL;
+          found = true;
+          break;
+        }
+      }
+      C bestCost = relaxFwd(cur, to, costFunc, heurFunc, pqFwd, settledBwd);
+      if (bestCost < l) l = bestCost;
+    }
+  }
+
+  if (!found) return costFunc.inf();
+
+  buildPath(cur.n, settledFwd, settledBwd, resNodes, resEdges);
+
+  return l;
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+std::unordered_map<Node<N, E>*, C> BiDijkstra::shortestPathImpl(
+    Node<N, E>* from, const std::set<Node<N, E>*>& to,
+    const util::graph::CostFunc<N, E, C>& costFunc,
+    const util::graph::HeurFunc<N, E, C>& heurFunc,
+    std::unordered_map<Node<N, E>*, EList<N, E>*> resEdges,
+    std::unordered_map<Node<N, E>*, NList<N, E>*> resNodes) {
+  UNUSED(from);
+  UNUSED(to);
+  UNUSED(costFunc);
+  UNUSED(heurFunc);
+  UNUSED(resEdges);
+  UNUSED(resNodes);
+  assert(false);
+  // std::unordered_map<Node<N, E>*, C> costs;
+  // if (to.size() == 0) return costs;
+  // // init costs with inf
+  // for (auto n : to) costs[n] = costFunc.inf();
+
+  // if (from->getOutDeg() == 0) return costs;
+  // Settled<N, E, C> settled;
+  // PQ<N, E, C> pq;
+
+  // size_t found = 0;
+
+  // pq.emplace(from);
+  // RouteNode<N, E, C> cur;
+
+  // while (!pq.empty()) {
+  // if (costFunc.inf() <= pq.top().h) return costs;
+  // if (settled.find(pq.top().n) != settled.end()) {
+  // pq.pop();
+  // continue;
+  // }
+  // BiDijkstra::ITERS++;
+
+  // cur = pq.top();
+  // pq.pop();
+
+  // settled[cur.n] = cur;
+
+  // if (to.find(cur.n) != to.end()) {
+  // found++;
+  // }
+
+  // if (found == to.size()) break;
+
+  // relax(cur, to, costFunc, heurFunc, pq);
+  // }
+
+  // for (auto nto : to) {
+  // if (!settled.count(nto)) continue;
+  // Node<N, E>* curN = nto;
+  // costs[nto] = settled[curN].d;
+
+  // buildPath(nto, settled, resNodes[nto], resEdges[nto]);
+  // }
+
+  // return costs;
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+void BiDijkstra::relax(RouteNode<N, E, C>& cur, const std::set<Node<N, E>*>& to,
+                       const util::graph::CostFunc<N, E, C>& costFunc,
+                       const util::graph::HeurFunc<N, E, C>& heurFunc,
+                       PQ<N, E, C>& pq) {
+  for (auto edge : cur.n->getAdjListOut()) {
+    C newC = costFunc(cur.n, edge, edge->getOtherNd(cur.n));
+    newC = cur.d + newC;
+    if (costFunc.inf() <= newC) continue;
+
+    // addition done here to avoid it in the PQ
+    const C& newH = newC + heurFunc(edge->getOtherNd(cur.n), to);
+
+    pq.emplace(edge->getOtherNd(cur.n), cur.n, newC, newH);
+  }
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+C BiDijkstra::relaxFwd(RouteNode<N, E, C>& cur, const std::set<Node<N, E>*>& to,
+                       const util::graph::CostFunc<N, E, C>& costFunc,
+                       const util::graph::HeurFunc<N, E, C>& heurFunc,
+                       PQ<N, E, C>& pq, const Settled<N, E, C>& settledBwd) {
+  UNUSED(to);
+  UNUSED(heurFunc);
+  C ret = costFunc.inf();
+  for (auto edge : cur.n->getAdjListOut()) {
+    C newC = costFunc(cur.n, edge, edge->getOtherNd(cur.n));
+    newC = cur.d + newC;
+    if (costFunc.inf() <= newC) continue;
+
+    // addition done here to avoid it in the PQ
+    // const C& newH = newC + heurFunc(froms, edge->getOtherNd(cur.n));
+
+    // TODO:
+    const C& newH = newC + 0;
+
+    // update new best found cost
+    if (settledBwd.find(edge->getOtherNd(cur.n)) != settledBwd.end()) {
+      C bwdCost = settledBwd.find(edge->getOtherNd(cur.n))->second.d + newC;
+      if (bwdCost < ret) ret = bwdCost;
+    }
+
+    pq.emplace(edge->getOtherNd(cur.n), cur.n, newC, newH);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+C BiDijkstra::relaxBwd(const std::set<Node<N, E>*>& froms,
+                       RouteNode<N, E, C>& cur,
+                       const util::graph::CostFunc<N, E, C>& costFunc,
+                       const util::graph::HeurFunc<N, E, C>& heurFunc,
+                       PQ<N, E, C>& pq, const Settled<N, E, C>& settledFwd) {
+  UNUSED(froms);
+  UNUSED(heurFunc);
+  C ret = costFunc.inf();
+  for (auto edge : cur.n->getAdjListIn()) {
+    C newC = costFunc(edge->getOtherNd(cur.n), edge, cur.n);
+    newC = cur.d + newC;
+    if (costFunc.inf() <= newC) continue;
+
+    // addition done here to avoid it in the PQ
+    // const C& newH = newC + heurFunc(froms, edge->getOtherNd(cur.n));
+
+    // TODO:
+    const C& newH = newC + 0;
+
+    // update new best found cost
+    if (settledFwd.find(edge->getOtherNd(cur.n)) != settledFwd.end()) {
+      C fwdCost = settledFwd.find(edge->getOtherNd(cur.n))->second.d + newC;
+      if (fwdCost < ret) ret = fwdCost;
+    }
+
+    pq.emplace(edge->getOtherNd(cur.n), cur.n, newC, newH);
+  }
+
+  return ret;
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+void BiDijkstra::buildPath(Node<N, E>* curN, Settled<N, E, C>& settledFwd,
+                           Settled<N, E, C>& settledBwd, NList<N, E>* resNodes,
+                           EList<N, E>* resEdges) {
+  Node<N, E>* curNFwd = curN;
+  Node<N, E>* curNBwd = curN;
+
+  // the forward part
+  while (resNodes || resEdges) {
+    const RouteNode<N, E, C>& curNode = settledFwd[curNFwd];
+    if (resNodes) resNodes->push_back(curNode.n);
+    if (!curNode.parent) break;
+
+    if (resEdges) {
+      for (auto e : curNode.n->getAdjListIn()) {
+        if (e->getOtherNd(curNode.n) == curNode.parent) resEdges->push_back(e);
+      }
+    }
+    curNFwd = curNode.parent;
+  }
+
+  if (resNodes) std::reverse(resNodes->begin(), resNodes->end());
+  if (resEdges) std::reverse(resEdges->begin(), resEdges->end());
+
+  // the backward part
+  while (resNodes || resEdges) {
+    const RouteNode<N, E, C>& curNode = settledBwd[curNBwd];
+    if (resNodes && curNode.n != curN) resNodes->push_back(curNode.n);
+    if (!curNode.parent) break;
+
+    if (resEdges) {
+      for (auto e : curNode.n->getAdjListOut()) {
+        if (e->getOtherNd(curNode.n) == curNode.parent) resEdges->push_back(e);
+      }
+    }
+    curNBwd = curNode.parent;
+  }
+
+  if (resNodes) std::reverse(resNodes->begin(), resNodes->end());
+  if (resEdges) std::reverse(resEdges->begin(), resEdges->end());
+}
diff --git a/src/util/graph/Dijkstra.h b/src/util/graph/Dijkstra.h
index b571e38..20b5d1e 100644
--- a/src/util/graph/Dijkstra.h
+++ b/src/util/graph/Dijkstra.h
@@ -9,7 +9,6 @@
 #include <list>
 #include <queue>
 #include <set>
-#include <set>
 #include <unordered_map>
 #include "util/graph/Edge.h"
 #include "util/graph/Graph.h"
@@ -19,33 +18,32 @@
 namespace util {
 namespace graph {
 
+using util::graph::Edge;
 using util::graph::Graph;
 using util::graph::Node;
-using util::graph::Edge;
 
 // dijkstras algorithm for util graph
 class Dijkstra : public ShortestPath<Dijkstra> {
  public:
   template <typename N, typename E, typename C>
   struct RouteNode {
-    RouteNode() : n(0), parent(0), d(), h(), e(0) {}
-    RouteNode(Node<N, E>* n) : n(n), parent(0), d(), h(), e(0) {}
-    RouteNode(Node<N, E>* n, Node<N, E>* parent, C d, Edge<N, E>* e)
-        : n(n), parent(parent), d(d), h(), e(e) {}
-    RouteNode(Node<N, E>* n, Node<N, E>* parent, C d, C h, Edge<N, E>* e)
-        : n(n), parent(parent), d(d), h(h), e(e) {}
+    RouteNode() : n(0), parent(0), d(), h() {}
+    RouteNode(Node<N, E>* n) : n(n), parent(0), d(), h() {}
+    RouteNode(Node<N, E>* n, Node<N, E>* parent, C d)
+        : n(n), parent(parent), d(d), h() {}
+    RouteNode(Node<N, E>* n, Node<N, E>* parent, C d, C h)
+        : n(n), parent(parent), d(d), h(h) {}
 
     Node<N, E>* n;
     Node<N, E>* parent;
 
+    // the cost so far
     C d;
+
+    // the heuristical remaining cost + the cost so far
     C h;
 
-    Edge<N, E>* e;
-
-    bool operator<(const RouteNode<N, E, C>& p) const {
-      return h > p.h || (h == p.h && d > p.d);
-    }
+    bool operator<(const RouteNode<N, E, C>& p) const { return h > p.h; }
   };
 
   template <typename N, typename E, typename C>
@@ -55,7 +53,8 @@ class Dijkstra : public ShortestPath<Dijkstra> {
   using PQ = std::priority_queue<RouteNode<N, E, C> >;
 
   template <typename N, typename E, typename C>
-  struct CostFunc : public ShortestPath::CostFunc<N, E, C> {
+  struct CostFunc : public util::graph::CostFunc<N, E, C> {
+    virtual ~CostFunc() = default;
     C operator()(const Edge<N, E>* from, const Node<N, E>* n,
                  const Edge<N, E>* to) const {
       UNUSED(from);
@@ -66,7 +65,8 @@ class Dijkstra : public ShortestPath<Dijkstra> {
   };
 
   template <typename N, typename E, typename C>
-  struct HeurFunc : public ShortestPath::HeurFunc<N, E, C> {
+  struct HeurFunc : public util::graph::HeurFunc<N, E, C> {
+    virtual ~HeurFunc() = default;
     C operator()(const Edge<N, E>* from,
                  const std::set<Edge<N, E>*>& to) const {
       UNUSED(from);
@@ -78,26 +78,29 @@ class Dijkstra : public ShortestPath<Dijkstra> {
   template <typename N, typename E, typename C>
   static std::unordered_map<Node<N, E>*, C> shortestPathImpl(
       Node<N, E>* from, const std::set<Node<N, E>*>& to,
-      const ShortestPath::CostFunc<N, E, C>& costFunc, const ShortestPath::HeurFunc<N, E, C>&,
+      const util::graph::CostFunc<N, E, C>& costFunc,
+      const util::graph::HeurFunc<N, E, C>&,
       std::unordered_map<Node<N, E>*, EList<N, E>*> resEdges,
       std::unordered_map<Node<N, E>*, NList<N, E>*> resNode);
 
   template <typename N, typename E, typename C>
-  static C shortestPathImpl(const std::set<Node<N, E>*> from, const std::set<Node<N, E>*>& to,
-                            const ShortestPath::CostFunc<N, E, C>& costFunc,
-                            const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+  static C shortestPathImpl(const std::set<Node<N, E>*> from,
+                            const std::set<Node<N, E>*>& to,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
                             EList<N, E>* resEdges, NList<N, E>* resNodes);
 
   template <typename N, typename E, typename C>
   static C shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
-                            const ShortestPath::CostFunc<N, E, C>& costFunc,
-                            const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
                             EList<N, E>* resEdges, NList<N, E>* resNodes);
 
   template <typename N, typename E, typename C>
   static void relax(RouteNode<N, E, C>& cur, const std::set<Node<N, E>*>& to,
-                    const ShortestPath::CostFunc<N, E, C>& costFunc,
-                    const ShortestPath::HeurFunc<N, E, C>& heurFunc, PQ<N, E, C>& pq);
+                    const util::graph::CostFunc<N, E, C>& costFunc,
+                    const util::graph::HeurFunc<N, E, C>& heurFunc,
+                    PQ<N, E, C>& pq);
 
   template <typename N, typename E, typename C>
   static void buildPath(Node<N, E>* curN, Settled<N, E, C>& settled,
@@ -107,7 +110,7 @@ class Dijkstra : public ShortestPath<Dijkstra> {
 };
 
 #include "util/graph/Dijkstra.tpp"
-}
-}
+}  // namespace graph
+}  // namespace util
 
 #endif  // UTIL_GRAPH_DIJKSTRA_H_
diff --git a/src/util/graph/Dijkstra.tpp b/src/util/graph/Dijkstra.tpp
index a9a55f4..5970902 100644
--- a/src/util/graph/Dijkstra.tpp
+++ b/src/util/graph/Dijkstra.tpp
@@ -5,8 +5,8 @@
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
 C Dijkstra::shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
-                             const ShortestPath::CostFunc<N, E, C>& costFunc,
-                             const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                             const util::graph::CostFunc<N, E, C>& costFunc,
+                             const util::graph::HeurFunc<N, E, C>& heurFunc,
                              EList<N, E>* resEdges, NList<N, E>* resNodes) {
   if (from->getOutDeg() == 0) return costFunc.inf();
 
@@ -18,12 +18,12 @@ C Dijkstra::shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
   RouteNode<N, E, C> cur;
 
   while (!pq.empty()) {
-    Dijkstra::ITERS++;
-
+    if (costFunc.inf() <= pq.top().h) return costFunc.inf();
     if (settled.find(pq.top().n) != settled.end()) {
       pq.pop();
       continue;
     }
+    Dijkstra::ITERS++;
 
     cur = pq.top();
     pq.pop();
@@ -49,8 +49,8 @@ C Dijkstra::shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
 template <typename N, typename E, typename C>
 C Dijkstra::shortestPathImpl(const std::set<Node<N, E>*> from,
                              const std::set<Node<N, E>*>& to,
-                             const ShortestPath::CostFunc<N, E, C>& costFunc,
-                             const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                             const util::graph::CostFunc<N, E, C>& costFunc,
+                             const util::graph::HeurFunc<N, E, C>& heurFunc,
                              EList<N, E>* resEdges, NList<N, E>* resNodes) {
   Settled<N, E, C> settled;
   PQ<N, E, C> pq;
@@ -61,12 +61,16 @@ C Dijkstra::shortestPathImpl(const std::set<Node<N, E>*> from,
   RouteNode<N, E, C> cur;
 
   while (!pq.empty()) {
-    Dijkstra::ITERS++;
-
-    if (settled.find(pq.top().n) != settled.end()) {
-      pq.pop();
-      continue;
+    if (costFunc.inf() <= pq.top().h) return costFunc.inf();
+    auto se = settled.find(pq.top().n);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.top().d) {
+        pq.pop();
+        continue;
+      }
     }
+    Dijkstra::ITERS++;
 
     cur = pq.top();
     pq.pop();
@@ -92,8 +96,8 @@ C Dijkstra::shortestPathImpl(const std::set<Node<N, E>*> from,
 template <typename N, typename E, typename C>
 std::unordered_map<Node<N, E>*, C> Dijkstra::shortestPathImpl(
     Node<N, E>* from, const std::set<Node<N, E>*>& to,
-    const ShortestPath::CostFunc<N, E, C>& costFunc,
-    const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+    const util::graph::CostFunc<N, E, C>& costFunc,
+    const util::graph::HeurFunc<N, E, C>& heurFunc,
     std::unordered_map<Node<N, E>*, EList<N, E>*> resEdges,
     std::unordered_map<Node<N, E>*, NList<N, E>*> resNodes) {
   std::unordered_map<Node<N, E>*, C> costs;
@@ -112,12 +116,16 @@ std::unordered_map<Node<N, E>*, C> Dijkstra::shortestPathImpl(
   RouteNode<N, E, C> cur;
 
   while (!pq.empty()) {
-    Dijkstra::ITERS++;
-
-    if (settled.find(pq.top().n) != settled.end()) {
-      pq.pop();
-      continue;
+    if (costFunc.inf() <= pq.top().h) return costs;
+    auto se = settled.find(pq.top().n);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.top().d) {
+        pq.pop();
+        continue;
+      }
     }
+    Dijkstra::ITERS++;
 
     cur = pq.top();
     pq.pop();
@@ -147,29 +155,41 @@ std::unordered_map<Node<N, E>*, C> Dijkstra::shortestPathImpl(
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
 void Dijkstra::relax(RouteNode<N, E, C>& cur, const std::set<Node<N, E>*>& to,
-                     const ShortestPath::CostFunc<N, E, C>& costFunc,
-                     const ShortestPath::HeurFunc<N, E, C>& heurFunc, PQ<N, E, C>& pq) {
+                     const util::graph::CostFunc<N, E, C>& costFunc,
+                     const util::graph::HeurFunc<N, E, C>& heurFunc,
+                     PQ<N, E, C>& pq) {
   for (auto edge : cur.n->getAdjListOut()) {
     C newC = costFunc(cur.n, edge, edge->getOtherNd(cur.n));
     newC = cur.d + newC;
+    if (newC < cur.d) continue; // cost overflow!
     if (costFunc.inf() <= newC) continue;
 
-    const C& newH = newC + heurFunc(edge->getOtherNd(cur.n), to);
+    // addition done here to avoid it in the PQ
+    auto h = heurFunc(edge->getOtherNd(cur.n), to);
+    if (costFunc.inf() <= h) continue;
 
-    pq.emplace(edge->getOtherNd(cur.n), cur.n, newC, newH, &(*edge));
+    const C& newH = newC + h;
+
+    if (newH < newC) continue;  // cost overflow!
+
+    pq.emplace(edge->getOtherNd(cur.n), cur.n, newC, newH);
   }
 }
 
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
-void Dijkstra::buildPath(Node<N, E>* curN,
-                         Settled<N, E, C>& settled, NList<N, E>* resNodes,
-                         EList<N, E>* resEdges) {
-  while (true) {
+void Dijkstra::buildPath(Node<N, E>* curN, Settled<N, E, C>& settled,
+                         NList<N, E>* resNodes, EList<N, E>* resEdges) {
+  while (resNodes || resEdges) {
     const RouteNode<N, E, C>& curNode = settled[curN];
     if (resNodes) resNodes->push_back(curNode.n);
     if (!curNode.parent) break;
-    if (resEdges) resEdges->push_back(curNode.e);
+
+    if (resEdges) {
+      for (auto e : curNode.n->getAdjListIn()) {
+        if (e->getOtherNd(curNode.n) == curNode.parent) resEdges->push_back(e);
+      }
+    }
     curN = curNode.parent;
   }
 }
diff --git a/src/util/graph/DirGraph.h b/src/util/graph/DirGraph.h
index 9ad27d0..895b3d7 100644
--- a/src/util/graph/DirGraph.h
+++ b/src/util/graph/DirGraph.h
@@ -21,8 +21,6 @@ using UndirEdge = Edge<N, E>;
 template <typename N, typename E>
 class DirGraph : public Graph<N, E> {
  public:
-  explicit DirGraph();
-
   using Graph<N, E>::addEdg;
 
   Node<N, E>* addNd();
diff --git a/src/util/graph/DirGraph.tpp b/src/util/graph/DirGraph.tpp
index 017d216..d3a03b9 100644
--- a/src/util/graph/DirGraph.tpp
+++ b/src/util/graph/DirGraph.tpp
@@ -2,10 +2,6 @@
 // Chair of Algorithms and Data Structures.
 // Authors: Patrick Brosi <brosi@informatik.uni-freiburg.de>
 
-// _____________________________________________________________________________
-template <typename N, typename E>
-DirGraph<N, E>::DirGraph() {}
-
 // _____________________________________________________________________________
 template <typename N, typename E>
 Node<N, E>* DirGraph<N, E>::addNd(const N& pl) {
@@ -21,7 +17,7 @@ Node<N, E>* DirGraph<N, E>::addNd() {
 // _____________________________________________________________________________
 template <typename N, typename E>
 Node<N, E>* DirGraph<N, E>::addNd(DirNode<N, E>* n) {
-  auto ins = Graph<N, E>::getNds()->insert(n);
+  auto ins = Graph<N, E>::_nodes.insert(n);
   return *ins.first;
 }
 
diff --git a/src/util/graph/DirNode.tpp b/src/util/graph/DirNode.tpp
index a4d1129..3252193 100644
--- a/src/util/graph/DirNode.tpp
+++ b/src/util/graph/DirNode.tpp
@@ -69,7 +69,7 @@ void DirNode<N, E>::removeEdge(Edge<N, E>* e) {
     if (p != _adjListIn.end()) _adjListIn.erase(p);
   }
 }
-//
+
 // _____________________________________________________________________________
 template <typename N, typename E>
 bool DirNode<N, E>::hasEdgeIn(const Edge<N, E>* e) const {
@@ -139,6 +139,8 @@ const N& DirNode<N, E>::pl() const {
 // _____________________________________________________________________________
 template <typename N, typename E>
 bool DirNode<N, E>::adjInContains(const Edge<N, E>* e) const {
+  // this is faster than a binary search as the adjacency lists are typically
+  // very small for our use cases
   for (size_t i = 0; i < _adjListIn.size(); i++)
     if (_adjListIn[i] == e) return true;
   return false;
@@ -147,6 +149,8 @@ bool DirNode<N, E>::adjInContains(const Edge<N, E>* e) const {
 // _____________________________________________________________________________
 template <typename N, typename E>
 bool DirNode<N, E>::adjOutContains(const Edge<N, E>* e) const {
+  // this is faster than a binary search as the adjacency lists are typically
+  // very small for our use cases
   for (size_t i = 0; i < _adjListOut.size(); i++)
     if (_adjListOut[i] == e) return true;
   return false;
diff --git a/src/util/graph/EDijkstra.h b/src/util/graph/EDijkstra.h
index 91a7669..72c2619 100644
--- a/src/util/graph/EDijkstra.h
+++ b/src/util/graph/EDijkstra.h
@@ -7,48 +7,84 @@
 
 #include <limits>
 #include <list>
-#include <queue>
 #include <set>
 #include <unordered_map>
+#include "util/PriorityQueue.h"
 #include "util/graph/Edge.h"
 #include "util/graph/Graph.h"
 #include "util/graph/Node.h"
 #include "util/graph/ShortestPath.h"
+#include "util/graph/radix_heap.h"
+#include "util/graph/robin/robin_map.h"
 
 namespace util {
 namespace graph {
 
+using util::graph::Edge;
 using util::graph::Graph;
 using util::graph::Node;
-using util::graph::Edge;
 
 // edge-based dijkstra - settles edges instead of nodes
 class EDijkstra : public ShortestPath<EDijkstra> {
  public:
   template <typename N, typename E, typename C>
   struct RouteEdge {
-    RouteEdge() : e(0), parent(0), d(), h(), n(0) {}
-    RouteEdge(Edge<N, E>* e) : e(e), parent(0), d(), h(), n(0) {}
+    RouteEdge() : e(0), parent(0), d(), n(0) {}
+    RouteEdge(Edge<N, E>* e) : e(e), parent(0), d(), n(0) {}
     RouteEdge(Edge<N, E>* e, Edge<N, E>* parent, Node<N, E>* n, C d)
-        : e(e), parent(parent), d(d), h(), n(n) {}
-    RouteEdge(Edge<N, E>* e, Edge<N, E>* parent, Node<N, E>* n, C d, C h)
-        : e(e), parent(parent), d(d), h(h), n(n) {}
+        : e(e), parent(parent), d(d), n(n) {}
 
     Edge<N, E>* e;
     Edge<N, E>* parent;
 
+    // the cost so far
     C d;
-    C h;
 
     Node<N, E>* n;
-
-    bool operator<(const RouteEdge<N, E, C>& p) const {
-      return h > p.h || (h == p.h && d > p.d);
-    }
   };
 
   template <typename N, typename E, typename C>
-  struct CostFunc : public ShortestPath::CostFunc<N, E, C> {
+  struct RouteEdgeInit {
+    RouteEdgeInit() : e(0), parent(0), d(), dwi(), n(0) {}
+    RouteEdgeInit(Edge<N, E>* e) : e(e), parent(0), d(), dwi(), n(0) {}
+    RouteEdgeInit(Edge<N, E>* e, Edge<N, E>* parent, Node<N, E>* n, C d)
+        : e(e), parent(parent), d(d), dwi(), n(n) {}
+    RouteEdgeInit(Edge<N, E>* e, Edge<N, E>* parent, Node<N, E>* n, C d, C dwi)
+        : e(e), parent(parent), d(d), dwi(dwi), n(n) {}
+
+    Edge<N, E>* e;
+    Edge<N, E>* parent;
+
+    // the cost so far
+    C d;
+
+    // the cost without the initial costs
+    C dwi;
+
+    Node<N, E>* n;
+  };
+
+  template <typename N, typename E, typename C>
+  struct RouteEdgeInitNoRes {
+    RouteEdgeInitNoRes() : e(0), parent(0), d(), dwi() {}
+    RouteEdgeInitNoRes(Edge<N, E>* e) : e(e), parent(0), d(), dwi() {}
+    RouteEdgeInitNoRes(Edge<N, E>* e, Edge<N, E>* parent, C d)
+        : e(e), parent(parent), d(d), dwi() {}
+    RouteEdgeInitNoRes(Edge<N, E>* e, Edge<N, E>* parent, C d, C dwi)
+        : e(e), parent(parent), d(d), dwi(dwi) {}
+
+    Edge<N, E>* e;
+    Edge<N, E>* parent;
+
+    // the cost so far
+    C d;
+
+    // the cost without the initial costs
+    C dwi;
+  };
+
+  template <typename N, typename E, typename C>
+  struct CostFunc : public util::graph::CostFunc<N, E, C> {
     C operator()(const Node<N, E>* from, const Edge<N, E>* e,
                  const Node<N, E>* to) const {
       UNUSED(from);
@@ -59,7 +95,7 @@ class EDijkstra : public ShortestPath<EDijkstra> {
   };
 
   template <typename N, typename E, typename C>
-  struct HeurFunc : public ShortestPath::HeurFunc<N, E, C> {
+  struct HeurFunc : public util::graph::HeurFunc<N, E, C> {
     C operator()(const Node<N, E>* from,
                  const std::set<Node<N, E>*>& to) const {
       UNUSED(from);
@@ -69,71 +105,119 @@ class EDijkstra : public ShortestPath<EDijkstra> {
   };
 
   template <typename N, typename E, typename C>
-  using Settled = std::unordered_map<Edge<N, E>*, RouteEdge<N, E, C> >;
+  using Settled = tsl::robin_map<Edge<N, E>*, RouteEdge<N, E, C>>;
 
   template <typename N, typename E, typename C>
-  using PQ = std::priority_queue<RouteEdge<N, E, C> >;
+  using PQ = radix_heap::pair_radix_heap<C, RouteEdge<N, E, C>>;
+
+  template <typename N, typename E, typename C>
+  using SettledInit = tsl::robin_map<Edge<N, E>*, RouteEdgeInit<N, E, C>>;
+
+  template <typename N, typename E, typename C>
+  using SettledInitNoRes = tsl::robin_map<Edge<N, E>*, RouteEdgeInitNoRes<N, E, C>>;
+
+  template <typename N, typename E, typename C>
+  using PQInit = radix_heap::pair_radix_heap<C, RouteEdgeInit<N, E, C>>;
+
+  template <typename N, typename E, typename C>
+  using PQInitNoRes = radix_heap::pair_radix_heap<C, RouteEdgeInitNoRes<N, E, C>>;
 
   template <typename N, typename E, typename C>
   static C shortestPathImpl(const std::set<Edge<N, E>*> from,
                             const std::set<Edge<N, E>*>& to,
-                            const ShortestPath::CostFunc<N, E, C>& costFunc,
-                            const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
                             EList<N, E>* resEdges, NList<N, E>* resNodes);
 
   template <typename N, typename E, typename C>
   static C shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
-                            const ShortestPath::CostFunc<N, E, C>& costFunc,
-                            const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
                             EList<N, E>* resEdges, NList<N, E>* resNodes);
 
   template <typename N, typename E, typename C>
   static C shortestPathImpl(Edge<N, E>* from, const std::set<Node<N, E>*>& to,
-                            const ShortestPath::CostFunc<N, E, C>& costFunc,
-                            const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
                             EList<N, E>* resEdges, NList<N, E>* resNodes);
 
   template <typename N, typename E, typename C>
   static C shortestPathImpl(const std::set<Edge<N, E>*>& from,
                             const std::set<Node<N, E>*>& to,
-                            const ShortestPath::CostFunc<N, E, C>& costFunc,
-                            const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc,
                             EList<N, E>* resEdges, NList<N, E>* resNodes);
 
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPathImpl(
       const std::set<Edge<N, E>*>& from,
-      const ShortestPath::CostFunc<N, E, C>& costFunc, bool rev);
+      const util::graph::CostFunc<N, E, C>& costFunc, bool rev);
 
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPathImpl(
       Edge<N, E>* from, const std::set<Edge<N, E>*>& to,
-      const ShortestPath::CostFunc<N, E, C>& costFunc,
-      const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+      const util::graph::CostFunc<N, E, C>& costFunc,
+      const util::graph::HeurFunc<N, E, C>& heurFunc,
       std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
       std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes);
 
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPathImpl(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts, C stall,
+      const util::graph::CostFunc<N, E, C>& costFunc,
+      const util::graph::HeurFunc<N, E, C>& heurFunc,
+      std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
+      std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes);
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, std::pair<Edge<N, E>*, C>>
+  shortestPathImpl(const std::set<Edge<N, E>*>& from,
+                   const std::set<Edge<N, E>*>& to,
+                   const std::unordered_map<Edge<N, E>*, C>& initCosts, C stall,
+                   const util::graph::CostFunc<N, E, C>& costFunc,
+                   const util::graph::HeurFunc<N, E, C>& heurFunc);
+
   template <typename N, typename E, typename C>
   static void buildPath(Edge<N, E>* curE, const Settled<N, E, C>& settled,
                         NList<N, E>* resNodes, EList<N, E>* resEdges);
 
+  template <typename N, typename E, typename C>
+  static void buildPathInit(Edge<N, E>* curE,
+                            const SettledInit<N, E, C>& settled,
+                            NList<N, E>* resNodes, EList<N, E>* resEdges);
+
   template <typename N, typename E, typename C>
   static inline void relax(RouteEdge<N, E, C>& cur,
                            const std::set<Edge<N, E>*>& to,
-                           const ShortestPath::CostFunc<N, E, C>& costFunc,
-                           const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                           const util::graph::CostFunc<N, E, C>& costFunc,
+                           const util::graph::HeurFunc<N, E, C>& heurFunc,
                            PQ<N, E, C>& pq);
 
+  template <typename N, typename E, typename C>
+  static inline void relaxInit(RouteEdgeInit<N, E, C>& cur,
+                               const std::set<Edge<N, E>*>& to, C stall,
+                               const util::graph::CostFunc<N, E, C>& costFunc,
+                               const util::graph::HeurFunc<N, E, C>& heurFunc,
+                               PQInit<N, E, C>& pq);
+
+  template <typename N, typename E, typename C>
+  static inline void relaxInitNoResEdgs(RouteEdgeInitNoRes<N, E, C>& cur,
+                               const std::set<Edge<N, E>*>& to, C stall,
+                               const util::graph::CostFunc<N, E, C>& costFunc,
+                               const util::graph::HeurFunc<N, E, C>& heurFunc,
+                               PQInitNoRes<N, E, C>& pq);
+
   template <typename N, typename E, typename C>
   static void relaxInv(RouteEdge<N, E, C>& cur,
-                      const ShortestPath::CostFunc<N, E, C>& costFunc,
-                      PQ<N, E, C>& pq);
+                       const util::graph::CostFunc<N, E, C>& costFunc,
+                       PQ<N, E, C>& pq);
 
   static size_t ITERS;
 };
 
 #include "util/graph/EDijkstra.tpp"
-}
-}
+}  // namespace graph
+}  // namespace util
 
 #endif  // UTIL_GRAPH_DIJKSTRA_H_
diff --git a/src/util/graph/EDijkstra.tpp b/src/util/graph/EDijkstra.tpp
index 1bb38b0..fa1df51 100644
--- a/src/util/graph/EDijkstra.tpp
+++ b/src/util/graph/EDijkstra.tpp
@@ -5,8 +5,8 @@
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
 C EDijkstra::shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
-                              const ShortestPath::CostFunc<N, E, C>& costFunc,
-                              const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                              const util::graph::CostFunc<N, E, C>& costFunc,
+                              const util::graph::HeurFunc<N, E, C>& heurFunc,
                               EList<N, E>* resEdges, NList<N, E>* resNodes) {
   std::set<Edge<N, E>*> frEs;
   std::set<Edge<N, E>*> toEs;
@@ -28,8 +28,8 @@ C EDijkstra::shortestPathImpl(Node<N, E>* from, const std::set<Node<N, E>*>& to,
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
 C EDijkstra::shortestPathImpl(Edge<N, E>* from, const std::set<Node<N, E>*>& to,
-                              const ShortestPath::CostFunc<N, E, C>& costFunc,
-                              const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                              const util::graph::CostFunc<N, E, C>& costFunc,
+                              const util::graph::HeurFunc<N, E, C>& heurFunc,
                               EList<N, E>* resEdges, NList<N, E>* resNodes) {
   std::set<Edge<N, E>*> frEs;
   std::set<Edge<N, E>*> toEs;
@@ -49,8 +49,8 @@ C EDijkstra::shortestPathImpl(Edge<N, E>* from, const std::set<Node<N, E>*>& to,
 template <typename N, typename E, typename C>
 C EDijkstra::shortestPathImpl(const std::set<Edge<N, E>*> from,
                               const std::set<Edge<N, E>*>& to,
-                              const ShortestPath::CostFunc<N, E, C>& costFunc,
-                              const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+                              const util::graph::CostFunc<N, E, C>& costFunc,
+                              const util::graph::HeurFunc<N, E, C>& heurFunc,
                               EList<N, E>* resEdges, NList<N, E>* resNodes) {
   if (from.size() == 0 || to.size() == 0) return costFunc.inf();
 
@@ -63,20 +63,24 @@ C EDijkstra::shortestPathImpl(const std::set<Edge<N, E>*> from,
   for (auto e : from) {
     C c = costFunc(0, 0, e);
     C h = heurFunc(e, to);
-    pq.emplace(e, (Edge<N, E>*)0, (Node<N, E>*)0, c, c + h);
+    pq.push(c + h, {e, (Edge<N, E>*)0, (Node<N, E>*)0, c});
   }
 
   RouteEdge<N, E, C> cur;
 
   while (!pq.empty()) {
+    if (costFunc.inf() <= pq.topKey()) return costFunc.inf();
+    auto se = settled.find(pq.topVal().e);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.topVal().d) {
+        pq.pop();
+        continue;
+      }
+    }
     EDijkstra::ITERS++;
 
-    if (settled.find(pq.top().e) != settled.end()) {
-      pq.pop();
-      continue;
-    }
-
-    cur = pq.top();
+    cur = pq.topVal();
     pq.pop();
 
     settled[cur.e] = cur;
@@ -99,8 +103,8 @@ C EDijkstra::shortestPathImpl(const std::set<Edge<N, E>*> from,
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
 std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
-    const std::set<Edge<N, E>*>& from, const ShortestPath::CostFunc<N, E, C>& costFunc,
-    bool rev) {
+    const std::set<Edge<N, E>*>& from,
+    const util::graph::CostFunc<N, E, C>& costFunc, bool rev) {
   std::unordered_map<Edge<N, E>*, C> costs;
 
   Settled<N, E, C> settled;
@@ -109,20 +113,23 @@ std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
   std::set<Edge<N, E>*> to;
 
   for (auto e : from) {
-    pq.emplace(e, (Edge<N, E>*)0, (Node<N, E>*)0, costFunc(0, 0, e), C());
+    pq.push(C(), {e, (Edge<N, E>*)0, (Node<N, E>*)0, costFunc(0, 0, e)});
   }
 
   RouteEdge<N, E, C> cur;
 
   while (!pq.empty()) {
+    auto se = settled.find(pq.topVal().e);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.topVal().d) {
+        pq.pop();
+        continue;
+      }
+    }
     EDijkstra::ITERS++;
 
-    if (settled.find(pq.top().e) != settled.end()) {
-      pq.pop();
-      continue;
-    }
-
-    cur = pq.top();
+    cur = pq.topVal();
     pq.pop();
 
     settled[cur.e] = cur;
@@ -143,8 +150,8 @@ std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
 template <typename N, typename E, typename C>
 std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
     Edge<N, E>* from, const std::set<Edge<N, E>*>& to,
-    const ShortestPath::CostFunc<N, E, C>& costFunc,
-    const ShortestPath::HeurFunc<N, E, C>& heurFunc,
+    const util::graph::CostFunc<N, E, C>& costFunc,
+    const util::graph::HeurFunc<N, E, C>& heurFunc,
     std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
     std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes) {
   std::unordered_map<Edge<N, E>*, C> costs;
@@ -160,19 +167,23 @@ std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
 
   C c = costFunc(0, 0, from);
   C h = heurFunc(from, to);
-  pq.emplace(from, (Edge<N, E>*)0, (Node<N, E>*)0, c, c + h);
+  pq.push(c + h, {from, (Edge<N, E>*)0, (Node<N, E>*)0, c});
 
   RouteEdge<N, E, C> cur;
 
   while (!pq.empty()) {
+    if (costFunc.inf() <= pq.topKey()) return costs;
+    auto se = settled.find(pq.topVal().e);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.topVal().d) {
+        pq.pop();
+        continue;
+      }
+    }
     EDijkstra::ITERS++;
 
-    if (settled.find(pq.top().e) != settled.end()) {
-      pq.pop();
-      continue;
-    }
-
-    cur = pq.top();
+    cur = pq.topVal();
     pq.pop();
 
     settled[cur.e] = cur;
@@ -193,10 +204,148 @@ std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
 
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
-void EDijkstra::relaxInv(RouteEdge<N, E, C>& cur,
-                         const ShortestPath::CostFunc<N, E, C>& costFunc,
-                         PQ<N, E, C>& pq) {
+std::unordered_map<Edge<N, E>*, C> EDijkstra::shortestPathImpl(
+    const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+    const std::unordered_map<Edge<N, E>*, C>& initCosts, C stall,
+    const util::graph::CostFunc<N, E, C>& costFunc,
+    const util::graph::HeurFunc<N, E, C>& heurFunc,
+    std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
+    std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes) {
+  /**
+   * Shortest paths from the set <from> to ALL nodes in <TO>, but
+   * init <from> nodes with costs (this is equivalent to adding an auxiliary
+   * node S, connecting it with directed edges to all <from>, setting the
+   * costs of these edges to the initial costs and run a 1->N Dijkstra from S
+   **/
 
+  std::unordered_map<Edge<N, E>*, C> costs;
+  if (to.size() == 0) return costs;
+
+  // init costs with inf
+  for (auto e : to) costs[e] = costFunc.inf();
+
+  SettledInit<N, E, C> settled;
+  PQInit<N, E, C> pq;
+
+  size_t found = 0;
+
+  // put all nodes in from onto the PQ with their initial costs, also set
+  // the initial cost as a heuristic starting point!
+  for (auto e : from) {
+    C iCost = initCosts.find(e)->second;
+    assert(iCost + heurFunc(e, to) >= iCost);
+    pq.push(iCost + heurFunc(e, to),
+            {e, (Edge<N, E>*)0, (Node<N, E>*)0, iCost});
+  }
+
+  RouteEdgeInit<N, E, C> cur;
+
+  while (!pq.empty()) {
+    if (costFunc.inf() <= pq.topKey()) return costs;
+    if (stall <= pq.topVal().dwi) return costs;
+    auto se = settled.find(pq.topVal().e);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.topVal().d) {
+        pq.pop();
+        continue;
+      }
+    }
+    EDijkstra::ITERS++;
+
+    cur = pq.topVal();
+    pq.pop();
+
+    settled[cur.e] = cur;
+
+    if (to.find(cur.e) != to.end()) {
+      found++;
+      costs[cur.e] = cur.d;
+      buildPathInit(cur.e, settled, resNodes[cur.e], resEdges[cur.e]);
+
+      if (found == to.size()) return costs;
+    }
+
+    relaxInit(cur, to, stall, costFunc, heurFunc, pq);
+  }
+
+  return costs;
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+std::unordered_map<Edge<N, E>*, std::pair<Edge<N, E>*, C>>
+EDijkstra::shortestPathImpl(const std::set<Edge<N, E>*>& from,
+                            const std::set<Edge<N, E>*>& to,
+                            const std::unordered_map<Edge<N, E>*, C>& initCosts,
+                            C stall,
+                            const util::graph::CostFunc<N, E, C>& costFunc,
+                            const util::graph::HeurFunc<N, E, C>& heurFunc) {
+  /**
+   * Shortest paths from the set <from> to ALL nodes in <TO>, but
+   * init <from> nodes with costs (this is equivalent to adding an auxiliary
+   * node S, connecting it with directed edges to all <from>, setting the
+   * costs of these edges to the initial costs and run a 1->N Dijkstra from S
+   **/
+
+  std::unordered_map<Edge<N, E>*, std::pair<Edge<N, E>*, C>> costs;
+  if (to.size() == 0) return costs;
+
+  // init costs with inf
+  for (auto e : to) costs[e] = {0, costFunc.inf()};
+
+  SettledInitNoRes<N, E, C> settled;
+  PQInitNoRes<N, E, C> pq;
+
+  size_t found = 0;
+
+  // put all nodes in from onto the PQ with their initial costs, also set
+  // the initial cost as a heuristic starting point!
+  // set the parent to the edge itself - in this version, the parent is ALWAYS
+  // the start edge, as we don't need the exact paths later on
+  for (auto e : from) {
+    C iCost = initCosts.find(e)->second;
+    assert(iCost + heurFunc(e, to) >= iCost);
+    pq.push(iCost + heurFunc(e, to), {e, e, iCost});
+  }
+
+  RouteEdgeInitNoRes<N, E, C> cur;
+
+  while (!pq.empty()) {
+    if (costFunc.inf() <= pq.topKey()) return costs;
+    if (stall <= pq.topVal().dwi) return costs;
+    auto se = settled.find(pq.topVal().e);
+    if (se != settled.end()) {
+      // to allow non-consistent heuristics
+      if (se->second.d <= pq.topVal().d) {
+        pq.pop();
+        continue;
+      }
+    }
+    EDijkstra::ITERS++;
+
+    cur = pq.topVal();
+    pq.pop();
+
+    settled[cur.e] = cur;
+
+    if (to.find(cur.e) != to.end()) {
+      found++;
+      costs[cur.e] = {cur.parent, cur.d};
+      if (found == to.size()) return costs;
+    }
+
+    relaxInitNoResEdgs(cur, to, stall, costFunc, heurFunc, pq);
+  }
+
+  return costs;
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+void EDijkstra::relaxInv(RouteEdge<N, E, C>& cur,
+                         const util::graph::CostFunc<N, E, C>& costFunc,
+                         PQ<N, E, C>& pq) {
   // handling undirected graph makes no sense here
 
   for (const auto edge : cur.e->getFrom()->getAdjListIn()) {
@@ -204,42 +353,161 @@ void EDijkstra::relaxInv(RouteEdge<N, E, C>& cur,
     C newC = costFunc(edge, cur.e->getFrom(), cur.e);
     newC = cur.d + newC;
     if (costFunc.inf() <= newC) continue;
+    if (newC < cur.d) continue;  // cost overflow!
 
-    pq.emplace(edge, cur.e, cur.e->getFrom(), newC, C());
+    pq.push(C(), {edge, cur.e, cur.e->getFrom(), newC});
   }
 }
 
 // _____________________________________________________________________________
 template <typename N, typename E, typename C>
-void EDijkstra::relax(RouteEdge<N, E, C>& cur, const std::set<Edge<N, E>*>& to,
-                      const ShortestPath::CostFunc<N, E, C>& costFunc,
-                      const ShortestPath::HeurFunc<N, E, C>& heurFunc,
-                      PQ<N, E, C>& pq) {
-  if (cur.e->getFrom()->hasEdgeIn(cur.e)) {
+void EDijkstra::relaxInitNoResEdgs(
+    RouteEdgeInitNoRes<N, E, C>& cur, const std::set<Edge<N, E>*>& to, C stall,
+    const util::graph::CostFunc<N, E, C>& costFunc,
+    const util::graph::HeurFunc<N, E, C>& heurFunc, PQInitNoRes<N, E, C>& pq) {
+  if (cur.e->getFrom()->hasEdgeIn(cur.e) &&
+      cur.e->getFrom() != cur.e->getTo()) {
     // for undirected graphs
     for (const auto edge : cur.e->getFrom()->getAdjListOut()) {
       if (edge == cur.e) continue;
       C newC = costFunc(cur.e, cur.e->getFrom(), edge);
+      C newDwi = cur.dwi + newC;
+
+      if (stall <= newDwi) continue;
+
+      if (costFunc.inf() <= newC) continue;
       newC = cur.d + newC;
+      if (newC < cur.d) continue;  // cost overflow!
+
       if (costFunc.inf() <= newC) continue;
 
       const C& h = heurFunc(edge, to);
+      if (costFunc.inf() <= h) continue;
+      newC = cur.d + newC;
       const C& newH = newC + h;
+      if (newH < newC) continue;  // cost overflow!
 
-      pq.emplace(edge, cur.e, cur.e->getFrom(), newC, newH);
+      pq.push(newH, {edge, cur.parent, newC, newDwi});
     }
   }
 
   for (const auto edge : cur.e->getTo()->getAdjListOut()) {
     if (edge == cur.e) continue;
     C newC = costFunc(cur.e, cur.e->getTo(), edge);
+    C newDwi = cur.dwi + newC;
+
+    if (stall <= newDwi) continue;
+
+    if (costFunc.inf() <= newC) continue;
     newC = cur.d + newC;
+    if (newC < cur.d) continue;  // cost overflow!
+
     if (costFunc.inf() <= newC) continue;
 
     const C& h = heurFunc(edge, to);
+    if (costFunc.inf() <= h) continue;
     const C& newH = newC + h;
+    if (newH < newC) continue;  // cost overflow!
 
-    pq.emplace(edge, cur.e, cur.e->getTo(), newC, newH);
+    pq.push(newH, {edge, cur.parent, newC, newDwi});
+  }
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+void EDijkstra::relaxInit(RouteEdgeInit<N, E, C>& cur,
+                          const std::set<Edge<N, E>*>& to, C stall,
+                          const util::graph::CostFunc<N, E, C>& costFunc,
+                          const util::graph::HeurFunc<N, E, C>& heurFunc,
+                          PQInit<N, E, C>& pq) {
+  if (cur.e->getFrom()->hasEdgeIn(cur.e) &&
+      cur.e->getFrom() != cur.e->getTo()) {
+    // for undirected graphs
+    for (const auto edge : cur.e->getFrom()->getAdjListOut()) {
+      if (edge == cur.e) continue;
+      C newC = costFunc(cur.e, cur.e->getFrom(), edge);
+      C newDwi = cur.dwi + newC;
+
+      if (stall <= newDwi) continue;
+
+      if (costFunc.inf() <= newC) continue;
+      newC = cur.d + newC;
+      if (newC < cur.d) continue;  // cost overflow!
+
+      if (costFunc.inf() <= newC) continue;
+
+      const C& h = heurFunc(edge, to);
+      if (costFunc.inf() <= h) continue;
+      newC = cur.d + newC;
+      const C& newH = newC + h;
+      if (newH < newC) continue;  // cost overflow!
+
+      pq.push(newH, {edge, cur.e, cur.e->getFrom(), newC, newDwi});
+    }
+  }
+
+  for (const auto edge : cur.e->getTo()->getAdjListOut()) {
+    if (edge == cur.e) continue;
+    C newC = costFunc(cur.e, cur.e->getTo(), edge);
+    C newDwi = cur.dwi + newC;
+
+    if (stall <= newDwi) continue;
+
+    if (costFunc.inf() <= newC) continue;
+    newC = cur.d + newC;
+    if (newC < cur.d) continue;  // cost overflow!
+
+    if (costFunc.inf() <= newC) continue;
+
+    const C& h = heurFunc(edge, to);
+    if (costFunc.inf() <= h) continue;
+    const C& newH = newC + h;
+    if (newH < newC) continue;  // cost overflow!
+
+    pq.push(newH, {edge, cur.e, cur.e->getTo(), newC, newDwi});
+  }
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+void EDijkstra::relax(RouteEdge<N, E, C>& cur, const std::set<Edge<N, E>*>& to,
+                      const util::graph::CostFunc<N, E, C>& costFunc,
+                      const util::graph::HeurFunc<N, E, C>& heurFunc,
+                      PQ<N, E, C>& pq) {
+  if (cur.e->getFrom()->hasEdgeIn(cur.e) &&
+      cur.e->getFrom() != cur.e->getTo()) {
+    // for undirected graphs
+    for (const auto edge : cur.e->getFrom()->getAdjListOut()) {
+      if (edge == cur.e) continue;
+      C newC = costFunc(cur.e, cur.e->getFrom(), edge);
+      if (costFunc.inf() <= newC) continue;
+      newC = cur.d + newC;
+      if (newC < cur.d) continue;  // cost overflow!
+      if (costFunc.inf() <= newC) continue;
+
+      const C& h = heurFunc(edge, to);
+      if (costFunc.inf() <= h) continue;
+      const C& newH = newC + h;
+      if (newH < newC) continue;  // cost overflow!
+
+      pq.push(newH, {edge, cur.e, cur.e->getFrom(), newC});
+    }
+  }
+
+  for (const auto edge : cur.e->getTo()->getAdjListOut()) {
+    if (edge == cur.e) continue;
+    C newC = costFunc(cur.e, cur.e->getTo(), edge);
+    if (costFunc.inf() <= newC) continue;
+    newC = cur.d + newC;
+    if (newC < cur.d) continue;  // cost overflow!
+    if (costFunc.inf() <= newC) continue;
+
+    const C& h = heurFunc(edge, to);
+    if (costFunc.inf() <= h) continue;
+    const C& newH = newC + h;
+    if (newH < newC) continue;  // cost overflow!
+
+    pq.push(newH, {edge, cur.e, cur.e->getTo(), newC});
   }
 }
 
@@ -249,7 +517,22 @@ void EDijkstra::buildPath(Edge<N, E>* curE, const Settled<N, E, C>& settled,
                           NList<N, E>* resNodes, EList<N, E>* resEdges) {
   const RouteEdge<N, E, C>* curEdge = &settled.find(curE)->second;
   if (resNodes) resNodes->push_back(curEdge->e->getOtherNd(curEdge->n));
-  while (true) {
+  while (resNodes || resEdges) {
+    if (resNodes && curEdge->n) resNodes->push_back(curEdge->n);
+    if (resEdges) resEdges->push_back(curEdge->e);
+    if (!curEdge->parent) break;
+    curEdge = &settled.find(curEdge->parent)->second;
+  }
+}
+
+// _____________________________________________________________________________
+template <typename N, typename E, typename C>
+void EDijkstra::buildPathInit(Edge<N, E>* curE,
+                              const SettledInit<N, E, C>& settled,
+                              NList<N, E>* resNodes, EList<N, E>* resEdges) {
+  const RouteEdgeInit<N, E, C>* curEdge = &settled.find(curE)->second;
+  if (resNodes) resNodes->push_back(curEdge->e->getOtherNd(curEdge->n));
+  while (resNodes || resEdges) {
     if (resNodes && curEdge->n) resNodes->push_back(curEdge->n);
     if (resEdges) resEdges->push_back(curEdge->e);
     if (!curEdge->parent) break;
diff --git a/src/util/graph/Edge.h b/src/util/graph/Edge.h
index 658ea17..b81f06d 100644
--- a/src/util/graph/Edge.h
+++ b/src/util/graph/Edge.h
@@ -21,9 +21,6 @@ class Edge {
 
   Node<N, E>* getOtherNd(const Node<N, E>* notNode) const;
 
-  void setFrom(Node<N, E>* from);
-  void setTo(Node<N, E>* to);
-
   E& pl();
   const E& pl() const;
 
diff --git a/src/util/graph/Graph.h b/src/util/graph/Graph.h
index 09d0465..3c97832 100644
--- a/src/util/graph/Graph.h
+++ b/src/util/graph/Graph.h
@@ -30,15 +30,16 @@ class Graph {
   virtual Node<N, E>* mergeNds(Node<N, E>* a, Node<N, E>* b) = 0;
 
   const std::set<Node<N, E>*>& getNds() const;
-  std::set<Node<N, E>*>* getNds();
+
+  static Node<N, E>* sharedNode(const Edge<N, E>* a, const Edge<N, E>* b);
 
   typename std::set<Node<N, E>*>::iterator delNd(Node<N, E>* n);
   typename std::set<Node<N, E>*>::iterator delNd(
       typename std::set<Node<N, E>*>::iterator i);
   void delEdg(Node<N, E>* from, Node<N, E>* to);
 
- private:
-  std::set<Node<N, E>*> _nodes;
+ protected:
+   std::set<Node<N, E>*> _nodes;
 };
 
 #include "util/graph/Graph.tpp"
diff --git a/src/util/graph/Graph.tpp b/src/util/graph/Graph.tpp
index 26a82c1..00b9dd5 100644
--- a/src/util/graph/Graph.tpp
+++ b/src/util/graph/Graph.tpp
@@ -20,12 +20,6 @@ const std::set<Node<N, E>*>& Graph<N, E>::getNds() const {
   return _nodes;
 }
 
-// _____________________________________________________________________________
-template <typename N, typename E>
-std::set<Node<N, E>*>* Graph<N, E>::getNds() {
-  return &_nodes;
-}
-
 // _____________________________________________________________________________
 template <typename N, typename E>
 typename std::set<Node<N, E>*>::iterator Graph<N, E>::delNd(
@@ -65,6 +59,17 @@ Edge<N, E>* Graph<N, E>::getEdg(Node<N, E>* from, Node<N, E>* to) {
   return 0;
 }
 
+// _____________________________________________________________________________
+template <typename N, typename E>
+Node<N, E>* Graph<N, E>::sharedNode(const Edge<N, E>* a, const Edge<N, E>* b) {
+  Node<N, E>* r = 0;
+  if (a->getFrom() == b->getFrom() || a->getFrom() == b->getTo())
+    r = a->getFrom();
+  if (a->getTo() == b->getFrom() || a->getTo() == b->getTo()) r = a->getTo();
+  return r;
+}
+
+
 // _____________________________________________________________________________
 template <typename N, typename E>
 const Edge<N, E>* Graph<N, E>::getEdg(Node<N, E>* from, Node<N, E>* to) const {
diff --git a/src/util/graph/Node.h b/src/util/graph/Node.h
index f962dc8..378bcb0 100644
--- a/src/util/graph/Node.h
+++ b/src/util/graph/Node.h
@@ -5,8 +5,8 @@
 #ifndef UTIL_GRAPH_NODE_H_
 #define UTIL_GRAPH_NODE_H_
 
-#include <vector>
 #include <cstddef>
+#include <vector>
 
 namespace util {
 namespace graph {
@@ -43,6 +43,7 @@ class Node {
 template <typename N, typename E>
 inline Node<N, E>::~Node() {}
 
-}}
+}  // namespace graph
+}  // namespace util
 
 #endif  // UTIL_GRAPH_NODE_H_
diff --git a/src/util/graph/ShortestPath.h b/src/util/graph/ShortestPath.h
index e75bd0a..99a7e81 100644
--- a/src/util/graph/ShortestPath.h
+++ b/src/util/graph/ShortestPath.h
@@ -19,9 +19,46 @@
 namespace util {
 namespace graph {
 
+using util::graph::Edge;
 using util::graph::Graph;
 using util::graph::Node;
-using util::graph::Edge;
+
+template <typename N, typename E>
+using EList = std::vector<Edge<N, E>*>;
+
+template <typename N, typename E>
+using NList = std::vector<Node<N, E>*>;
+
+template <typename N, typename E, typename C>
+struct CostFunc {
+  virtual C operator()(const Node<N, E>* from, const Edge<N, E>* e,
+                       const Node<N, E>* to) const = 0;
+  virtual C operator()(const Edge<N, E>* from, const Node<N, E>* n,
+                       const Edge<N, E>* to) const = 0;
+  virtual C inf() const = 0;
+};
+
+template <typename N, typename E, typename C>
+struct HeurFunc {
+  virtual C operator()(const Node<N, E>* a,
+                       const std::set<Node<N, E>*>& b) const = 0;
+  virtual C operator()(const Edge<N, E>* a,
+                       const std::set<Edge<N, E>*>& b) const = 0;
+};
+
+template <typename N, typename E, typename C>
+struct ZeroHeurFunc : public HeurFunc<N, E, C> {
+  C operator()(const Node<N, E>* a, const std::set<Node<N, E>*>& b) const {
+    UNUSED(a);
+    UNUSED(b);
+    return C();
+  }
+  C operator()(const Edge<N, E>* a, const std::set<Edge<N, E>*>& b) const {
+    UNUSED(a);
+    UNUSED(b);
+    return C();
+  }
+};
 
 // shortest path base class
 template <class D>
@@ -33,37 +70,6 @@ class ShortestPath {
   template <typename N, typename E>
   using NList = std::vector<Node<N, E>*>;
 
-  template <typename N, typename E, typename C>
-  struct CostFunc {
-    virtual C operator()(const Node<N, E>* from, const Edge<N, E>* e,
-                         const Node<N, E>* to) const = 0;
-    virtual C operator()(const Edge<N, E>* from, const Node<N, E>* n,
-                         const Edge<N, E>* to) const = 0;
-    virtual C inf() const = 0;
-  };
-
-  template <typename N, typename E, typename C>
-  struct HeurFunc {
-    virtual C operator()(const Node<N, E>* a,
-                         const std::set<Node<N, E>*>& b) const = 0;
-    virtual C operator()(const Edge<N, E>* a,
-                         const std::set<Edge<N, E>*>& b) const = 0;
-  };
-
-  template <typename N, typename E, typename C>
-  struct ZeroHeurFunc : public HeurFunc<N, E, C> {
-    C operator()(const Node<N, E>* a, const std::set<Node<N, E>*>& b) const {
-      UNUSED(a);
-      UNUSED(b);
-      return C();
-    }
-    C operator()(const Edge<N, E>* a, const std::set<Edge<N, E>*>& b) const {
-      UNUSED(a);
-      UNUSED(b);
-      return C();
-    }
-  };
-
   template <typename N, typename E, typename C>
   static C shortestPath(Node<N, E>* from, const std::set<Node<N, E>*>& to,
                         const CostFunc<N, E, C>& costFunc,
@@ -74,7 +80,8 @@ class ShortestPath {
   }
 
   template <typename N, typename E, typename C>
-  static C shortestPath(const std::set<Node<N, E>*> from, const std::set<Node<N, E>*>& to,
+  static C shortestPath(const std::set<Node<N, E>*> from,
+                        const std::set<Node<N, E>*>& to,
                         const CostFunc<N, E, C>& costFunc,
                         const HeurFunc<N, E, C>& heurFunc,
                         EList<N, E>* resEdges, NList<N, E>* resNodes) {
@@ -82,6 +89,15 @@ class ShortestPath {
                                resNodes);
   }
 
+  template <typename N, typename E, typename C>
+  static C shortestPath(const std::set<Node<N, E>*> from,
+                        const std::set<Node<N, E>*>& to,
+                        const CostFunc<N, E, C>& costFunc,
+                        EList<N, E>* resEdges, NList<N, E>* resNodes) {
+    return D::shortestPathImpl(from, to, costFunc, ZeroHeurFunc<N, E, C>(),
+                               resEdges, resNodes);
+  }
+
   template <typename N, typename E, typename C>
   static C shortestPath(Node<N, E>* from, const std::set<Node<N, E>*>& to,
                         const CostFunc<N, E, C>& costFunc,
@@ -160,6 +176,14 @@ class ShortestPath {
     return shortestPath(from, tos, costFunc, resEdges, resNodes);
   }
 
+  template <typename N, typename E, typename C>
+  static C shortestPath(Node<N, E>* from, const std::set<Node<N, E>*>& tos,
+                        const CostFunc<N, E, C>& costFunc) {
+    EList<N, E>* el = 0;
+    NList<N, E>* nl = 0;
+    return shortestPath(from, tos, costFunc, el, nl);
+  }
+
   template <typename N, typename E, typename C>
   static C shortestPath(Node<N, E>* from, Node<N, E>* to,
                         const CostFunc<N, E, C>& costFunc) {
@@ -263,11 +287,22 @@ class ShortestPath {
     return D::shortestPathImpl(from, to, costFunc, heurFunc, resEdges, nl);
   }
 
+  template <typename N, typename E, typename C>
+  static C shortestPath(Edge<N, E>* from, Edge<N, E>* to,
+                        const CostFunc<N, E, C>& costFunc,
+                        const HeurFunc<N, E, C>& heurFunc,
+                        EList<N, E>* resEdges) {
+    NList<N, E> dummyRet;
+    std::set<Edge<N, E>*> froms{from};
+    std::set<Edge<N, E>*> tos{to};
+    return D::shortestPathImpl(froms, tos, costFunc, heurFunc, resEdges,
+                               &dummyRet);
+  }
+
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPath(
       Edge<N, E>* from, const std::set<Edge<N, E>*>& to,
-      const ShortestPath::CostFunc<N, E, C>& costFunc,
-      const HeurFunc<N, E, C>& heurFunc,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc,
       std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
       std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes) {
     return D::shortestPathImpl(from, to, costFunc, heurFunc, resEdges,
@@ -277,8 +312,20 @@ class ShortestPath {
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPath(
       Edge<N, E>* from, const std::set<Edge<N, E>*>& to,
-      const ShortestPath::CostFunc<N, E, C>& costFunc,
-      const HeurFunc<N, E, C>& heurFunc,
+      const CostFunc<N, E, C>& costFunc,
+      std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
+      std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes) {
+    return D::shortestPathImpl(from, to, costFunc, ZeroHeurFunc<N, E, C>()
+, resEdges,
+                               resNodes);
+  }
+
+
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPath(
+      Edge<N, E>* from, const std::set<Edge<N, E>*>& to,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc,
       std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges) {
     std::unordered_map<Edge<N, E>*, NList<N, E>*> dummyRet;
     return D::shortestPathImpl(from, to, costFunc, heurFunc, resEdges,
@@ -288,14 +335,35 @@ class ShortestPath {
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPath(
       Edge<N, E>* from, const std::set<Edge<N, E>*>& to,
-      const ShortestPath::CostFunc<N, E, C>& costFunc,
-      const HeurFunc<N, E, C>& heurFunc) {
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc) {
     std::unordered_map<Edge<N, E>*, NList<N, E>*> dummyRet;
     std::unordered_map<Edge<N, E>*, EList<N, E>*> dummyRetE;
     return D::shortestPathImpl(from, to, costFunc, heurFunc, dummyRetE,
                                dummyRet);
   }
 
+  template <typename N, typename E, typename C>
+  static C shortestPath(Edge<N, E>* from,
+                        const std::set<Edge<N, E>*>& to,
+                        const CostFunc<N, E, C>& costFunc) {
+    NList<N, E>* nl = 0;
+    EList<N, E>* el = 0;
+    std::set<Edge<N, E>*> fromS;
+    fromS.insert(from);
+    return D::shortestPathImpl(fromS, to, costFunc, ZeroHeurFunc<N, E, C>(), el,
+                               nl);
+  }
+
+  template <typename N, typename E, typename C>
+  static C shortestPath(const std::set<Edge<N, E>*>& from,
+                        const std::set<Edge<N, E>*>& to,
+                        const CostFunc<N, E, C>& costFunc) {
+    NList<N, E>* nl = 0;
+    EList<N, E>* el = 0;
+    return D::shortestPathImpl(from, to, costFunc, ZeroHeurFunc<N, E, C>(), el,
+                               nl);
+  }
+
   template <typename N, typename E, typename C>
   static C shortestPath(const std::set<Edge<N, E>*>& from,
                         const std::set<Edge<N, E>*>& to,
@@ -306,17 +374,6 @@ class ShortestPath {
     return D::shortestPathImpl(from, to, costFunc, heurFunc, el, nl);
   }
 
-  template <typename N, typename E, typename C>
-  static C shortestPath(Edge<N, E>* from,
-                        Edge<N, E>* to,
-                        const CostFunc<N, E, C>& costFunc ) {
-    NList<N, E>* nl = 0;
-    EList<N, E>* el = 0;
-    std::set<Edge<N, E>*> tos{to};
-    std::set<Edge<N, E>*> froms{from};
-    return D::shortestPathImpl(froms, tos, costFunc, ZeroHeurFunc<N, E, C>(), el, nl);
-  }
-
   template <typename N, typename E, typename C>
   static C shortestPath(const std::set<Edge<N, E>*>& from,
                         const std::set<Edge<N, E>*>& to,
@@ -326,6 +383,91 @@ class ShortestPath {
     return D::shortestPathImpl(from, to, costFunc, heurFunc, el, nl);
   }
 
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPath(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc,
+      std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
+      std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes) {
+    return D::shortestPathImpl(from, to, initCosts, costFunc.inf(), costFunc,
+                               heurFunc, resEdges, resNodes);
+  }
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPath(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc,
+      std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges) {
+    std::unordered_map<Edge<N, E>*, NList<N, E>*> dummyRet;
+    return D::shortestPathImpl(from, to, initCosts, costFunc.inf(), costFunc,
+                               heurFunc, resEdges, dummyRet);
+  }
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPath(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc) {
+    std::unordered_map<Edge<N, E>*, NList<N, E>*> dummyRet;
+    std::unordered_map<Edge<N, E>*, EList<N, E>*> dummyRetE;
+    return D::shortestPathImpl(from, to, initCosts, costFunc.inf(), costFunc,
+                               heurFunc, dummyRetE, dummyRet);
+  }
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPath(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts, C stall,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc,
+      std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges,
+      std::unordered_map<Edge<N, E>*, NList<N, E>*> resNodes) {
+    return D::shortestPathImpl(from, to, initCosts, stall, costFunc, heurFunc,
+                               resEdges, resNodes);
+  }
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, C> shortestPath(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts, C stall,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc,
+      std::unordered_map<Edge<N, E>*, EList<N, E>*> resEdges) {
+    std::unordered_map<Edge<N, E>*, NList<N, E>*> dummyRet;
+    return D::shortestPathImpl(from, to, initCosts, stall, costFunc, heurFunc,
+                               resEdges, dummyRet);
+  }
+
+  template <typename N, typename E, typename C>
+  static std::unordered_map<Edge<N, E>*, std::pair<Edge<N, E>*, C>> shortestPath(
+      const std::set<Edge<N, E>*>& from, const std::set<Edge<N, E>*>& to,
+      const std::unordered_map<Edge<N, E>*, C>& initCosts, C stall,
+      const CostFunc<N, E, C>& costFunc, const HeurFunc<N, E, C>& heurFunc) {
+    return D::shortestPathImpl(from, to, initCosts, stall, costFunc, heurFunc);
+  }
+
+  template <typename N, typename E, typename C>
+  static C shortestPath(Edge<N, E>* from, Edge<N, E>* to,
+                        const CostFunc<N, E, C>& costFunc) {
+    NList<N, E>* nl = 0;
+    EList<N, E>* el = 0;
+    std::set<Edge<N, E>*> tos{to};
+    std::set<Edge<N, E>*> froms{from};
+    return D::shortestPathImpl(froms, tos, costFunc, ZeroHeurFunc<N, E, C>(),
+                               el, nl);
+  }
+
+  template <typename N, typename E, typename C>
+  static C shortestPath(Edge<N, E>* from, Edge<N, E>* to,
+                        const CostFunc<N, E, C>& costFunc,
+                        const HeurFunc<N, E, C>& heurFunc) {
+    NList<N, E>* nl = 0;
+    EList<N, E>* el = 0;
+    std::set<Edge<N, E>*> tos{to};
+    std::set<Edge<N, E>*> froms{from};
+    return D::shortestPathImpl(froms, tos, costFunc, heurFunc, el, nl);
+  }
+
   template <typename N, typename E, typename C>
   static C shortestPath(Edge<N, E>* from, const std::set<Node<N, E>*>& to,
                         const CostFunc<N, E, C>& costFunc,
@@ -336,8 +478,7 @@ class ShortestPath {
 
   template <typename N, typename E, typename C>
   static C shortestPath(Edge<N, E>* from, const std::set<Node<N, E>*>& to,
-                        const CostFunc<N, E, C>& costFunc,
-                        EList<N, E>* el,
+                        const CostFunc<N, E, C>& costFunc, EList<N, E>* el,
                         NList<N, E>* nl) {
     return D::shortestPathImpl(from, to, costFunc, ZeroHeurFunc<N, E, C>(), el,
                                nl);
@@ -363,24 +504,21 @@ class ShortestPath {
 
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPath(
-      Edge<N, E>* from,
-      const ShortestPath::CostFunc<N, E, C>& costFunc) {
-    std::set<Edge<N, E>*> froms { from };
+      Edge<N, E>* from, const CostFunc<N, E, C>& costFunc) {
+    std::set<Edge<N, E>*> froms{from};
     return D::shortestPathImpl(froms, costFunc, false);
   }
 
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPathRev(
-      Edge<N, E>* from,
-      const ShortestPath::CostFunc<N, E, C>& costFunc) {
-    std::set<Edge<N, E>*> froms { from };
+      Edge<N, E>* from, const CostFunc<N, E, C>& costFunc) {
+    std::set<Edge<N, E>*> froms{from};
     return D::shortestPathImpl(froms, costFunc, true);
   }
 
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPath(
-      Node<N, E>* from,
-      const ShortestPath::CostFunc<N, E, C>& costFunc) {
+      Node<N, E>* from, const CostFunc<N, E, C>& costFunc) {
     std::set<Edge<N, E>*> froms;
     froms.insert(from->getAdjListOut().begin(), from->getAdjListOut().end());
     return D::shortestPathImpl(froms, costFunc, false);
@@ -388,14 +526,13 @@ class ShortestPath {
 
   template <typename N, typename E, typename C>
   static std::unordered_map<Edge<N, E>*, C> shortestPathRev(
-      Node<N, E>* from,
-      const ShortestPath::CostFunc<N, E, C>& costFunc) {
+      Node<N, E>* from, const CostFunc<N, E, C>& costFunc) {
     std::set<Edge<N, E>*> froms;
     froms.insert(from->getAdjListOut().begin(), from->getAdjListOut().end());
     return D::shortestPathImpl(froms, costFunc, true);
   }
 };
-}
-}
+}  // namespace graph
+}  // namespace util
 
 #endif  // UTIL_GRAPH_SHORTESTPATH_H_
diff --git a/src/util/graph/UndirGraph.tpp b/src/util/graph/UndirGraph.tpp
index 9ceac5b..cb5a3c2 100644
--- a/src/util/graph/UndirGraph.tpp
+++ b/src/util/graph/UndirGraph.tpp
@@ -21,7 +21,7 @@ Node<N, E>* UndirGraph<N, E>::addNd() {
 // _____________________________________________________________________________
 template <typename N, typename E>
 Node<N, E>* UndirGraph<N, E>::addNd(UndirNode<N, E>* n) {
-  auto ins = Graph<N, E>::getNds()->insert(n);
+  auto ins = Graph<N, E>::_nodes.insert(n);
   return *ins.first;
 }
 
diff --git a/src/util/graph/radix_heap.h b/src/util/graph/radix_heap.h
new file mode 100644
index 0000000..cb0eef7
--- /dev/null
+++ b/src/util/graph/radix_heap.h
@@ -0,0 +1,226 @@
+// based on https://github.com/iwiwi/radix-heap
+
+#include <algorithm>
+#include <array>
+#include <cassert>
+#include <climits>
+#include <cstdint>
+#include <limits>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+namespace radix_heap {
+namespace internal {
+template <bool Is64bit>
+class find_bucket_impl;
+
+template <>
+class find_bucket_impl<false> {
+ public:
+  static inline constexpr size_t find_bucket(uint32_t x, uint32_t last) {
+    return x == last ? 0 : 32 - __builtin_clz(x ^ last);
+  }
+};
+
+template <>
+class find_bucket_impl<true> {
+ public:
+  static inline constexpr size_t find_bucket(uint64_t x, uint64_t last) {
+    return x == last ? 0 : 64 - __builtin_clzll(x ^ last);
+  }
+};
+
+template <typename T>
+inline constexpr size_t find_bucket(T x, T last) {
+  return find_bucket_impl<sizeof(T) == 8>::find_bucket(x, last);
+}
+
+template <typename KeyType, bool IsSigned>
+class encoder_impl_integer;
+
+template <typename KeyType>
+class encoder_impl_integer<KeyType, false> {
+ public:
+  typedef KeyType key_type;
+  typedef KeyType unsigned_key_type;
+
+  inline static constexpr unsigned_key_type encode(key_type x) { return x; }
+
+  inline static constexpr key_type decode(unsigned_key_type x) { return x; }
+};
+
+template <typename KeyType>
+class encoder_impl_integer<KeyType, true> {
+ public:
+  typedef KeyType key_type;
+  typedef typename std::make_unsigned<KeyType>::type unsigned_key_type;
+
+  inline static constexpr unsigned_key_type encode(key_type x) {
+    return static_cast<unsigned_key_type>(x) ^
+           (unsigned_key_type(1) << unsigned_key_type(
+                std::numeric_limits<unsigned_key_type>::digits - 1));
+  }
+
+  inline static constexpr key_type decode(unsigned_key_type x) {
+    return static_cast<key_type>(
+        x ^ (unsigned_key_type(1)
+             << (std::numeric_limits<unsigned_key_type>::digits - 1)));
+  }
+};
+
+template <typename KeyType, typename UnsignedKeyType>
+class encoder_impl_decimal {
+ public:
+  typedef KeyType key_type;
+  typedef UnsignedKeyType unsigned_key_type;
+
+  inline static constexpr unsigned_key_type encode(key_type x) {
+    return raw_cast<key_type, unsigned_key_type>(x) ^
+           ((-(raw_cast<key_type, unsigned_key_type>(x) >>
+               (std::numeric_limits<unsigned_key_type>::digits - 1))) |
+            (unsigned_key_type(1)
+             << (std::numeric_limits<unsigned_key_type>::digits - 1)));
+  }
+
+  inline static constexpr key_type decode(unsigned_key_type x) {
+    return raw_cast<unsigned_key_type, key_type>(
+        x ^ (((x >> (std::numeric_limits<unsigned_key_type>::digits - 1)) - 1) |
+             (unsigned_key_type(1)
+              << (std::numeric_limits<unsigned_key_type>::digits - 1))));
+  }
+
+ private:
+  template <typename T, typename U>
+  union raw_cast {
+   public:
+    constexpr raw_cast(T t) : t_(t) {}
+    operator U() const { return u_; }
+
+   private:
+    T t_;
+    U u_;
+  };
+};
+
+template <typename KeyType>
+class encoder
+    : public encoder_impl_integer<KeyType, std::is_signed<KeyType>::value> {};
+template <>
+class encoder<float> : public encoder_impl_decimal<float, uint32_t> {};
+template <>
+class encoder<double> : public encoder_impl_decimal<double, uint64_t> {};
+}  // namespace internal
+
+template <typename KeyType, typename ValueType,
+          typename EncoderType = internal::encoder<KeyType>>
+class pair_radix_heap {
+ public:
+  typedef KeyType key_type;
+  typedef ValueType value_type;
+  typedef EncoderType encoder_type;
+  typedef typename encoder_type::unsigned_key_type unsigned_key_type;
+
+  pair_radix_heap() : size_(0), last_(), buckets_() {
+    buckets_min_.fill(std::numeric_limits<unsigned_key_type>::max());
+  }
+
+  void push(key_type key, const value_type &value) {
+    unsigned_key_type x = encoder_type::encode(key);
+    if (last_ > x) {
+      std::cerr << "Not monotone: " << last_ << " vs " << x << std::endl;
+      x = last_;
+    }
+    ++size_;
+    const size_t k = internal::find_bucket(x, last_);
+    buckets_[k].emplace_back(x, value);
+    buckets_min_[k] = std::min(buckets_min_[k], x);
+  }
+
+  void push(key_type key, value_type &&value) {
+    unsigned_key_type x = encoder_type::encode(key);
+    if (last_ > x) {
+      std::cerr << "Not monotone: " << last_ << " vs " << x << std::endl;
+      x = last_;
+    }
+    ++size_;
+    const size_t k = internal::find_bucket(x, last_);
+    buckets_[k].emplace_back(x, std::move(value));
+    buckets_min_[k] = std::min(buckets_min_[k], x);
+  }
+
+  template <class... Args>
+  void emplace(key_type key, Args &&... args) {
+    unsigned_key_type x = encoder_type::encode(key);
+    if (last_ > x) x = last_;
+    ++size_;
+    const size_t k = internal::find_bucket(x, last_);
+    buckets_[k].emplace_back(std::piecewise_construct, std::forward_as_tuple(x),
+                             std::forward_as_tuple(args...));
+    buckets_min_[k] = std::min(buckets_min_[k], x);
+  }
+
+  key_type topKey() {
+    pull();
+    return encoder_type::decode(last_);
+  }
+
+  value_type &topVal() {
+    pull();
+    return buckets_[0].back().second;
+  }
+
+  void pop() {
+    pull();
+    buckets_[0].pop_back();
+    --size_;
+  }
+
+  size_t size() const { return size_; }
+
+  bool empty() const { return size_ == 0; }
+
+  void clear() {
+    size_ = 0;
+    last_ = key_type();
+    for (auto &b : buckets_) b.clear();
+    buckets_min_.fill(std::numeric_limits<unsigned_key_type>::max());
+  }
+
+  void swap(pair_radix_heap<KeyType, ValueType, EncoderType> &a) {
+    std::swap(size_, a.size_);
+    std::swap(last_, a.last_);
+    buckets_.swap(a.buckets_);
+    buckets_min_.swap(a.buckets_min_);
+  }
+
+ private:
+  size_t size_;
+  unsigned_key_type last_;
+  std::array<std::vector<std::pair<unsigned_key_type, value_type>>,
+             std::numeric_limits<unsigned_key_type>::digits + 1>
+      buckets_;
+  std::array<unsigned_key_type,
+             std::numeric_limits<unsigned_key_type>::digits + 1>
+      buckets_min_;
+
+  void pull() {
+    assert(size_ > 0);
+    if (!buckets_[0].empty()) return;
+
+    size_t i;
+    for (i = 1; buckets_[i].empty(); ++i)
+      ;
+    last_ = buckets_min_[i];
+
+    for (size_t j = 0; j < buckets_[i].size(); ++j) {
+      const unsigned_key_type x = buckets_[i][j].first;
+      const size_t k = internal::find_bucket(x, last_);
+      buckets_[k].emplace_back(std::move(buckets_[i][j]));
+      buckets_min_[k] = std::min(buckets_min_[k], x);
+    }
+    buckets_[i].clear();
+    buckets_min_[i] = std::numeric_limits<unsigned_key_type>::max();
+  }
+};
+}  // namespace radix_heap
diff --git a/src/util/graph/robin/robin_growth_policy.h b/src/util/graph/robin/robin_growth_policy.h
new file mode 100644
index 0000000..ed17c84
--- /dev/null
+++ b/src/util/graph/robin/robin_growth_policy.h
@@ -0,0 +1,348 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef TSL_ROBIN_GROWTH_POLICY_H
+#define TSL_ROBIN_GROWTH_POLICY_H 
+
+
+#include <algorithm>
+#include <array>
+#include <climits>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <limits>
+#include <ratio>
+#include <stdexcept>
+
+
+#ifdef TSL_DEBUG
+#    define tsl_rh_assert(expr) assert(expr)
+#else
+#    define tsl_rh_assert(expr) (static_cast<void>(0))
+#endif
+
+
+/**
+ * If exceptions are enabled, throw the exception passed in parameter, otherwise call std::terminate.
+ */
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || (defined (_MSC_VER) && defined (_CPPUNWIND))) && !defined(TSL_NO_EXCEPTIONS)
+#    define TSL_RH_THROW_OR_TERMINATE(ex, msg) throw ex(msg)
+#else
+#    define TSL_RH_NO_EXCEPTIONS
+#    ifdef NDEBUG
+#        define TSL_RH_THROW_OR_TERMINATE(ex, msg) std::terminate()
+#    else
+#        include <iostream>
+#        define TSL_RH_THROW_OR_TERMINATE(ex, msg) do { std::cerr << msg << std::endl; std::terminate(); } while(0)
+#    endif
+#endif
+
+
+#if defined(__GNUC__) || defined(__clang__)
+#    define TSL_RH_LIKELY(exp) (__builtin_expect(!!(exp), true))
+#else
+#    define TSL_RH_LIKELY(exp) (exp)
+#endif
+
+
+namespace tsl {
+namespace rh {
+    
+/**
+ * Grow the hash table by a factor of GrowthFactor keeping the bucket count to a power of two. It allows
+ * the table to use a mask operation instead of a modulo operation to map a hash to a bucket.
+ * 
+ * GrowthFactor must be a power of two >= 2.
+ */
+template<std::size_t GrowthFactor>
+class power_of_two_growth_policy {
+public:
+    /**
+     * Called on the hash table creation and on rehash. The number of buckets for the table is passed in parameter.
+     * This number is a minimum, the policy may update this value with a higher value if needed (but not lower).
+     *
+     * If 0 is given, min_bucket_count_in_out must still be 0 after the policy creation and
+     * bucket_for_hash must always return 0 in this case.
+     */
+    explicit power_of_two_growth_policy(std::size_t& min_bucket_count_in_out) {
+        if(min_bucket_count_in_out > max_bucket_count()) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        if(min_bucket_count_in_out > 0) {
+            min_bucket_count_in_out = round_up_to_power_of_two(min_bucket_count_in_out);
+            m_mask = min_bucket_count_in_out - 1;
+        }
+        else {
+            m_mask = 0;
+        }
+    }
+    
+    /**
+     * Return the bucket [0, bucket_count()) to which the hash belongs. 
+     * If bucket_count() is 0, it must always return 0.
+     */
+    std::size_t bucket_for_hash(std::size_t hash) const noexcept {
+        return hash & m_mask;
+    }
+    
+    /**
+     * Return the number of buckets that should be used on next growth.
+     */
+    std::size_t next_bucket_count() const {
+        if((m_mask + 1) > max_bucket_count() / GrowthFactor) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        return (m_mask + 1) * GrowthFactor;
+    }
+    
+    /**
+     * Return the maximum number of buckets supported by the policy.
+     */
+    std::size_t max_bucket_count() const {
+        // Largest power of two.
+        return (std::numeric_limits<std::size_t>::max() / 2) + 1;
+    }
+    
+    /**
+     * Reset the growth policy as if it was created with a bucket count of 0.
+     * After a clear, the policy must always return 0 when bucket_for_hash is called.
+     */
+    void clear() noexcept {
+        m_mask = 0;
+    }
+    
+private:
+    static std::size_t round_up_to_power_of_two(std::size_t value) {
+        if(is_power_of_two(value)) {
+            return value;
+        }
+        
+        if(value == 0) {
+            return 1;
+        }
+            
+        --value;
+        for(std::size_t i = 1; i < sizeof(std::size_t) * CHAR_BIT; i *= 2) {
+            value |= value >> i;
+        }
+        
+        return value + 1;
+    }
+    
+    static constexpr bool is_power_of_two(std::size_t value) {
+        return value != 0 && (value & (value - 1)) == 0;
+    }
+    
+protected:
+    static_assert(is_power_of_two(GrowthFactor) && GrowthFactor >= 2, "GrowthFactor must be a power of two >= 2.");
+    
+    std::size_t m_mask;
+};
+
+
+/**
+ * Grow the hash table by GrowthFactor::num / GrowthFactor::den and use a modulo to map a hash
+ * to a bucket. Slower but it can be useful if you want a slower growth.
+ */
+template<class GrowthFactor = std::ratio<3, 2>>
+class mod_growth_policy {
+public:
+    explicit mod_growth_policy(std::size_t& min_bucket_count_in_out) {
+        if(min_bucket_count_in_out > max_bucket_count()) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        if(min_bucket_count_in_out > 0) {
+            m_mod = min_bucket_count_in_out;
+        }
+        else {
+            m_mod = 1;
+        }
+    }
+    
+    std::size_t bucket_for_hash(std::size_t hash) const noexcept {
+        return hash % m_mod;
+    }
+    
+    std::size_t next_bucket_count() const {
+        if(m_mod == max_bucket_count()) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        const double next_bucket_count = std::ceil(double(m_mod) * REHASH_SIZE_MULTIPLICATION_FACTOR);
+        if(!std::isnormal(next_bucket_count)) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        if(next_bucket_count > double(max_bucket_count())) {
+            return max_bucket_count();
+        }
+        else {
+            return std::size_t(next_bucket_count);
+        }
+    }
+    
+    std::size_t max_bucket_count() const {
+        return MAX_BUCKET_COUNT;
+    }
+    
+    void clear() noexcept {
+        m_mod = 1;
+    }
+    
+private:
+    static constexpr double REHASH_SIZE_MULTIPLICATION_FACTOR = 1.0 * GrowthFactor::num / GrowthFactor::den;
+    static const std::size_t MAX_BUCKET_COUNT = 
+            std::size_t(double(
+                    std::numeric_limits<std::size_t>::max() / REHASH_SIZE_MULTIPLICATION_FACTOR
+            ));
+            
+    static_assert(REHASH_SIZE_MULTIPLICATION_FACTOR >= 1.1, "Growth factor should be >= 1.1.");
+    
+    std::size_t m_mod;
+};
+
+
+
+namespace detail {
+
+#if SIZE_MAX >= ULLONG_MAX
+#define TSL_RH_NB_PRIMES 51
+#elif SIZE_MAX >= ULONG_MAX
+#define TSL_RH_NB_PRIMES 40
+#else
+#define TSL_RH_NB_PRIMES 23
+#endif
+
+static constexpr const std::array<std::size_t, TSL_RH_NB_PRIMES> PRIMES = {{
+    1u, 5u, 17u, 29u, 37u, 53u, 67u, 79u, 97u, 131u, 193u, 257u, 389u, 521u, 769u, 1031u, 
+    1543u, 2053u, 3079u, 6151u, 12289u, 24593u, 49157u,
+#if SIZE_MAX >= ULONG_MAX
+    98317ul, 196613ul, 393241ul, 786433ul, 1572869ul, 3145739ul, 6291469ul, 12582917ul, 
+    25165843ul, 50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul, 1610612741ul, 
+    3221225473ul, 4294967291ul,
+#endif
+#if SIZE_MAX >= ULLONG_MAX
+    6442450939ull, 12884901893ull, 25769803751ull, 51539607551ull, 103079215111ull, 206158430209ull, 
+    412316860441ull, 824633720831ull, 1649267441651ull, 3298534883309ull, 6597069766657ull,
+#endif
+}};
+
+template<unsigned int IPrime>
+static constexpr std::size_t mod(std::size_t hash) { return hash % PRIMES[IPrime]; }
+
+// MOD_PRIME[iprime](hash) returns hash % PRIMES[iprime]. This table allows for faster modulo as the
+// compiler can optimize the modulo code better with a constant known at the compilation.
+static constexpr const std::array<std::size_t(*)(std::size_t), TSL_RH_NB_PRIMES> MOD_PRIME = {{ 
+    &mod<0>, &mod<1>, &mod<2>, &mod<3>, &mod<4>, &mod<5>, &mod<6>, &mod<7>, &mod<8>, &mod<9>, &mod<10>, 
+    &mod<11>, &mod<12>, &mod<13>, &mod<14>, &mod<15>, &mod<16>, &mod<17>, &mod<18>, &mod<19>, &mod<20>, 
+    &mod<21>, &mod<22>,  
+#if SIZE_MAX >= ULONG_MAX
+    &mod<23>, &mod<24>, &mod<25>, &mod<26>, &mod<27>, &mod<28>, &mod<29>, &mod<30>, &mod<31>, &mod<32>, 
+    &mod<33>, &mod<34>, &mod<35>, &mod<36>, &mod<37> , &mod<38>, &mod<39>,
+#endif
+#if SIZE_MAX >= ULLONG_MAX
+    &mod<40>, &mod<41>, &mod<42>, &mod<43>, &mod<44>, &mod<45>, &mod<46>, &mod<47>, &mod<48>, &mod<49>, 
+    &mod<50>,
+#endif
+}};
+
+}
+
+/**
+ * Grow the hash table by using prime numbers as bucket count. Slower than tsl::rh::power_of_two_growth_policy in  
+ * general but will probably distribute the values around better in the buckets with a poor hash function.
+ * 
+ * To allow the compiler to optimize the modulo operation, a lookup table is used with constant primes numbers.
+ * 
+ * With a switch the code would look like:
+ * \code
+ * switch(iprime) { // iprime is the current prime of the hash table
+ *     case 0: hash % 5ul;
+ *             break;
+ *     case 1: hash % 17ul;
+ *             break;
+ *     case 2: hash % 29ul;
+ *             break;
+ *     ...
+ * }    
+ * \endcode
+ * 
+ * Due to the constant variable in the modulo the compiler is able to optimize the operation
+ * by a series of multiplications, substractions and shifts. 
+ * 
+ * The 'hash % 5' could become something like 'hash - (hash * 0xCCCCCCCD) >> 34) * 5' in a 64 bits environment.
+ */
+class prime_growth_policy {
+public:
+    explicit prime_growth_policy(std::size_t& min_bucket_count_in_out) {
+        auto it_prime = std::lower_bound(detail::PRIMES.begin(), 
+                                         detail::PRIMES.end(), min_bucket_count_in_out);
+        if(it_prime == detail::PRIMES.end()) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        m_iprime = static_cast<unsigned int>(std::distance(detail::PRIMES.begin(), it_prime));
+        if(min_bucket_count_in_out > 0) {
+            min_bucket_count_in_out = *it_prime;
+        }
+        else {
+            min_bucket_count_in_out = 0;
+        }
+    }
+    
+    std::size_t bucket_for_hash(std::size_t hash) const noexcept {
+        return detail::MOD_PRIME[m_iprime](hash);
+    }
+    
+    std::size_t next_bucket_count() const {
+        if(m_iprime + 1 >= detail::PRIMES.size()) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The hash table exceeds its maximum size.");
+        }
+        
+        return detail::PRIMES[m_iprime + 1];
+    }   
+    
+    std::size_t max_bucket_count() const {
+        return detail::PRIMES.back();
+    }
+    
+    void clear() noexcept {
+        m_iprime = 0;
+    }
+    
+private:
+    unsigned int m_iprime;
+    
+    static_assert(std::numeric_limits<decltype(m_iprime)>::max() >= detail::PRIMES.size(), 
+                  "The type of m_iprime is not big enough.");
+}; 
+
+}
+}
+
+#endif
diff --git a/src/util/graph/robin/robin_hash.h b/src/util/graph/robin/robin_hash.h
new file mode 100644
index 0000000..e8bc5e6
--- /dev/null
+++ b/src/util/graph/robin/robin_hash.h
@@ -0,0 +1,1451 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef TSL_ROBIN_HASH_H
+#define TSL_ROBIN_HASH_H 
+
+
+#include <algorithm>
+#include <cassert>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <stdexcept>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+#include "robin_growth_policy.h"
+
+
+namespace tsl {
+    
+namespace detail_robin_hash {
+
+template<typename T>
+struct make_void {
+    using type = void;
+};
+
+template<typename T, typename = void>
+struct has_is_transparent: std::false_type {
+};
+
+template<typename T>
+struct has_is_transparent<T, typename make_void<typename T::is_transparent>::type>: std::true_type {
+};
+
+template<typename U>
+struct is_power_of_two_policy: std::false_type {
+};
+
+template<std::size_t GrowthFactor>
+struct is_power_of_two_policy<tsl::rh::power_of_two_growth_policy<GrowthFactor>>: std::true_type {
+};
+
+// Only available in C++17, we need to be compatible with C++11
+template<class T>
+const T& clamp( const T& v, const T& lo, const T& hi) {
+    return std::min(hi, std::max(lo, v));
+}
+
+template<typename T, typename U>
+static T numeric_cast(U value, const char* error_message = "numeric_cast() failed.") {
+    T ret = static_cast<T>(value);
+    if(static_cast<U>(ret) != value) {
+        TSL_RH_THROW_OR_TERMINATE(std::runtime_error, error_message);
+    }
+    
+    const bool is_same_signedness = (std::is_unsigned<T>::value && std::is_unsigned<U>::value) ||
+                                    (std::is_signed<T>::value && std::is_signed<U>::value);
+    if(!is_same_signedness && (ret < T{}) != (value < U{})) {
+        TSL_RH_THROW_OR_TERMINATE(std::runtime_error, error_message);
+    }
+    
+    return ret;
+}
+
+
+using truncated_hash_type = std::uint_least32_t;
+
+/**
+ * Helper class that stores a truncated hash if StoreHash is true and nothing otherwise.
+ */
+template<bool StoreHash>
+class bucket_entry_hash {
+public:
+    bool bucket_hash_equal(std::size_t /*hash*/) const noexcept {
+        return true;
+    }
+    
+    truncated_hash_type truncated_hash() const noexcept {
+        return 0;
+    }
+    
+protected:
+    void set_hash(truncated_hash_type /*hash*/) noexcept {
+    }
+};
+
+template<>
+class bucket_entry_hash<true> {
+public:
+    bool bucket_hash_equal(std::size_t hash) const noexcept {
+        return m_hash == truncated_hash_type(hash);
+    }
+    
+    truncated_hash_type truncated_hash() const noexcept {
+        return m_hash;
+    }
+    
+protected:
+    void set_hash(truncated_hash_type hash) noexcept {
+        m_hash = truncated_hash_type(hash);
+    }
+    
+private:    
+    truncated_hash_type m_hash;
+};
+
+
+/**
+ * Each bucket entry has:
+ * - A value of type `ValueType`.
+ * - An integer to store how far the value of the bucket, if any, is from its ideal bucket 
+ *   (ex: if the current bucket 5 has the value 'foo' and `hash('foo') % nb_buckets` == 3,
+ *        `dist_from_ideal_bucket()` will return 2 as the current value of the bucket is two
+ *        buckets away from its ideal bucket)
+ *   If there is no value in the bucket (i.e. `empty()` is true) `dist_from_ideal_bucket()` will be < 0.
+ * - A marker which tells us if the bucket is the last bucket of the bucket array (useful for the 
+ *   iterator of the hash table).
+ * - If `StoreHash` is true, 32 bits of the hash of the value, if any, are also stored in the bucket. 
+ *   If the size of the hash is more than 32 bits, it is truncated. We don't store the full hash
+ *   as storing the hash is a potential opportunity to use the unused space due to the alignment
+ *   of the bucket_entry structure. We can thus potentially store the hash without any extra space 
+ *   (which would not be possible with 64 bits of the hash).
+ */
+template<typename ValueType, bool StoreHash>
+class bucket_entry: public bucket_entry_hash<StoreHash> {
+    using bucket_hash = bucket_entry_hash<StoreHash>;
+    
+public:
+    using value_type = ValueType;
+    using distance_type = std::int_least16_t;
+    
+    
+    bucket_entry() noexcept: bucket_hash(), m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET),
+                             m_last_bucket(false)
+    {
+        tsl_rh_assert(empty());
+    }
+    
+    bucket_entry(bool last_bucket) noexcept: bucket_hash(), m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET),
+                                             m_last_bucket(last_bucket)
+    {
+        tsl_rh_assert(empty());
+    }
+    
+    bucket_entry(const bucket_entry& other) noexcept(std::is_nothrow_copy_constructible<value_type>::value): 
+            bucket_hash(other),
+            m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET), 
+            m_last_bucket(other.m_last_bucket)
+    {
+        if(!other.empty()) {
+            ::new (static_cast<void*>(std::addressof(m_value))) value_type(other.value());
+            m_dist_from_ideal_bucket = other.m_dist_from_ideal_bucket;
+        }
+    }
+    
+    /**
+     * Never really used, but still necessary as we must call resize on an empty `std::vector<bucket_entry>`.
+     * and we need to support move-only types. See robin_hash constructor for details.
+     */
+    bucket_entry(bucket_entry&& other) noexcept(std::is_nothrow_move_constructible<value_type>::value): 
+            bucket_hash(std::move(other)),
+            m_dist_from_ideal_bucket(EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET), 
+            m_last_bucket(other.m_last_bucket) 
+    {
+        if(!other.empty()) {
+            ::new (static_cast<void*>(std::addressof(m_value))) value_type(std::move(other.value()));
+            m_dist_from_ideal_bucket = other.m_dist_from_ideal_bucket;
+        }
+    }
+    
+    bucket_entry& operator=(const bucket_entry& other) 
+            noexcept(std::is_nothrow_copy_constructible<value_type>::value) 
+    {
+        if(this != &other) {
+            clear();
+            
+            bucket_hash::operator=(other);
+            if(!other.empty()) {
+                ::new (static_cast<void*>(std::addressof(m_value))) value_type(other.value());
+            }
+            
+            m_dist_from_ideal_bucket = other.m_dist_from_ideal_bucket;
+            m_last_bucket = other.m_last_bucket;
+        }
+        
+        return *this;
+    }
+    
+    bucket_entry& operator=(bucket_entry&& ) = delete;
+    
+    ~bucket_entry() noexcept {
+        clear();
+    }
+    
+    void clear() noexcept {
+        if(!empty()) {
+            destroy_value();
+            m_dist_from_ideal_bucket = EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET;
+        }
+    }
+    
+    bool empty() const noexcept {
+        return m_dist_from_ideal_bucket == EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET;
+    }
+    
+    value_type& value() noexcept {
+        tsl_rh_assert(!empty());
+        return *reinterpret_cast<value_type*>(std::addressof(m_value));
+    }
+    
+    const value_type& value() const noexcept {
+        tsl_rh_assert(!empty());
+        return *reinterpret_cast<const value_type*>(std::addressof(m_value));
+    }
+    
+    distance_type dist_from_ideal_bucket() const noexcept {
+        return m_dist_from_ideal_bucket;
+    }
+    
+    bool last_bucket() const noexcept {
+        return m_last_bucket;
+    }
+    
+    void set_as_last_bucket() noexcept {
+        m_last_bucket = true;
+    }
+        
+    template<typename... Args>
+    void set_value_of_empty_bucket(distance_type dist_from_ideal_bucket, 
+                                   truncated_hash_type hash, Args&&... value_type_args) 
+    {
+        tsl_rh_assert(dist_from_ideal_bucket >= 0);
+        tsl_rh_assert(empty());
+        
+        ::new (static_cast<void*>(std::addressof(m_value))) value_type(std::forward<Args>(value_type_args)...);
+        this->set_hash(hash);
+        m_dist_from_ideal_bucket = dist_from_ideal_bucket;
+        
+        tsl_rh_assert(!empty());
+    }
+    
+    void swap_with_value_in_bucket(distance_type& dist_from_ideal_bucket, 
+                                   truncated_hash_type& hash, value_type& value) 
+    {
+        tsl_rh_assert(!empty());
+        
+        using std::swap;
+        swap(value, this->value());
+        swap(dist_from_ideal_bucket, m_dist_from_ideal_bucket);
+        
+        // Avoid warning of unused variable if StoreHash is false
+        (void) hash;
+        if(StoreHash) {
+            const truncated_hash_type tmp_hash = this->truncated_hash();
+            this->set_hash(hash);
+            hash = tmp_hash;
+        }
+    }
+    
+    static truncated_hash_type truncate_hash(std::size_t hash) noexcept {
+        return truncated_hash_type(hash);
+    }
+    
+private:
+    void destroy_value() noexcept {
+        tsl_rh_assert(!empty());
+        value().~value_type();
+    }
+
+public:
+    static const distance_type DIST_FROM_IDEAL_BUCKET_LIMIT = 4096;
+    static_assert(DIST_FROM_IDEAL_BUCKET_LIMIT <= std::numeric_limits<distance_type>::max() - 1,
+                 "DIST_FROM_IDEAL_BUCKET_LIMIT must be <= std::numeric_limits<distance_type>::max() - 1.");
+    
+private:
+    using storage = typename std::aligned_storage<sizeof(value_type), alignof(value_type)>::type;
+    
+    static const distance_type EMPTY_MARKER_DIST_FROM_IDEAL_BUCKET = -1;
+    
+    distance_type m_dist_from_ideal_bucket;
+    bool m_last_bucket;
+    storage m_value;
+};
+
+
+
+/**
+ * Internal common class used by `robin_map` and `robin_set`. 
+ * 
+ * ValueType is what will be stored by `robin_hash` (usually `std::pair<Key, T>` for map and `Key` for set).
+ * 
+ * `KeySelect` should be a `FunctionObject` which takes a `ValueType` in parameter and returns a 
+ *  reference to the key.
+ * 
+ * `ValueSelect` should be a `FunctionObject` which takes a `ValueType` in parameter and returns a 
+ *  reference to the value. `ValueSelect` should be void if there is no value (in a set for example).
+ * 
+ * The strong exception guarantee only holds if the expression 
+ * `std::is_nothrow_swappable<ValueType>::value && std::is_nothrow_move_constructible<ValueType>::value` is true.
+ * 
+ * Behaviour is undefined if the destructor of `ValueType` throws.
+ */
+template<class ValueType,
+         class KeySelect,
+         class ValueSelect,
+         class Hash,
+         class KeyEqual,
+         class Allocator,
+         bool StoreHash,
+         class GrowthPolicy>
+class robin_hash: private Hash, private KeyEqual, private GrowthPolicy {
+private:    
+    template<typename U>
+    using has_mapped_type = typename std::integral_constant<bool, !std::is_same<U, void>::value>;
+    
+    static_assert(noexcept(std::declval<GrowthPolicy>().bucket_for_hash(std::size_t(0))), "GrowthPolicy::bucket_for_hash must be noexcept.");
+    static_assert(noexcept(std::declval<GrowthPolicy>().clear()), "GrowthPolicy::clear must be noexcept.");
+    
+public:
+    template<bool IsConst>
+    class robin_iterator;
+    
+    using key_type = typename KeySelect::key_type;
+    using value_type = ValueType;
+    using size_type = std::size_t;
+    using difference_type = std::ptrdiff_t;
+    using hasher = Hash;
+    using key_equal = KeyEqual;
+    using allocator_type = Allocator;
+    using reference = value_type&;
+    using const_reference = const value_type&;
+    using pointer = value_type*;
+    using const_pointer = const value_type*;
+    using iterator = robin_iterator<false>;
+    using const_iterator = robin_iterator<true>;
+    
+    
+private:
+    /**
+     * Either store the hash because we are asked by the `StoreHash` template parameter
+     * or store the hash because it doesn't cost us anything in size and can be used to speed up rehash.
+     */
+    static constexpr bool STORE_HASH = StoreHash || 
+                                       (
+                                         (sizeof(tsl::detail_robin_hash::bucket_entry<value_type, true>) ==
+                                          sizeof(tsl::detail_robin_hash::bucket_entry<value_type, false>))
+                                         &&
+                                         (sizeof(std::size_t) == sizeof(truncated_hash_type) ||
+                                          is_power_of_two_policy<GrowthPolicy>::value)
+                                         &&
+                                          // Don't store the hash for primitive types with default hash.
+                                          (!std::is_arithmetic<key_type>::value ||
+                                           !std::is_same<Hash, std::hash<key_type>>::value)
+                                       );
+                                        
+    /**
+     * Only use the stored hash on lookup if we are explicitly asked. We are not sure how slow
+     * the KeyEqual operation is. An extra comparison may slow things down with a fast KeyEqual.
+     */
+    static constexpr bool USE_STORED_HASH_ON_LOOKUP = StoreHash;
+
+    /**
+     * We can only use the hash on rehash if the size of the hash type is the same as the stored one or
+     * if we use a power of two modulo. In the case of the power of two modulo, we just mask
+     * the least significant bytes, we just have to check that the truncated_hash_type didn't truncated
+     * more bytes.
+     */
+    static bool USE_STORED_HASH_ON_REHASH(size_type bucket_count) {
+        (void) bucket_count;
+        if(STORE_HASH && sizeof(std::size_t) == sizeof(truncated_hash_type)) {
+            return true;
+        }
+        else if(STORE_HASH && is_power_of_two_policy<GrowthPolicy>::value) {
+            tsl_rh_assert(bucket_count > 0);
+            return (bucket_count - 1) <= std::numeric_limits<truncated_hash_type>::max();
+        }
+        else {
+            return false;   
+        }
+    }
+    
+    using bucket_entry = tsl::detail_robin_hash::bucket_entry<value_type, STORE_HASH>;
+    using distance_type = typename bucket_entry::distance_type;
+    
+    using buckets_allocator = typename std::allocator_traits<allocator_type>::template rebind_alloc<bucket_entry>;
+    using buckets_container_type = std::vector<bucket_entry, buckets_allocator>;
+    
+    
+public: 
+    /**
+     * The 'operator*()' and 'operator->()' methods return a const reference and const pointer respectively to the 
+     * stored value type.
+     * 
+     * In case of a map, to get a mutable reference to the value associated to a key (the '.second' in the 
+     * stored pair), you have to call 'value()'. 
+     * 
+     * The main reason for this is that if we returned a `std::pair<Key, T>&` instead 
+     * of a `const std::pair<Key, T>&`, the user may modify the key which will put the map in a undefined state.
+     */
+    template<bool IsConst>
+    class robin_iterator {
+        friend class robin_hash;
+        
+    private:
+        using bucket_entry_ptr = typename std::conditional<IsConst, 
+                                                           const bucket_entry*, 
+                                                           bucket_entry*>::type;
+    
+        
+        robin_iterator(bucket_entry_ptr bucket) noexcept: m_bucket(bucket) {
+        }
+        
+    public:
+        using iterator_category = std::forward_iterator_tag;
+        using value_type = const typename robin_hash::value_type;
+        using difference_type = std::ptrdiff_t;
+        using reference = value_type&;
+        using pointer = value_type*;
+        
+        
+        robin_iterator() noexcept {
+        }
+        
+        // Copy constructor from iterator to const_iterator.
+        template<bool TIsConst = IsConst, typename std::enable_if<TIsConst>::type* = nullptr>
+        robin_iterator(const robin_iterator<!TIsConst>& other) noexcept: m_bucket(other.m_bucket) {
+        }
+        
+        robin_iterator(const robin_iterator& other) = default;
+        robin_iterator(robin_iterator&& other) = default;
+        robin_iterator& operator=(const robin_iterator& other) = default;
+        robin_iterator& operator=(robin_iterator&& other) = default;
+        
+        const typename robin_hash::key_type& key() const {
+            return KeySelect()(m_bucket->value());
+        }
+
+        template<class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value && IsConst>::type* = nullptr>
+        const typename U::value_type& value() const {
+            return U()(m_bucket->value());
+        }
+
+        template<class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value && !IsConst>::type* = nullptr>
+        typename U::value_type& value() const {
+            return U()(m_bucket->value());
+        }
+        
+        reference operator*() const {
+            return m_bucket->value();
+        }
+        
+        pointer operator->() const {
+            return std::addressof(m_bucket->value());
+        }
+        
+        robin_iterator& operator++() {
+            while(true) {
+                if(m_bucket->last_bucket()) {
+                    ++m_bucket;
+                    return *this;
+                }
+                
+                ++m_bucket;
+                if(!m_bucket->empty()) {
+                    return *this;
+                }
+            }
+        }
+        
+        robin_iterator operator++(int) {
+            robin_iterator tmp(*this);
+            ++*this;
+            
+            return tmp;
+        }
+        
+        friend bool operator==(const robin_iterator& lhs, const robin_iterator& rhs) { 
+            return lhs.m_bucket == rhs.m_bucket; 
+        }
+        
+        friend bool operator!=(const robin_iterator& lhs, const robin_iterator& rhs) { 
+            return !(lhs == rhs); 
+        }
+        
+    private:
+        bucket_entry_ptr m_bucket;
+    };
+
+    
+public:
+#if defined(__cplusplus) && __cplusplus >= 201402L
+    robin_hash(size_type bucket_count, 
+               const Hash& hash,
+               const KeyEqual& equal,
+               const Allocator& alloc,
+               float min_load_factor = DEFAULT_MIN_LOAD_FACTOR,
+               float max_load_factor = DEFAULT_MAX_LOAD_FACTOR): 
+                                       Hash(hash), 
+                                       KeyEqual(equal),
+                                       GrowthPolicy(bucket_count),
+                                       m_buckets_data(
+                                           [&]() {
+                                               if(bucket_count > max_bucket_count()) {
+                                                   TSL_RH_THROW_OR_TERMINATE(std::length_error, 
+                                                                             "The map exceeds its maximum bucket count.");
+                                               }
+                                               
+                                               return bucket_count;
+                                           }(), alloc
+                                       ),
+                                       m_buckets(m_buckets_data.empty()?static_empty_bucket_ptr():m_buckets_data.data()),
+                                       m_bucket_count(bucket_count),
+                                       m_nb_elements(0), 
+                                       m_grow_on_next_insert(false),
+                                       m_try_shrink_on_next_insert(false)
+    {
+        if(m_bucket_count > 0) {
+            tsl_rh_assert(!m_buckets_data.empty());
+            m_buckets_data.back().set_as_last_bucket();
+        }
+        
+        this->min_load_factor(min_load_factor);
+        this->max_load_factor(max_load_factor);
+    }
+#else
+    /**
+     * C++11 doesn't support the creation of a std::vector with a custom allocator and 'count' default-inserted elements. 
+     * The needed contructor `explicit vector(size_type count, const Allocator& alloc = Allocator());` is only
+     * available in C++14 and later. We thus must resize after using the `vector(const Allocator& alloc)` constructor.
+     * 
+     * We can't use `vector(size_type count, const T& value, const Allocator& alloc)` as it requires the
+     * value T to be copyable.
+     */
+    robin_hash(size_type bucket_count, 
+               const Hash& hash,
+               const KeyEqual& equal,
+               const Allocator& alloc,
+               float min_load_factor = DEFAULT_MIN_LOAD_FACTOR,
+               float max_load_factor = DEFAULT_MAX_LOAD_FACTOR): 
+                                       Hash(hash), 
+                                       KeyEqual(equal),
+                                       GrowthPolicy(bucket_count),
+                                       m_buckets_data(alloc), 
+                                       m_buckets(static_empty_bucket_ptr()), 
+                                       m_bucket_count(bucket_count),
+                                       m_nb_elements(0), 
+                                       m_grow_on_next_insert(false),
+                                       m_try_shrink_on_next_insert(false)
+    {
+        if(bucket_count > max_bucket_count()) {
+            TSL_RH_THROW_OR_TERMINATE(std::length_error, "The map exceeds its maximum bucket count.");
+        }
+        
+        if(m_bucket_count > 0) {
+            m_buckets_data.resize(m_bucket_count);
+            m_buckets = m_buckets_data.data();
+            
+            tsl_rh_assert(!m_buckets_data.empty());
+            m_buckets_data.back().set_as_last_bucket();
+        }
+        
+        this->min_load_factor(min_load_factor);
+        this->max_load_factor(max_load_factor);
+    }
+#endif
+    
+    robin_hash(const robin_hash& other): Hash(other),
+                                         KeyEqual(other),
+                                         GrowthPolicy(other),
+                                         m_buckets_data(other.m_buckets_data),
+                                         m_buckets(m_buckets_data.empty()?static_empty_bucket_ptr():m_buckets_data.data()),
+                                         m_bucket_count(other.m_bucket_count),
+                                         m_nb_elements(other.m_nb_elements),
+                                         m_load_threshold(other.m_load_threshold),
+                                         m_min_load_factor(other.m_min_load_factor),
+                                         m_max_load_factor(other.m_max_load_factor),
+                                         m_grow_on_next_insert(other.m_grow_on_next_insert),
+                                         m_try_shrink_on_next_insert(other.m_try_shrink_on_next_insert)
+    {
+    }
+    
+    robin_hash(robin_hash&& other) noexcept(std::is_nothrow_move_constructible<Hash>::value &&
+                                            std::is_nothrow_move_constructible<KeyEqual>::value &&
+                                            std::is_nothrow_move_constructible<GrowthPolicy>::value &&
+                                            std::is_nothrow_move_constructible<buckets_container_type>::value)
+                                          : Hash(std::move(static_cast<Hash&>(other))),
+                                            KeyEqual(std::move(static_cast<KeyEqual&>(other))),
+                                            GrowthPolicy(std::move(static_cast<GrowthPolicy&>(other))),
+                                            m_buckets_data(std::move(other.m_buckets_data)),
+                                            m_buckets(m_buckets_data.empty()?static_empty_bucket_ptr():m_buckets_data.data()),
+                                            m_bucket_count(other.m_bucket_count),
+                                            m_nb_elements(other.m_nb_elements),
+                                            m_load_threshold(other.m_load_threshold),
+                                            m_min_load_factor(other.m_min_load_factor),
+                                            m_max_load_factor(other.m_max_load_factor),
+                                            m_grow_on_next_insert(other.m_grow_on_next_insert),
+                                            m_try_shrink_on_next_insert(other.m_try_shrink_on_next_insert)
+    {
+        other.clear_and_shrink();
+    }
+    
+    robin_hash& operator=(const robin_hash& other) {
+        if(&other != this) {
+            Hash::operator=(other);
+            KeyEqual::operator=(other);
+            GrowthPolicy::operator=(other);
+            
+            m_buckets_data = other.m_buckets_data;
+            m_buckets = m_buckets_data.empty()?static_empty_bucket_ptr():
+                                               m_buckets_data.data();
+            m_bucket_count = other.m_bucket_count;
+            m_nb_elements = other.m_nb_elements;
+            
+            m_load_threshold = other.m_load_threshold;
+            m_min_load_factor = other.m_min_load_factor;
+            m_max_load_factor = other.m_max_load_factor;
+            
+            m_grow_on_next_insert = other.m_grow_on_next_insert;
+            m_try_shrink_on_next_insert = other.m_try_shrink_on_next_insert;
+        }
+        
+        return *this;
+    }
+    
+    robin_hash& operator=(robin_hash&& other) {
+        other.swap(*this);
+        other.clear();
+        
+        return *this;
+    }
+    
+    allocator_type get_allocator() const {
+        return m_buckets_data.get_allocator();
+    }
+    
+    
+    /*
+     * Iterators
+     */
+    iterator begin() noexcept {
+        std::size_t i = 0;
+        while(i < m_bucket_count && m_buckets[i].empty()) {
+            i++;
+        }
+        
+        return iterator(m_buckets + i);
+    }
+    
+    const_iterator begin() const noexcept {
+        return cbegin();
+    }
+    
+    const_iterator cbegin() const noexcept {
+        std::size_t i = 0;
+        while(i < m_bucket_count && m_buckets[i].empty()) {
+            i++;
+        }
+        
+        return const_iterator(m_buckets + i);
+    }
+    
+    iterator end() noexcept {
+        return iterator(m_buckets + m_bucket_count);
+    }
+    
+    const_iterator end() const noexcept {
+        return cend();
+    }
+    
+    const_iterator cend() const noexcept {
+        return const_iterator(m_buckets + m_bucket_count);
+    }
+    
+    
+    /*
+     * Capacity
+     */
+    bool empty() const noexcept {
+        return m_nb_elements == 0;
+    }
+    
+    size_type size() const noexcept {
+        return m_nb_elements;
+    }
+    
+    size_type max_size() const noexcept {
+        return m_buckets_data.max_size();
+    }
+    
+    /*
+     * Modifiers
+     */
+    void clear() noexcept {
+        if(m_min_load_factor > 0.0f) {
+            clear_and_shrink();
+        }
+        else {
+            for(auto& bucket: m_buckets_data) {
+                bucket.clear();
+            }
+            
+            m_nb_elements = 0;
+            m_grow_on_next_insert = false;
+        }
+    }
+    
+    
+    
+    template<typename P>
+    std::pair<iterator, bool> insert(P&& value) {
+        return insert_impl(KeySelect()(value), std::forward<P>(value));
+    }
+    
+    template<typename P>
+    iterator insert_hint(const_iterator hint, P&& value) { 
+        if(hint != cend() && compare_keys(KeySelect()(*hint), KeySelect()(value))) { 
+            return mutable_iterator(hint); 
+        }
+        
+        return insert(std::forward<P>(value)).first; 
+    }
+    
+    template<class InputIt>
+    void insert(InputIt first, InputIt last) {
+        if(std::is_base_of<std::forward_iterator_tag, 
+                           typename std::iterator_traits<InputIt>::iterator_category>::value) 
+        {
+            const auto nb_elements_insert = std::distance(first, last);
+            const size_type nb_free_buckets = m_load_threshold - size();
+            tsl_rh_assert(m_load_threshold >= size());
+            
+            if(nb_elements_insert > 0 && nb_free_buckets < size_type(nb_elements_insert)) {
+                reserve(size() + size_type(nb_elements_insert));
+            }
+        }
+        
+        for(; first != last; ++first) {
+            insert(*first);
+        }
+    }
+    
+    
+    
+    template<class K, class M>
+    std::pair<iterator, bool> insert_or_assign(K&& key, M&& obj) { 
+        auto it = try_emplace(std::forward<K>(key), std::forward<M>(obj));
+        if(!it.second) {
+            it.first.value() = std::forward<M>(obj);
+        }
+        
+        return it;
+    }
+    
+    template<class K, class M>
+    iterator insert_or_assign(const_iterator hint, K&& key, M&& obj) {
+        if(hint != cend() && compare_keys(KeySelect()(*hint), key)) { 
+            auto it = mutable_iterator(hint); 
+            it.value() = std::forward<M>(obj);
+            
+            return it;
+        }
+        
+        return insert_or_assign(std::forward<K>(key), std::forward<M>(obj)).first;
+    }
+
+    
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&&... args) {
+        return insert(value_type(std::forward<Args>(args)...));
+    }
+    
+    template<class... Args>
+    iterator emplace_hint(const_iterator hint, Args&&... args) {
+        return insert_hint(hint, value_type(std::forward<Args>(args)...));        
+    }
+    
+    
+    
+    template<class K, class... Args>
+    std::pair<iterator, bool> try_emplace(K&& key, Args&&... args) {
+        return insert_impl(key, std::piecewise_construct, 
+                                std::forward_as_tuple(std::forward<K>(key)), 
+                                std::forward_as_tuple(std::forward<Args>(args)...));
+    }
+    
+    template<class K, class... Args>
+    iterator try_emplace_hint(const_iterator hint, K&& key, Args&&... args) { 
+        if(hint != cend() && compare_keys(KeySelect()(*hint), key)) { 
+            return mutable_iterator(hint); 
+        }
+        
+        return try_emplace(std::forward<K>(key), std::forward<Args>(args)...).first;
+    }
+    
+    /**
+     * Here to avoid `template<class K> size_type erase(const K& key)` being used when
+     * we use an `iterator` instead of a `const_iterator`.
+     */
+    iterator erase(iterator pos) {
+        erase_from_bucket(pos);
+        
+        /**
+         * Erase bucket used a backward shift after clearing the bucket.
+         * Check if there is a new value in the bucket, if not get the next non-empty.
+         */
+        if(pos.m_bucket->empty()) {
+            ++pos;
+        }
+        
+        m_try_shrink_on_next_insert = true;
+        
+        return pos;
+    }
+    
+    iterator erase(const_iterator pos) {
+        return erase(mutable_iterator(pos));
+    }
+    
+    iterator erase(const_iterator first, const_iterator last) {
+        if(first == last) {
+            return mutable_iterator(first);
+        }
+        
+        auto first_mutable = mutable_iterator(first);
+        auto last_mutable = mutable_iterator(last);
+        for(auto it = first_mutable.m_bucket; it != last_mutable.m_bucket; ++it) {
+            if(!it->empty()) {
+                it->clear();
+                m_nb_elements--;
+            }
+        }
+        
+        if(last_mutable == end()) {
+            m_try_shrink_on_next_insert = true;
+            return end();
+        }
+        
+        
+        /*
+         * Backward shift on the values which come after the deleted values.
+         * We try to move the values closer to their ideal bucket.
+         */
+        std::size_t icloser_bucket = static_cast<std::size_t>(first_mutable.m_bucket - m_buckets);
+        std::size_t ito_move_closer_value = static_cast<std::size_t>(last_mutable.m_bucket - m_buckets);
+        tsl_rh_assert(ito_move_closer_value > icloser_bucket);
+        
+        const std::size_t ireturn_bucket = ito_move_closer_value - 
+                                           std::min(ito_move_closer_value - icloser_bucket, 
+                                                    std::size_t(m_buckets[ito_move_closer_value].dist_from_ideal_bucket()));
+        
+        while(ito_move_closer_value < m_bucket_count && m_buckets[ito_move_closer_value].dist_from_ideal_bucket() > 0) {
+            icloser_bucket = ito_move_closer_value - 
+                             std::min(ito_move_closer_value - icloser_bucket, 
+                                      std::size_t(m_buckets[ito_move_closer_value].dist_from_ideal_bucket()));
+            
+            
+            tsl_rh_assert(m_buckets[icloser_bucket].empty());
+            const distance_type new_distance = distance_type(m_buckets[ito_move_closer_value].dist_from_ideal_bucket() -
+                                                             (ito_move_closer_value - icloser_bucket));
+            m_buckets[icloser_bucket].set_value_of_empty_bucket(new_distance, 
+                                                                m_buckets[ito_move_closer_value].truncated_hash(), 
+                                                                std::move(m_buckets[ito_move_closer_value].value()));
+            m_buckets[ito_move_closer_value].clear();
+            
+            
+            ++icloser_bucket;
+            ++ito_move_closer_value;
+        }
+        
+        m_try_shrink_on_next_insert = true;
+        
+        return iterator(m_buckets + ireturn_bucket);
+    }
+    
+    
+    template<class K>
+    size_type erase(const K& key) {
+        return erase(key, hash_key(key));
+    }
+    
+    template<class K>
+    size_type erase(const K& key, std::size_t hash) {
+        auto it = find(key, hash);
+        if(it != end()) {
+            erase_from_bucket(it);
+            m_try_shrink_on_next_insert = true;
+            
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    }
+    
+    
+    
+    
+    
+    void swap(robin_hash& other) {
+        using std::swap;
+        
+        swap(static_cast<Hash&>(*this), static_cast<Hash&>(other));
+        swap(static_cast<KeyEqual&>(*this), static_cast<KeyEqual&>(other));
+        swap(static_cast<GrowthPolicy&>(*this), static_cast<GrowthPolicy&>(other));
+        swap(m_buckets_data, other.m_buckets_data);
+        swap(m_buckets, other.m_buckets);
+        swap(m_bucket_count, other.m_bucket_count);
+        swap(m_nb_elements, other.m_nb_elements);
+        swap(m_load_threshold, other.m_load_threshold);
+        swap(m_min_load_factor, other.m_min_load_factor);
+        swap(m_max_load_factor, other.m_max_load_factor);
+        swap(m_grow_on_next_insert, other.m_grow_on_next_insert);
+        swap(m_try_shrink_on_next_insert, other.m_try_shrink_on_next_insert);
+    }
+    
+    
+    /*
+     * Lookup
+     */
+    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    typename U::value_type& at(const K& key) {
+        return at(key, hash_key(key));
+    }
+    
+    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    typename U::value_type& at(const K& key, std::size_t hash) {
+        return const_cast<typename U::value_type&>(static_cast<const robin_hash*>(this)->at(key, hash));
+    }
+    
+    
+    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    const typename U::value_type& at(const K& key) const {
+        return at(key, hash_key(key));
+    }
+    
+    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    const typename U::value_type& at(const K& key, std::size_t hash) const {
+        auto it = find(key, hash);
+        if(it != cend()) {
+            return it.value();
+        }
+        else {
+            TSL_RH_THROW_OR_TERMINATE(std::out_of_range, "Couldn't find key.");
+        }
+    }
+    
+    template<class K, class U = ValueSelect, typename std::enable_if<has_mapped_type<U>::value>::type* = nullptr>
+    typename U::value_type& operator[](K&& key) {
+        return try_emplace(std::forward<K>(key)).first.value();
+    }
+    
+    
+    template<class K>
+    size_type count(const K& key) const {
+        return count(key, hash_key(key));
+    }
+    
+    template<class K>
+    size_type count(const K& key, std::size_t hash) const {
+        if(find(key, hash) != cend()) {
+            return 1;
+        }
+        else {
+            return 0;
+        }
+    }
+    
+    
+    template<class K>
+    iterator find(const K& key) {
+        return find_impl(key, hash_key(key));
+    }
+    
+    template<class K>
+    iterator find(const K& key, std::size_t hash) {
+        return find_impl(key, hash);
+    }
+    
+    
+    template<class K>
+    const_iterator find(const K& key) const {
+        return find_impl(key, hash_key(key));
+    }
+    
+    template<class K>
+    const_iterator find(const K& key, std::size_t hash) const {
+        return find_impl(key, hash);
+    }
+    
+    
+    template<class K>
+    bool contains(const K& key) const {
+        return contains(key, hash_key(key));
+    }
+    
+    template<class K>
+    bool contains(const K& key, std::size_t hash) const {
+        return count(key, hash) != 0;
+    }
+    
+    
+    template<class K>
+    std::pair<iterator, iterator> equal_range(const K& key) {
+        return equal_range(key, hash_key(key));
+    }
+    
+    template<class K>
+    std::pair<iterator, iterator> equal_range(const K& key, std::size_t hash) {
+        iterator it = find(key, hash);
+        return std::make_pair(it, (it == end())?it:std::next(it));
+    }
+    
+    
+    template<class K>
+    std::pair<const_iterator, const_iterator> equal_range(const K& key) const {
+        return equal_range(key, hash_key(key));
+    }
+    
+    template<class K>
+    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t hash) const {
+        const_iterator it = find(key, hash);
+        return std::make_pair(it, (it == cend())?it:std::next(it));
+    }
+    
+    /*
+     * Bucket interface 
+     */
+    size_type bucket_count() const {
+        return m_bucket_count; 
+    }
+    
+    size_type max_bucket_count() const {
+        return std::min(GrowthPolicy::max_bucket_count(), m_buckets_data.max_size());
+    }
+    
+    /*
+     * Hash policy 
+     */
+    float load_factor() const {
+        if(bucket_count() == 0) {
+            return 0;
+        }
+        
+        return float(m_nb_elements)/float(bucket_count());
+    }
+    
+    float min_load_factor() const {
+        return m_min_load_factor;
+    }
+    
+    float max_load_factor() const {
+        return m_max_load_factor;
+    }
+    
+    void min_load_factor(float ml) {
+        m_min_load_factor = clamp(ml, float(MINIMUM_MIN_LOAD_FACTOR), 
+                                      float(MAXIMUM_MIN_LOAD_FACTOR));
+    }
+    
+    void max_load_factor(float ml) {
+        m_max_load_factor = clamp(ml, float(MINIMUM_MAX_LOAD_FACTOR), 
+                                      float(MAXIMUM_MAX_LOAD_FACTOR));
+        m_load_threshold = size_type(float(bucket_count())*m_max_load_factor);
+    }
+    
+    void rehash(size_type count) {
+        count = std::max(count, size_type(std::ceil(float(size())/max_load_factor())));
+        rehash_impl(count);
+    }
+    
+    void reserve(size_type count) {
+        rehash(size_type(std::ceil(float(count)/max_load_factor())));
+    }    
+    
+    /*
+     * Observers
+     */
+    hasher hash_function() const {
+        return static_cast<const Hash&>(*this);
+    }
+    
+    key_equal key_eq() const {
+        return static_cast<const KeyEqual&>(*this);
+    }
+    
+    
+    /*
+     * Other
+     */    
+    iterator mutable_iterator(const_iterator pos) {
+        return iterator(const_cast<bucket_entry*>(pos.m_bucket));
+    }
+    
+private:
+    template<class K>
+    std::size_t hash_key(const K& key) const {
+        return Hash::operator()(key);
+    }
+    
+    template<class K1, class K2>
+    bool compare_keys(const K1& key1, const K2& key2) const {
+        return KeyEqual::operator()(key1, key2);
+    }
+    
+    std::size_t bucket_for_hash(std::size_t hash) const {
+        const std::size_t bucket = GrowthPolicy::bucket_for_hash(hash);
+        tsl_rh_assert(bucket < m_bucket_count || (bucket == 0 && m_bucket_count == 0));
+        
+        return bucket;
+    }
+    
+    template<class U = GrowthPolicy, typename std::enable_if<is_power_of_two_policy<U>::value>::type* = nullptr>
+    std::size_t next_bucket(std::size_t index) const noexcept {
+        tsl_rh_assert(index < bucket_count());
+        
+        return (index + 1) & this->m_mask;
+    }
+    
+    template<class U = GrowthPolicy, typename std::enable_if<!is_power_of_two_policy<U>::value>::type* = nullptr>
+    std::size_t next_bucket(std::size_t index) const noexcept {
+        tsl_rh_assert(index < bucket_count());
+        
+        index++;
+        return (index != bucket_count())?index:0;
+    }
+    
+    
+    
+    template<class K>
+    iterator find_impl(const K& key, std::size_t hash) {
+        return mutable_iterator(static_cast<const robin_hash*>(this)->find(key, hash));
+    }
+    
+    template<class K>
+    const_iterator find_impl(const K& key, std::size_t hash) const {
+        std::size_t ibucket = bucket_for_hash(hash); 
+        distance_type dist_from_ideal_bucket = 0;
+        
+        while(dist_from_ideal_bucket <= m_buckets[ibucket].dist_from_ideal_bucket()) {
+            if(TSL_RH_LIKELY((!USE_STORED_HASH_ON_LOOKUP || m_buckets[ibucket].bucket_hash_equal(hash)) && 
+               compare_keys(KeySelect()(m_buckets[ibucket].value()), key))) 
+            {
+                return const_iterator(m_buckets + ibucket);
+            }
+            
+            ibucket = next_bucket(ibucket);
+            dist_from_ideal_bucket++;
+        }
+        
+        return cend();
+    }
+    
+    void erase_from_bucket(iterator pos) {
+        pos.m_bucket->clear();
+        m_nb_elements--;
+        
+        /**
+         * Backward shift, swap the empty bucket, previous_ibucket, with the values on its right, ibucket,
+         * until we cross another empty bucket or if the other bucket has a distance_from_ideal_bucket == 0.
+         * 
+         * We try to move the values closer to their ideal bucket.
+         */
+        std::size_t previous_ibucket = static_cast<std::size_t>(pos.m_bucket - m_buckets);
+        std::size_t ibucket = next_bucket(previous_ibucket);
+        
+        while(m_buckets[ibucket].dist_from_ideal_bucket() > 0) {
+            tsl_rh_assert(m_buckets[previous_ibucket].empty());
+            
+            const distance_type new_distance = distance_type(m_buckets[ibucket].dist_from_ideal_bucket() - 1);
+            m_buckets[previous_ibucket].set_value_of_empty_bucket(new_distance, m_buckets[ibucket].truncated_hash(), 
+                                                                  std::move(m_buckets[ibucket].value()));
+            m_buckets[ibucket].clear();
+
+            previous_ibucket = ibucket;
+            ibucket = next_bucket(ibucket);
+        }
+    }
+    
+    template<class K, class... Args>
+    std::pair<iterator, bool> insert_impl(const K& key, Args&&... value_type_args) {
+        const std::size_t hash = hash_key(key);
+        
+        std::size_t ibucket = bucket_for_hash(hash); 
+        distance_type dist_from_ideal_bucket = 0;
+        
+        while(dist_from_ideal_bucket <= m_buckets[ibucket].dist_from_ideal_bucket()) {
+            if((!USE_STORED_HASH_ON_LOOKUP || m_buckets[ibucket].bucket_hash_equal(hash)) &&
+               compare_keys(KeySelect()(m_buckets[ibucket].value()), key)) 
+            {
+                return std::make_pair(iterator(m_buckets + ibucket), false);
+            }
+            
+            ibucket = next_bucket(ibucket);
+            dist_from_ideal_bucket++;
+        }
+        
+        if(rehash_on_extreme_load()) {
+            ibucket = bucket_for_hash(hash);
+            dist_from_ideal_bucket = 0;
+            
+            while(dist_from_ideal_bucket <= m_buckets[ibucket].dist_from_ideal_bucket()) {
+                ibucket = next_bucket(ibucket);
+                dist_from_ideal_bucket++;
+            }
+        }
+ 
+        
+        if(m_buckets[ibucket].empty()) {
+            m_buckets[ibucket].set_value_of_empty_bucket(dist_from_ideal_bucket, bucket_entry::truncate_hash(hash),
+                                                         std::forward<Args>(value_type_args)...);
+        }
+        else {
+            insert_value(ibucket, dist_from_ideal_bucket, bucket_entry::truncate_hash(hash), 
+                         std::forward<Args>(value_type_args)...);
+        }
+        
+        
+        m_nb_elements++;
+        /*
+         * The value will be inserted in ibucket in any case, either because it was
+         * empty or by stealing the bucket (robin hood). 
+         */
+        return std::make_pair(iterator(m_buckets + ibucket), true);
+    }
+    
+    
+    template<class... Args>
+    void insert_value(std::size_t ibucket, distance_type dist_from_ideal_bucket, 
+                      truncated_hash_type hash, Args&&... value_type_args) 
+    {
+        value_type value(std::forward<Args>(value_type_args)...);
+        insert_value_impl(ibucket, dist_from_ideal_bucket, hash, value);
+    }
+
+    void insert_value(std::size_t ibucket, distance_type dist_from_ideal_bucket,
+                      truncated_hash_type hash, value_type&& value)
+    {
+        insert_value_impl(ibucket, dist_from_ideal_bucket, hash, value);
+    }
+
+    /*
+     * We don't use `value_type&& value` as last argument due to a bug in MSVC when `value_type` is a pointer,
+     * The compiler is not able to see the difference between `std::string*` and `std::string*&&` resulting in 
+     * a compilation error.
+     * 
+     * The `value` will be in a moved state at the end of the function.
+     */
+    void insert_value_impl(std::size_t ibucket, distance_type dist_from_ideal_bucket,
+                           truncated_hash_type hash, value_type& value)
+    {
+        m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket, hash, value);
+        ibucket = next_bucket(ibucket);
+        dist_from_ideal_bucket++;
+        
+        while(!m_buckets[ibucket].empty()) {
+            if(dist_from_ideal_bucket > m_buckets[ibucket].dist_from_ideal_bucket()) {
+                if(dist_from_ideal_bucket >= bucket_entry::DIST_FROM_IDEAL_BUCKET_LIMIT) {
+                    /**
+                     * The number of probes is really high, rehash the map on the next insert.
+                     * Difficult to do now as rehash may throw an exception.
+                     */
+                    m_grow_on_next_insert = true;
+                }
+            
+                m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket, hash, value);
+            }
+            
+            ibucket = next_bucket(ibucket);
+            dist_from_ideal_bucket++;
+        }
+        
+        m_buckets[ibucket].set_value_of_empty_bucket(dist_from_ideal_bucket, hash, std::move(value));
+    }
+    
+    
+    void rehash_impl(size_type count) {
+        robin_hash new_table(count, static_cast<Hash&>(*this), static_cast<KeyEqual&>(*this), 
+                             get_allocator(), m_min_load_factor, m_max_load_factor);
+        
+        const bool use_stored_hash = USE_STORED_HASH_ON_REHASH(new_table.bucket_count());
+        for(auto& bucket: m_buckets_data) {
+            if(bucket.empty()) { 
+                continue; 
+            }
+            
+            const std::size_t hash = use_stored_hash?bucket.truncated_hash():
+                                                     new_table.hash_key(KeySelect()(bucket.value()));
+                                                     
+            new_table.insert_value_on_rehash(new_table.bucket_for_hash(hash), 0, 
+                                             bucket_entry::truncate_hash(hash), std::move(bucket.value()));
+        }
+        
+        new_table.m_nb_elements = m_nb_elements;
+        new_table.swap(*this);
+    }
+    
+    void clear_and_shrink() noexcept {
+        GrowthPolicy::clear();
+        m_buckets_data.clear();
+        m_buckets = static_empty_bucket_ptr();
+        m_bucket_count = 0;
+        m_nb_elements = 0;
+        m_load_threshold = 0;
+        m_grow_on_next_insert = false;
+        m_try_shrink_on_next_insert = false;
+    }
+    
+    void insert_value_on_rehash(std::size_t ibucket, distance_type dist_from_ideal_bucket, 
+                                truncated_hash_type hash, value_type&& value) 
+    {
+        while(true) {
+            if(dist_from_ideal_bucket > m_buckets[ibucket].dist_from_ideal_bucket()) {
+                if(m_buckets[ibucket].empty()) {
+                    m_buckets[ibucket].set_value_of_empty_bucket(dist_from_ideal_bucket, hash, std::move(value));
+                    return;
+                }
+                else {
+                    m_buckets[ibucket].swap_with_value_in_bucket(dist_from_ideal_bucket, hash, value);
+                }
+            }
+            
+            dist_from_ideal_bucket++;
+            ibucket = next_bucket(ibucket);
+        }
+    }
+    
+    
+    
+    /**
+     * Grow the table if m_grow_on_next_insert is true or we reached the max_load_factor.
+     * Shrink the table if m_try_shrink_on_next_insert is true (an erase occurred) and
+     * we're below the min_load_factor.
+     * 
+     * Return true if the table has been rehashed.
+     */
+    bool rehash_on_extreme_load() {
+        if(m_grow_on_next_insert || size() >= m_load_threshold) {
+            rehash_impl(GrowthPolicy::next_bucket_count());
+            m_grow_on_next_insert = false;
+            
+            return true;
+        }
+        
+        if(m_try_shrink_on_next_insert) {
+            m_try_shrink_on_next_insert = false;
+            if(m_min_load_factor != 0.0f && load_factor() < m_min_load_factor) {
+                reserve(size() + 1);
+                
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+    
+public:
+    static const size_type DEFAULT_INIT_BUCKETS_SIZE = 0;
+    
+    static constexpr float DEFAULT_MAX_LOAD_FACTOR = 0.5f;
+    static constexpr float MINIMUM_MAX_LOAD_FACTOR = 0.2f;
+    static constexpr float MAXIMUM_MAX_LOAD_FACTOR = 0.95f;
+    
+    static constexpr float DEFAULT_MIN_LOAD_FACTOR = 0.0f;
+    static constexpr float MINIMUM_MIN_LOAD_FACTOR = 0.0f;
+    static constexpr float MAXIMUM_MIN_LOAD_FACTOR = 0.15f;
+    
+    static_assert(MINIMUM_MAX_LOAD_FACTOR < MAXIMUM_MAX_LOAD_FACTOR, 
+                  "MINIMUM_MAX_LOAD_FACTOR should be < MAXIMUM_MAX_LOAD_FACTOR");
+    static_assert(MINIMUM_MIN_LOAD_FACTOR < MAXIMUM_MIN_LOAD_FACTOR, 
+                  "MINIMUM_MIN_LOAD_FACTOR should be < MAXIMUM_MIN_LOAD_FACTOR");
+    static_assert(MAXIMUM_MIN_LOAD_FACTOR < MINIMUM_MAX_LOAD_FACTOR, 
+                  "MAXIMUM_MIN_LOAD_FACTOR should be < MINIMUM_MAX_LOAD_FACTOR");
+    
+private:
+    /**
+     * Return an always valid pointer to an static empty bucket_entry with last_bucket() == true.
+     */            
+    bucket_entry* static_empty_bucket_ptr() noexcept {
+        static bucket_entry empty_bucket(true);
+        return &empty_bucket;
+    }
+    
+private:
+    buckets_container_type m_buckets_data;
+    
+    /**
+     * Points to m_buckets_data.data() if !m_buckets_data.empty() otherwise points to static_empty_bucket_ptr.
+     * This variable is useful to avoid the cost of checking if m_buckets_data is empty when trying 
+     * to find an element.
+     * 
+     * TODO Remove m_buckets_data and only use a pointer instead of a pointer+vector to save some space in the robin_hash object.
+     * Manage the Allocator manually.
+     */
+    bucket_entry* m_buckets;
+    
+    /**
+     * Used a lot in find, avoid the call to m_buckets_data.size() which is a bit slower.
+     */
+    size_type m_bucket_count;
+    
+    size_type m_nb_elements;
+    
+    size_type m_load_threshold;
+    
+    float m_min_load_factor;
+    float m_max_load_factor;
+    
+    bool m_grow_on_next_insert;
+    
+    /**
+     * We can't shrink down the map on erase operations as the erase methods need to return the next iterator.
+     * Shrinking the map would invalidate all the iterators and we could not return the next iterator in a meaningful way,
+     * On erase, we thus just indicate on erase that we should try to shrink the hash table on the next insert
+     * if we go below the min_load_factor. 
+     */
+    bool m_try_shrink_on_next_insert;
+};
+
+}
+
+}
+
+#endif
diff --git a/src/util/graph/robin/robin_map.h b/src/util/graph/robin/robin_map.h
new file mode 100644
index 0000000..86761f5
--- /dev/null
+++ b/src/util/graph/robin/robin_map.h
@@ -0,0 +1,715 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef TSL_ROBIN_MAP_H
+#define TSL_ROBIN_MAP_H 
+
+
+#include <cstddef>
+#include <functional>
+#include <initializer_list>
+#include <memory>
+#include <type_traits>
+#include <utility>
+#include "robin_hash.h"
+
+
+namespace tsl {
+
+    
+/**
+ * Implementation of a hash map using open-addressing and the robin hood hashing algorithm with backward shift deletion.
+ * 
+ * For operations modifying the hash map (insert, erase, rehash, ...), the strong exception guarantee 
+ * is only guaranteed when the expression `std::is_nothrow_swappable<std::pair<Key, T>>::value &&
+ * std::is_nothrow_move_constructible<std::pair<Key, T>>::value` is true, otherwise if an exception
+ * is thrown during the swap or the move, the hash map may end up in a undefined state. Per the standard
+ * a `Key` or `T` with a noexcept copy constructor and no move constructor also satisfies the 
+ * `std::is_nothrow_move_constructible<std::pair<Key, T>>::value` criterion (and will thus guarantee the 
+ * strong exception for the map).
+ * 
+ * When `StoreHash` is true, 32 bits of the hash are stored alongside the values. It can improve 
+ * the performance during lookups if the `KeyEqual` function takes time (if it engenders a cache-miss for example) 
+ * as we then compare the stored hashes before comparing the keys. When `tsl::rh::power_of_two_growth_policy` is used
+ * as `GrowthPolicy`, it may also speed-up the rehash process as we can avoid to recalculate the hash. 
+ * When it is detected that storing the hash will not incur any memory penalty due to alignment (i.e. 
+ * `sizeof(tsl::detail_robin_hash::bucket_entry<ValueType, true>) == 
+ * sizeof(tsl::detail_robin_hash::bucket_entry<ValueType, false>)`) and `tsl::rh::power_of_two_growth_policy` is
+ * used, the hash will be stored even if `StoreHash` is false so that we can speed-up the rehash (but it will
+ * not be used on lookups unless `StoreHash` is true).
+ * 
+ * `GrowthPolicy` defines how the map grows and consequently how a hash value is mapped to a bucket. 
+ * By default the map uses `tsl::rh::power_of_two_growth_policy`. This policy keeps the number of buckets 
+ * to a power of two and uses a mask to map the hash to a bucket instead of the slow modulo.
+ * Other growth policies are available and you may define your own growth policy, 
+ * check `tsl::rh::power_of_two_growth_policy` for the interface.
+ * 
+ * `std::pair<Key, T>` must be swappable.
+ * 
+ * `Key` and `T` must be copy and/or move constructible.
+ * 
+ * If the destructor of `Key` or `T` throws an exception, the behaviour of the class is undefined.
+ * 
+ * Iterators invalidation:
+ *  - clear, operator=, reserve, rehash: always invalidate the iterators.
+ *  - insert, emplace, emplace_hint, operator[]: if there is an effective insert, invalidate the iterators.
+ *  - erase: always invalidate the iterators.
+ */
+template<class Key, 
+         class T, 
+         class Hash = std::hash<Key>,
+         class KeyEqual = std::equal_to<Key>,
+         class Allocator = std::allocator<std::pair<Key, T>>,
+         bool StoreHash = false,
+         class GrowthPolicy = tsl::rh::power_of_two_growth_policy<2>>
+class robin_map {
+private:
+    template<typename U>
+    using has_is_transparent = tsl::detail_robin_hash::has_is_transparent<U>;
+    
+    class KeySelect {
+    public:
+        using key_type = Key;
+        
+        const key_type& operator()(const std::pair<Key, T>& key_value) const noexcept {
+            return key_value.first;
+        }
+        
+        key_type& operator()(std::pair<Key, T>& key_value) noexcept {
+            return key_value.first;
+        }
+    };  
+    
+    class ValueSelect {
+    public:
+        using value_type = T;
+        
+        const value_type& operator()(const std::pair<Key, T>& key_value) const noexcept {
+            return key_value.second;
+        }
+        
+        value_type& operator()(std::pair<Key, T>& key_value) noexcept {
+            return key_value.second;
+        }
+    };
+    
+    using ht = detail_robin_hash::robin_hash<std::pair<Key, T>, KeySelect, ValueSelect,
+                                             Hash, KeyEqual, Allocator, StoreHash, GrowthPolicy>;  
+                                             
+public:
+    using key_type = typename ht::key_type;
+    using mapped_type = T;
+    using value_type = typename ht::value_type;
+    using size_type = typename ht::size_type;
+    using difference_type = typename ht::difference_type;
+    using hasher = typename ht::hasher;
+    using key_equal = typename ht::key_equal;
+    using allocator_type = typename ht::allocator_type;
+    using reference = typename ht::reference;
+    using const_reference = typename ht::const_reference;
+    using pointer = typename ht::pointer;
+    using const_pointer = typename ht::const_pointer;
+    using iterator = typename ht::iterator;
+    using const_iterator = typename ht::const_iterator;
+    
+    
+public:
+    /*
+     * Constructors
+     */
+    robin_map(): robin_map(ht::DEFAULT_INIT_BUCKETS_SIZE) {
+    }
+    
+    explicit robin_map(size_type bucket_count, 
+                       const Hash& hash = Hash(),
+                       const KeyEqual& equal = KeyEqual(),
+                       const Allocator& alloc = Allocator()): 
+                m_ht(bucket_count, hash, equal, alloc)
+    {
+    }
+    
+    robin_map(size_type bucket_count,
+              const Allocator& alloc): robin_map(bucket_count, Hash(), KeyEqual(), alloc)
+    {
+    }
+    
+    robin_map(size_type bucket_count,
+              const Hash& hash,
+              const Allocator& alloc): robin_map(bucket_count, hash, KeyEqual(), alloc)
+    {
+    }
+    
+    explicit robin_map(const Allocator& alloc): robin_map(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
+    }
+    
+    template<class InputIt>
+    robin_map(InputIt first, InputIt last,
+              size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
+              const Hash& hash = Hash(),
+              const KeyEqual& equal = KeyEqual(),
+              const Allocator& alloc = Allocator()): robin_map(bucket_count, hash, equal, alloc)
+    {
+        insert(first, last);
+    }
+    
+    template<class InputIt>
+    robin_map(InputIt first, InputIt last,
+              size_type bucket_count,
+              const Allocator& alloc): robin_map(first, last, bucket_count, Hash(), KeyEqual(), alloc)
+    {
+    }
+    
+    template<class InputIt>
+    robin_map(InputIt first, InputIt last,
+              size_type bucket_count,
+              const Hash& hash,
+              const Allocator& alloc): robin_map(first, last, bucket_count, hash, KeyEqual(), alloc)
+    {
+    }
+
+    robin_map(std::initializer_list<value_type> init,
+              size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
+              const Hash& hash = Hash(),
+              const KeyEqual& equal = KeyEqual(),
+              const Allocator& alloc = Allocator()): 
+          robin_map(init.begin(), init.end(), bucket_count, hash, equal, alloc)
+    {
+    }
+
+    robin_map(std::initializer_list<value_type> init,
+              size_type bucket_count,
+              const Allocator& alloc): 
+          robin_map(init.begin(), init.end(), bucket_count, Hash(), KeyEqual(), alloc)
+    {
+    }
+
+    robin_map(std::initializer_list<value_type> init,
+              size_type bucket_count,
+              const Hash& hash,
+              const Allocator& alloc): 
+          robin_map(init.begin(), init.end(), bucket_count, hash, KeyEqual(), alloc)
+    {
+    }
+    
+    robin_map& operator=(std::initializer_list<value_type> ilist) {
+        m_ht.clear();
+        
+        m_ht.reserve(ilist.size());
+        m_ht.insert(ilist.begin(), ilist.end());
+        
+        return *this;
+    }
+    
+    allocator_type get_allocator() const { return m_ht.get_allocator(); }
+    
+    
+    /*
+     * Iterators
+     */
+    iterator begin() noexcept { return m_ht.begin(); }
+    const_iterator begin() const noexcept { return m_ht.begin(); }
+    const_iterator cbegin() const noexcept { return m_ht.cbegin(); }
+    
+    iterator end() noexcept { return m_ht.end(); }
+    const_iterator end() const noexcept { return m_ht.end(); }
+    const_iterator cend() const noexcept { return m_ht.cend(); }
+    
+    
+    /*
+     * Capacity
+     */
+    bool empty() const noexcept { return m_ht.empty(); }
+    size_type size() const noexcept { return m_ht.size(); }
+    size_type max_size() const noexcept { return m_ht.max_size(); }
+    
+    /*
+     * Modifiers
+     */
+    void clear() noexcept { m_ht.clear(); }
+    
+    
+    
+    std::pair<iterator, bool> insert(const value_type& value) { 
+        return m_ht.insert(value); 
+    }
+        
+    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    std::pair<iterator, bool> insert(P&& value) { 
+        return m_ht.emplace(std::forward<P>(value)); 
+    }
+    
+    std::pair<iterator, bool> insert(value_type&& value) { 
+        return m_ht.insert(std::move(value)); 
+    }
+    
+    
+    iterator insert(const_iterator hint, const value_type& value) { 
+        return m_ht.insert_hint(hint, value); 
+    }
+        
+    template<class P, typename std::enable_if<std::is_constructible<value_type, P&&>::value>::type* = nullptr>
+    iterator insert(const_iterator hint, P&& value) { 
+        return m_ht.emplace_hint(hint, std::forward<P>(value));
+    }
+    
+    iterator insert(const_iterator hint, value_type&& value) { 
+        return m_ht.insert_hint(hint, std::move(value)); 
+    }
+    
+    
+    template<class InputIt>
+    void insert(InputIt first, InputIt last) { 
+        m_ht.insert(first, last); 
+    }
+    
+    void insert(std::initializer_list<value_type> ilist) { 
+        m_ht.insert(ilist.begin(), ilist.end()); 
+    }
+
+    
+    
+    
+    template<class M>
+    std::pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj) { 
+        return m_ht.insert_or_assign(k, std::forward<M>(obj)); 
+    }
+
+    template<class M>
+    std::pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj) { 
+        return m_ht.insert_or_assign(std::move(k), std::forward<M>(obj)); 
+    }
+    
+    template<class M>
+    iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj) {
+        return m_ht.insert_or_assign(hint, k, std::forward<M>(obj));
+    }
+    
+    template<class M>
+    iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj) {
+        return m_ht.insert_or_assign(hint, std::move(k), std::forward<M>(obj));
+    }
+    
+    
+    
+    /**
+     * Due to the way elements are stored, emplace will need to move or copy the key-value once.
+     * The method is equivalent to insert(value_type(std::forward<Args>(args)...));
+     * 
+     * Mainly here for compatibility with the std::unordered_map interface.
+     */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&&... args) { 
+        return m_ht.emplace(std::forward<Args>(args)...); 
+    }
+    
+    
+    
+    /**
+     * Due to the way elements are stored, emplace_hint will need to move or copy the key-value once.
+     * The method is equivalent to insert(hint, value_type(std::forward<Args>(args)...));
+     * 
+     * Mainly here for compatibility with the std::unordered_map interface.
+     */
+    template<class... Args>
+    iterator emplace_hint(const_iterator hint, Args&&... args) {
+        return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
+    }
+    
+    
+    
+    
+    template<class... Args>
+    std::pair<iterator, bool> try_emplace(const key_type& k, Args&&... args) { 
+        return m_ht.try_emplace(k, std::forward<Args>(args)...);
+    }
+    
+    template<class... Args>
+    std::pair<iterator, bool> try_emplace(key_type&& k, Args&&... args) {
+        return m_ht.try_emplace(std::move(k), std::forward<Args>(args)...);
+    }
+    
+    template<class... Args>
+    iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args) {
+        return m_ht.try_emplace_hint(hint, k, std::forward<Args>(args)...);
+    }
+    
+    template<class... Args>
+    iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args) {
+        return m_ht.try_emplace_hint(hint, std::move(k), std::forward<Args>(args)...);
+    }
+    
+    
+
+    
+    iterator erase(iterator pos) { return m_ht.erase(pos); }
+    iterator erase(const_iterator pos) { return m_ht.erase(pos); }
+    iterator erase(const_iterator first, const_iterator last) { return m_ht.erase(first, last); }
+    size_type erase(const key_type& key) { return m_ht.erase(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup to the value if you already have the hash.
+     */    
+    size_type erase(const key_type& key, std::size_t precalculated_hash) { 
+        return m_ht.erase(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type erase(const K& key) { return m_ht.erase(key); }
+    
+    /**
+     * @copydoc erase(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup to the value if you already have the hash.
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type erase(const K& key, std::size_t precalculated_hash) { 
+        return m_ht.erase(key, precalculated_hash); 
+    }
+    
+    
+    
+    void swap(robin_map& other) { other.m_ht.swap(m_ht); }
+    
+    
+    
+    /*
+     * Lookup
+     */
+    T& at(const Key& key) { return m_ht.at(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    T& at(const Key& key, std::size_t precalculated_hash) { return m_ht.at(key, precalculated_hash); }
+    
+    
+    const T& at(const Key& key) const { return m_ht.at(key); }
+    
+    /**
+     * @copydoc at(const Key& key, std::size_t precalculated_hash)
+     */
+    const T& at(const Key& key, std::size_t precalculated_hash) const { return m_ht.at(key, precalculated_hash); }
+    
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    T& at(const K& key) { return m_ht.at(key); }
+
+    /**
+     * @copydoc at(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    T& at(const K& key, std::size_t precalculated_hash) { return m_ht.at(key, precalculated_hash); }
+    
+    
+    /**
+     * @copydoc at(const K& key)
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    const T& at(const K& key) const { return m_ht.at(key); }
+    
+    /**
+     * @copydoc at(const K& key, std::size_t precalculated_hash)
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    const T& at(const K& key, std::size_t precalculated_hash) const { return m_ht.at(key, precalculated_hash); }
+    
+    
+    
+    
+    T& operator[](const Key& key) { return m_ht[key]; }    
+    T& operator[](Key&& key) { return m_ht[std::move(key)]; }
+    
+    
+    
+    
+    size_type count(const Key& key) const { return m_ht.count(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    size_type count(const Key& key, std::size_t precalculated_hash) const { 
+        return m_ht.count(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type count(const K& key) const { return m_ht.count(key); }
+    
+    /**
+     * @copydoc count(const K& key) const
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */     
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type count(const K& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
+    
+    
+    
+    
+    iterator find(const Key& key) { return m_ht.find(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    iterator find(const Key& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
+    
+    const_iterator find(const Key& key) const { return m_ht.find(key); }
+    
+    /**
+     * @copydoc find(const Key& key, std::size_t precalculated_hash)
+     */
+    const_iterator find(const Key& key, std::size_t precalculated_hash) const { 
+        return m_ht.find(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    iterator find(const K& key) { return m_ht.find(key); }
+    
+    /**
+     * @copydoc find(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
+    
+    /**
+     * @copydoc find(const K& key)
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    const_iterator find(const K& key) const { return m_ht.find(key); }
+    
+    /**
+     * @copydoc find(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    const_iterator find(const K& key, std::size_t precalculated_hash) const { 
+        return m_ht.find(key, precalculated_hash); 
+    }
+    
+    
+    
+    
+    bool contains(const Key& key) const { return m_ht.contains(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    bool contains(const Key& key, std::size_t precalculated_hash) const { 
+        return m_ht.contains(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    bool contains(const K& key) const { return m_ht.contains(key); }
+    
+    /**
+     * @copydoc contains(const K& key) const
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    bool contains(const K& key, std::size_t precalculated_hash) const { 
+        return m_ht.contains(key, precalculated_hash); 
+    }
+    
+    
+    
+    
+    std::pair<iterator, iterator> equal_range(const Key& key) { return m_ht.equal_range(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    std::pair<iterator, iterator> equal_range(const Key& key, std::size_t precalculated_hash) { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key) const { return m_ht.equal_range(key); }
+    
+    /**
+     * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
+     */
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key, std::size_t precalculated_hash) const { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
+    
+    
+    /**
+     * @copydoc equal_range(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    /**
+     * @copydoc equal_range(const K& key)
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
+    
+    /**
+     * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    
+    
+    
+    /*
+     * Bucket interface 
+     */
+    size_type bucket_count() const { return m_ht.bucket_count(); }
+    size_type max_bucket_count() const { return m_ht.max_bucket_count(); }
+    
+    
+    /*
+     *  Hash policy 
+     */
+    float load_factor() const { return m_ht.load_factor(); }
+    
+    float min_load_factor() const { return m_ht.min_load_factor(); }
+    float max_load_factor() const { return m_ht.max_load_factor(); }
+    
+    /**
+     * Set the `min_load_factor` to `ml`. When the `load_factor` of the map goes
+     * below `min_load_factor` after some erase operations, the map will be
+     * shrunk when an insertion occurs. The erase method itself never shrinks
+     * the map.
+     * 
+     * The default value of `min_load_factor` is 0.0f, the map never shrinks by default.
+     */
+    void min_load_factor(float ml) { m_ht.min_load_factor(ml); }
+    void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
+    
+    void rehash(size_type count) { m_ht.rehash(count); }
+    void reserve(size_type count) { m_ht.reserve(count); }
+    
+    
+    /*
+     * Observers
+     */
+    hasher hash_function() const { return m_ht.hash_function(); }
+    key_equal key_eq() const { return m_ht.key_eq(); }
+    
+    /*
+     * Other
+     */
+    
+    /**
+     * Convert a const_iterator to an iterator.
+     */
+    iterator mutable_iterator(const_iterator pos) {
+        return m_ht.mutable_iterator(pos);
+    }
+    
+    friend bool operator==(const robin_map& lhs, const robin_map& rhs) {
+        if(lhs.size() != rhs.size()) {
+            return false;
+        }
+        
+        for(const auto& element_lhs: lhs) {
+            const auto it_element_rhs = rhs.find(element_lhs.first);
+            if(it_element_rhs == rhs.cend() || element_lhs.second != it_element_rhs->second) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+
+    friend bool operator!=(const robin_map& lhs, const robin_map& rhs) {
+        return !operator==(lhs, rhs);
+    }
+
+    friend void swap(robin_map& lhs, robin_map& rhs) {
+        lhs.swap(rhs);
+    }
+    
+private:
+    ht m_ht;
+};
+
+
+/**
+ * Same as `tsl::robin_map<Key, T, Hash, KeyEqual, Allocator, StoreHash, tsl::rh::prime_growth_policy>`.
+ */
+template<class Key, 
+         class T, 
+         class Hash = std::hash<Key>,
+         class KeyEqual = std::equal_to<Key>,
+         class Allocator = std::allocator<std::pair<Key, T>>,
+         bool StoreHash = false>
+using robin_pg_map = robin_map<Key, T, Hash, KeyEqual, Allocator, StoreHash, tsl::rh::prime_growth_policy>;
+
+} // end namespace tsl
+
+#endif
diff --git a/src/util/graph/robin/robin_set.h b/src/util/graph/robin/robin_set.h
new file mode 100644
index 0000000..8f1b908
--- /dev/null
+++ b/src/util/graph/robin/robin_set.h
@@ -0,0 +1,582 @@
+/**
+ * MIT License
+ * 
+ * Copyright (c) 2017 Thibaut Goetghebuer-Planchon <tessil@gmx.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef TSL_ROBIN_SET_H
+#define TSL_ROBIN_SET_H
+
+
+#include <cstddef>
+#include <functional>
+#include <initializer_list>
+#include <memory>
+#include <type_traits>
+#include <utility>
+#include "robin_hash.h"
+
+
+namespace tsl {
+
+    
+/**
+ * Implementation of a hash set using open-addressing and the robin hood hashing algorithm with backward shift deletion.
+ * 
+ * For operations modifying the hash set (insert, erase, rehash, ...), the strong exception guarantee 
+ * is only guaranteed when the expression `std::is_nothrow_swappable<Key>::value &&
+ * std::is_nothrow_move_constructible<Key>::value` is true, otherwise if an exception
+ * is thrown during the swap or the move, the hash set may end up in a undefined state. Per the standard
+ * a `Key` with a noexcept copy constructor and no move constructor also satisfies the 
+ * `std::is_nothrow_move_constructible<Key>::value` criterion (and will thus guarantee the 
+ * strong exception for the set).
+ * 
+ * When `StoreHash` is true, 32 bits of the hash are stored alongside the values. It can improve 
+ * the performance during lookups if the `KeyEqual` function takes time (or engenders a cache-miss for example) 
+ * as we then compare the stored hashes before comparing the keys. When `tsl::rh::power_of_two_growth_policy` is used
+ * as `GrowthPolicy`, it may also speed-up the rehash process as we can avoid to recalculate the hash. 
+ * When it is detected that storing the hash will not incur any memory penalty due to alignment (i.e. 
+ * `sizeof(tsl::detail_robin_hash::bucket_entry<ValueType, true>) == 
+ * sizeof(tsl::detail_robin_hash::bucket_entry<ValueType, false>)`) and `tsl::rh::power_of_two_growth_policy` is
+ * used, the hash will be stored even if `StoreHash` is false so that we can speed-up the rehash (but it will
+ * not be used on lookups unless `StoreHash` is true).
+ * 
+ * `GrowthPolicy` defines how the set grows and consequently how a hash value is mapped to a bucket. 
+ * By default the set uses `tsl::rh::power_of_two_growth_policy`. This policy keeps the number of buckets 
+ * to a power of two and uses a mask to set the hash to a bucket instead of the slow modulo.
+ * Other growth policies are available and you may define your own growth policy, 
+ * check `tsl::rh::power_of_two_growth_policy` for the interface.
+ * 
+ * `Key` must be swappable.
+ * 
+ * `Key` must be copy and/or move constructible.
+ * 
+ * If the destructor of `Key` throws an exception, the behaviour of the class is undefined.
+ * 
+ * Iterators invalidation:
+ *  - clear, operator=, reserve, rehash: always invalidate the iterators.
+ *  - insert, emplace, emplace_hint, operator[]: if there is an effective insert, invalidate the iterators.
+ *  - erase: always invalidate the iterators.
+ */
+template<class Key, 
+         class Hash = std::hash<Key>,
+         class KeyEqual = std::equal_to<Key>,
+         class Allocator = std::allocator<Key>,
+         bool StoreHash = false,
+         class GrowthPolicy = tsl::rh::power_of_two_growth_policy<2>>
+class robin_set {
+private:
+    template<typename U>
+    using has_is_transparent = tsl::detail_robin_hash::has_is_transparent<U>;
+    
+    class KeySelect {
+    public:
+        using key_type = Key;
+        
+        const key_type& operator()(const Key& key) const noexcept {
+            return key;
+        }
+        
+        key_type& operator()(Key& key) noexcept {
+            return key;
+        }
+    };
+    
+    using ht = detail_robin_hash::robin_hash<Key, KeySelect, void,
+                                             Hash, KeyEqual, Allocator, StoreHash, GrowthPolicy>;
+            
+public:
+    using key_type = typename ht::key_type;
+    using value_type = typename ht::value_type;
+    using size_type = typename ht::size_type;
+    using difference_type = typename ht::difference_type;
+    using hasher = typename ht::hasher;
+    using key_equal = typename ht::key_equal;
+    using allocator_type = typename ht::allocator_type;
+    using reference = typename ht::reference;
+    using const_reference = typename ht::const_reference;
+    using pointer = typename ht::pointer;
+    using const_pointer = typename ht::const_pointer;
+    using iterator = typename ht::iterator;
+    using const_iterator = typename ht::const_iterator;
+
+    
+    /*
+     * Constructors
+     */
+    robin_set(): robin_set(ht::DEFAULT_INIT_BUCKETS_SIZE) {
+    }
+    
+    explicit robin_set(size_type bucket_count, 
+                       const Hash& hash = Hash(),
+                       const KeyEqual& equal = KeyEqual(),
+                       const Allocator& alloc = Allocator()): 
+                    m_ht(bucket_count, hash, equal, alloc)
+    {
+    }
+    
+    robin_set(size_type bucket_count,
+              const Allocator& alloc): robin_set(bucket_count, Hash(), KeyEqual(), alloc)
+    {
+    }
+    
+    robin_set(size_type bucket_count,
+              const Hash& hash,
+              const Allocator& alloc): robin_set(bucket_count, hash, KeyEqual(), alloc)
+    {
+    }
+    
+    explicit robin_set(const Allocator& alloc): robin_set(ht::DEFAULT_INIT_BUCKETS_SIZE, alloc) {
+    }
+    
+    template<class InputIt>
+    robin_set(InputIt first, InputIt last,
+              size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
+              const Hash& hash = Hash(),
+              const KeyEqual& equal = KeyEqual(),
+              const Allocator& alloc = Allocator()): robin_set(bucket_count, hash, equal, alloc)
+    {
+        insert(first, last);
+    }
+    
+    template<class InputIt>
+    robin_set(InputIt first, InputIt last,
+              size_type bucket_count,
+              const Allocator& alloc): robin_set(first, last, bucket_count, Hash(), KeyEqual(), alloc)
+    {
+    }
+    
+    template<class InputIt>
+    robin_set(InputIt first, InputIt last,
+              size_type bucket_count,
+              const Hash& hash,
+              const Allocator& alloc): robin_set(first, last, bucket_count, hash, KeyEqual(), alloc)
+    {
+    }
+
+    robin_set(std::initializer_list<value_type> init,
+              size_type bucket_count = ht::DEFAULT_INIT_BUCKETS_SIZE,
+              const Hash& hash = Hash(),
+              const KeyEqual& equal = KeyEqual(),
+              const Allocator& alloc = Allocator()): 
+          robin_set(init.begin(), init.end(), bucket_count, hash, equal, alloc)
+    {
+    }
+
+    robin_set(std::initializer_list<value_type> init,
+              size_type bucket_count,
+              const Allocator& alloc): 
+          robin_set(init.begin(), init.end(), bucket_count, Hash(), KeyEqual(), alloc)
+    {
+    }
+
+    robin_set(std::initializer_list<value_type> init,
+              size_type bucket_count,
+              const Hash& hash,
+              const Allocator& alloc): 
+          robin_set(init.begin(), init.end(), bucket_count, hash, KeyEqual(), alloc)
+    {
+    }
+
+    
+    robin_set& operator=(std::initializer_list<value_type> ilist) {
+        m_ht.clear();
+        
+        m_ht.reserve(ilist.size());
+        m_ht.insert(ilist.begin(), ilist.end());
+        
+        return *this;
+    }
+    
+    allocator_type get_allocator() const { return m_ht.get_allocator(); }
+    
+    
+    /*
+     * Iterators
+     */
+    iterator begin() noexcept { return m_ht.begin(); }
+    const_iterator begin() const noexcept { return m_ht.begin(); }
+    const_iterator cbegin() const noexcept { return m_ht.cbegin(); }
+    
+    iterator end() noexcept { return m_ht.end(); }
+    const_iterator end() const noexcept { return m_ht.end(); }
+    const_iterator cend() const noexcept { return m_ht.cend(); }
+    
+    
+    /*
+     * Capacity
+     */
+    bool empty() const noexcept { return m_ht.empty(); }
+    size_type size() const noexcept { return m_ht.size(); }
+    size_type max_size() const noexcept { return m_ht.max_size(); }
+    
+    /*
+     * Modifiers
+     */
+    void clear() noexcept { m_ht.clear(); }
+    
+    
+    
+    
+    std::pair<iterator, bool> insert(const value_type& value) { 
+        return m_ht.insert(value); 
+    }
+    
+    std::pair<iterator, bool> insert(value_type&& value) { 
+        return m_ht.insert(std::move(value)); 
+    }
+    
+    iterator insert(const_iterator hint, const value_type& value) { 
+        return m_ht.insert_hint(hint, value); 
+    }
+    
+    iterator insert(const_iterator hint, value_type&& value) { 
+        return m_ht.insert_hint(hint, std::move(value)); 
+    }
+    
+    template<class InputIt>
+    void insert(InputIt first, InputIt last) { 
+        m_ht.insert(first, last);
+    }
+    
+    void insert(std::initializer_list<value_type> ilist) { 
+        m_ht.insert(ilist.begin(), ilist.end()); 
+    }
+
+    
+    
+    
+    /**
+     * Due to the way elements are stored, emplace will need to move or copy the key-value once.
+     * The method is equivalent to insert(value_type(std::forward<Args>(args)...));
+     * 
+     * Mainly here for compatibility with the std::unordered_map interface.
+     */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&&... args) { 
+        return m_ht.emplace(std::forward<Args>(args)...); 
+    }
+    
+    
+    
+    /**
+     * Due to the way elements are stored, emplace_hint will need to move or copy the key-value once.
+     * The method is equivalent to insert(hint, value_type(std::forward<Args>(args)...));
+     * 
+     * Mainly here for compatibility with the std::unordered_map interface.
+     */
+    template<class... Args>
+    iterator emplace_hint(const_iterator hint, Args&&... args) {
+        return m_ht.emplace_hint(hint, std::forward<Args>(args)...);
+    }
+    
+    
+    
+    iterator erase(iterator pos) { return m_ht.erase(pos); }
+    iterator erase(const_iterator pos) { return m_ht.erase(pos); }
+    iterator erase(const_iterator first, const_iterator last) { return m_ht.erase(first, last); }
+    size_type erase(const key_type& key) { return m_ht.erase(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup to the value if you already have the hash.
+     */    
+    size_type erase(const key_type& key, std::size_t precalculated_hash) { 
+        return m_ht.erase(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type erase(const K& key) { return m_ht.erase(key); }
+    
+    /**
+     * @copydoc erase(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup to the value if you already have the hash.
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type erase(const K& key, std::size_t precalculated_hash) { 
+        return m_ht.erase(key, precalculated_hash); 
+    }
+    
+    
+    
+    void swap(robin_set& other) { other.m_ht.swap(m_ht); }
+    
+    
+    
+    /*
+     * Lookup
+     */
+    size_type count(const Key& key) const { return m_ht.count(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    size_type count(const Key& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type count(const K& key) const { return m_ht.count(key); }
+    
+    /**
+     * @copydoc count(const K& key) const
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    size_type count(const K& key, std::size_t precalculated_hash) const { return m_ht.count(key, precalculated_hash); }
+    
+    
+    
+    
+    iterator find(const Key& key) { return m_ht.find(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    iterator find(const Key& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
+    
+    const_iterator find(const Key& key) const { return m_ht.find(key); }
+    
+    /**
+     * @copydoc find(const Key& key, std::size_t precalculated_hash)
+     */
+    const_iterator find(const Key& key, std::size_t precalculated_hash) const { return m_ht.find(key, precalculated_hash); }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    iterator find(const K& key) { return m_ht.find(key); }
+    
+    /**
+     * @copydoc find(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    iterator find(const K& key, std::size_t precalculated_hash) { return m_ht.find(key, precalculated_hash); }
+    
+    /**
+     * @copydoc find(const K& key)
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    const_iterator find(const K& key) const { return m_ht.find(key); }
+    
+    /**
+     * @copydoc find(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    const_iterator find(const K& key, std::size_t precalculated_hash) const { return m_ht.find(key, precalculated_hash); }
+    
+    
+    
+    
+    bool contains(const Key& key) const { return m_ht.contains(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    bool contains(const Key& key, std::size_t precalculated_hash) const { 
+        return m_ht.contains(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    bool contains(const K& key) const { return m_ht.contains(key); }
+    
+    /**
+     * @copydoc contains(const K& key) const
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    bool contains(const K& key, std::size_t precalculated_hash) const { 
+        return m_ht.contains(key, precalculated_hash); 
+    }
+    
+    
+    
+    
+    std::pair<iterator, iterator> equal_range(const Key& key) { return m_ht.equal_range(key); }
+    
+    /**
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */
+    std::pair<iterator, iterator> equal_range(const Key& key, std::size_t precalculated_hash) { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key) const { return m_ht.equal_range(key); }
+    
+    /**
+     * @copydoc equal_range(const Key& key, std::size_t precalculated_hash)
+     */
+    std::pair<const_iterator, const_iterator> equal_range(const Key& key, std::size_t precalculated_hash) const { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    /**
+     * This overload only participates in the overload resolution if the typedef KeyEqual::is_transparent exists. 
+     * If so, K must be hashable and comparable to Key.
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<iterator, iterator> equal_range(const K& key) { return m_ht.equal_range(key); }
+    
+    /**
+     * @copydoc equal_range(const K& key)
+     * 
+     * Use the hash value 'precalculated_hash' instead of hashing the key. The hash value should be the same
+     * as hash_function()(key). Useful to speed-up the lookup if you already have the hash.
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<iterator, iterator> equal_range(const K& key, std::size_t precalculated_hash) { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    /**
+     * @copydoc equal_range(const K& key)
+     */
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<const_iterator, const_iterator> equal_range(const K& key) const { return m_ht.equal_range(key); }
+
+    /**
+     * @copydoc equal_range(const K& key, std::size_t precalculated_hash)
+     */    
+    template<class K, class KE = KeyEqual, typename std::enable_if<has_is_transparent<KE>::value>::type* = nullptr> 
+    std::pair<const_iterator, const_iterator> equal_range(const K& key, std::size_t precalculated_hash) const { 
+        return m_ht.equal_range(key, precalculated_hash); 
+    }
+    
+    
+    
+
+    /*
+     * Bucket interface 
+     */
+    size_type bucket_count() const { return m_ht.bucket_count(); }
+    size_type max_bucket_count() const { return m_ht.max_bucket_count(); }
+    
+    
+    /*
+     *  Hash policy 
+     */
+    float load_factor() const { return m_ht.load_factor(); }
+    
+    float min_load_factor() const { return m_ht.min_load_factor(); }
+    float max_load_factor() const { return m_ht.max_load_factor(); }
+    
+    /**
+     * Set the `min_load_factor` to `ml`. When the `load_factor` of the set goes
+     * below `min_load_factor` after some erase operations, the set will be
+     * shrunk when an insertion occurs. The erase method itself never shrinks
+     * the set.
+     * 
+     * The default value of `min_load_factor` is 0.0f, the set never shrinks by default.
+     */
+    void min_load_factor(float ml) { m_ht.min_load_factor(ml); }
+    void max_load_factor(float ml) { m_ht.max_load_factor(ml); }
+    
+    void rehash(size_type count) { m_ht.rehash(count); }
+    void reserve(size_type count) { m_ht.reserve(count); }
+    
+    
+    /*
+     * Observers
+     */
+    hasher hash_function() const { return m_ht.hash_function(); }
+    key_equal key_eq() const { return m_ht.key_eq(); }
+    
+    
+    /*
+     * Other
+     */
+    
+    /**
+     * Convert a const_iterator to an iterator.
+     */
+    iterator mutable_iterator(const_iterator pos) {
+        return m_ht.mutable_iterator(pos);
+    }
+    
+    friend bool operator==(const robin_set& lhs, const robin_set& rhs) {
+        if(lhs.size() != rhs.size()) {
+            return false;
+        }
+        
+        for(const auto& element_lhs: lhs) {
+            const auto it_element_rhs = rhs.find(element_lhs);
+            if(it_element_rhs == rhs.cend()) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+
+    friend bool operator!=(const robin_set& lhs, const robin_set& rhs) {
+        return !operator==(lhs, rhs);
+    }
+
+    friend void swap(robin_set& lhs, robin_set& rhs) {
+        lhs.swap(rhs);
+    }
+    
+private:
+    ht m_ht;    
+};
+
+
+/**
+ * Same as `tsl::robin_set<Key, Hash, KeyEqual, Allocator, StoreHash, tsl::rh::prime_growth_policy>`.
+ */
+template<class Key, 
+         class Hash = std::hash<Key>,
+         class KeyEqual = std::equal_to<Key>,
+         class Allocator = std::allocator<Key>,
+         bool StoreHash = false>
+using robin_pg_set = robin_set<Key, Hash, KeyEqual, Allocator, StoreHash, tsl::rh::prime_growth_policy>;
+
+} // end namespace tsl
+
+#endif
+ 
diff --git a/src/util/http/Server.cpp b/src/util/http/Server.cpp
index d35166c..e124674 100644
--- a/src/util/http/Server.cpp
+++ b/src/util/http/Server.cpp
@@ -11,6 +11,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <algorithm>
+#include <csignal>
 #include <memory>
 #include <sstream>
 #include <stdexcept>
@@ -24,12 +25,12 @@
 #include "util/String.h"
 #include "util/log/Log.h"
 
-using util::http::Socket;
-using util::http::Queue;
-using util::http::Req;
+using util::http::HeaderState;
 using util::http::HttpErr;
 using util::http::HttpServer;
-using util::http::HeaderState;
+using util::http::Queue;
+using util::http::Req;
+using util::http::Socket;
 
 // _____________________________________________________________________________
 Socket::Socket(int port) {
@@ -71,6 +72,9 @@ int Socket::wait() {
 
 // _____________________________________________________________________________
 void HttpServer::send(int sock, Answer* aw) {
+  // ignore SIGPIPE
+  signal(SIGPIPE, SIG_IGN);
+
   std::string enc = "identity";
   if (aw->gzip) aw->pl = compress(aw->pl, &enc);
 
diff --git a/src/util/json/Writer.cpp b/src/util/json/Writer.cpp
index ee65753..de58649 100644
--- a/src/util/json/Writer.cpp
+++ b/src/util/json/Writer.cpp
@@ -43,7 +43,7 @@ void Writer::obj() {
 void Writer::key(const std::string& k) {
   if (_stack.empty() || _stack.top().type != OBJ)
     throw WriterException("Keys only allowed in objects.");
-  if (!_stack.top().empty) (*_out) << "," << (_pretty ? " " : "");
+  if (!_stack.top().empty) (*_out) << ",";
   _stack.top().empty = 0;
   prettor();
   *_out << "\"" << k << "\""
@@ -86,6 +86,12 @@ void Writer::val(int v) {
   *_out << v;
 }
 
+// _____________________________________________________________________________
+void Writer::val(size_t v) {
+  valCheck();
+  *_out << v;
+}
+
 // _____________________________________________________________________________
 void Writer::val(double v) {
   valCheck();
@@ -104,6 +110,9 @@ void Writer::val(const Val& v) {
     case Val::JSNULL:
       val(Null());
       return;
+    case Val::UINT:
+      val(v.ui);
+      return;
     case Val::INT:
       val(v.i);
       return;
diff --git a/src/util/json/Writer.h b/src/util/json/Writer.h
index 0a9948d..0a25be0 100644
--- a/src/util/json/Writer.h
+++ b/src/util/json/Writer.h
@@ -28,9 +28,10 @@ class WriterException : public std::exception {
 struct Null {};
 
 struct Val {
-  enum VAL_T { INT, FLOAT, STRING, ARRAY, DICT, BOOL, JSNULL };
+  enum VAL_T { UINT, INT, FLOAT, STRING, ARRAY, DICT, BOOL, JSNULL };
   VAL_T type;
   int i;
+  uint64_t ui;
   double f;
   std::string str;
   std::vector<Val> arr;
@@ -43,6 +44,8 @@ struct Val {
   Val(const std::string& strC) { str = strC, type = STRING; }
   Val(const char* strC) { str = strC, type = STRING; }
   Val(double fC) { f = fC, type = FLOAT; }
+  Val(size_t iC) { ui = iC, type = UINT; }
+  Val(uint32_t iC) { ui = iC, type = UINT; }
   Val(int iC) { i = iC, type = INT; }
   Val(bool fC) { i = fC, type = BOOL; }
 };
@@ -69,6 +72,7 @@ class Writer {
   void val(const std::string& v);
   void val(const char* v);
   void val(double v);
+  void val(size_t v);
   void val(int v);
   void val(bool v);
   void val(Null);
diff --git a/src/util/log/Log.h b/src/util/log/Log.h
index ac861bd..f761b6d 100644
--- a/src/util/log/Log.h
+++ b/src/util/log/Log.h
@@ -8,6 +8,7 @@
 #include <chrono>
 #include <iomanip>
 #include <iostream>
+#include <sstream>
 
 #define VDEBUG 4
 #define DEBUG 3
@@ -21,6 +22,7 @@
 
 // compiler will optimize statement away if x > LOGLEVEL
 #define LOG(x) if (x <= LOGLEVEL) util::Log<x>().log()
+#define LOGTO(x, os) if (x <= LOGLEVEL) util::Log<x>(&os).log()
 
 using std::setfill;
 using std::setw;
@@ -33,12 +35,14 @@ static const char* LOGS[] = {"ERROR", "WARN ", "INFO ", "DEBUG", "DEBUG"};
 template <char LVL>
 class Log {
  public:
-  Log() { if (LVL == ERROR) os = &std::cerr; else os = &std::cout; }
-  ~Log() { (*os) << std::endl; }
+  Log() { if (LVL < INFO) os = &std::cerr; else os = &std::cout; }
+  Log(std::ostream* s) { os = s; }
+  ~Log() { buf << std::endl; (*os) << buf.str(); }
   std::ostream& log() { return ts() << LOGS[(size_t)LVL] << ": "; }
 
  private:
   std::ostream* os;
+  std::ostringstream buf;
   std::ostream& ts() {
     char tl[20];
     auto n = system_clock::now();
@@ -46,7 +50,7 @@ class Log {
     int m = duration_cast<milliseconds>(n-time_point_cast<seconds>(n)).count();
     struct tm t = *localtime(&tt);
     strftime(tl, 20, "%Y-%m-%d %H:%M:%S", &t);
-    return (*os) << "[" << tl << "." << setfill('0') << setw(3) << m << "] ";
+    return buf << "[" << tl << "." << setfill('0') << setw(3) << m << "] ";
   }
 };
 }
diff --git a/src/util/tests/QuadTreeTest.cpp b/src/util/tests/QuadTreeTest.cpp
new file mode 100644
index 0000000..bb955d4
--- /dev/null
+++ b/src/util/tests/QuadTreeTest.cpp
@@ -0,0 +1,38 @@
+// Copyright 2016
+// Author: Patrick Brosi
+
+#include "util/Misc.h"
+#include "util/geo/QuadTree.h"
+#include "util/tests/QuadTreeTest.h"
+
+using util::approx;
+using util::geo::QuadTree;
+using util::geo::DPoint;
+using util::geo::DBox;
+
+// _____________________________________________________________________________
+void QuadTreeTest::run() {
+  // ___________________________________________________________________________
+  {
+    QuadTree<int, double> qt(4, 4, DBox(DPoint(0, 0), DPoint(10, 10)));
+
+    qt.insert(0, {2, 2});
+    TEST(qt.size(), ==, 1);
+
+    qt.insert(666, {-1, 0});
+    TEST(qt.size(), ==, 1);
+
+    qt.insert(1, {0, 0});
+    TEST(qt.size(), ==, 2);
+
+    qt.insert(2, {0, 1});
+    TEST(qt.size(), ==, 3);
+
+    qt.insert(3, {6, 9});
+    TEST(qt.size(), ==, 4);
+
+    qt.insert(4, {9, 0});
+    TEST(qt.size(), ==, 5);
+  }
+
+}
diff --git a/src/util/tests/QuadTreeTest.h b/src/util/tests/QuadTreeTest.h
new file mode 100644
index 0000000..9c8c9e0
--- /dev/null
+++ b/src/util/tests/QuadTreeTest.h
@@ -0,0 +1,12 @@
+// Copyright 2016
+// Author: Patrick Brosi
+
+#ifndef UTIL_TEST_QUADTREETEST_H_
+#define UTIL_TEST_QUADTREETEST_H_
+
+class QuadTreeTest {
+  public:
+    void run();
+};
+
+#endif
diff --git a/src/util/tests/TestMain.cpp b/src/util/tests/TestMain.cpp
index f03285b..63ac3ad 100644
--- a/src/util/tests/TestMain.cpp
+++ b/src/util/tests/TestMain.cpp
@@ -6,10 +6,12 @@
 #include "util/Misc.h"
 #include "util/Nullable.h"
 #include "util/String.h"
+#include "util/tests/QuadTreeTest.h"
 #include "util/geo/Geo.h"
 #include "util/geo/Grid.h"
 #include "util/graph/Algorithm.h"
 #include "util/graph/Dijkstra.h"
+#include "util/graph/BiDijkstra.h"
 #include "util/graph/DirGraph.h"
 #include "util/graph/EDijkstra.h"
 #include "util/graph/UndirGraph.h"
@@ -19,57 +21,60 @@ using namespace util;
 using namespace util::geo;
 using namespace util::graph;
 
-class approx {
- public:
-  explicit approx(double magnitude)
-      : _epsilon{std::numeric_limits<float>::epsilon() * 100},
-        _magnitude{magnitude} {}
-
-  friend bool operator==(double lhs, approx const& rhs) {
-    return std::abs(lhs - rhs._magnitude) < rhs._epsilon;
-  }
-
-  friend bool operator==(approx const& lhs, double rhs) {
-    return operator==(rhs, lhs);
-  }
-  friend bool operator!=(double lhs, approx const& rhs) {
-    return !operator==(lhs, rhs);
-  }
-  friend bool operator!=(approx const& lhs, double rhs) {
-    return !operator==(rhs, lhs);
-  }
-
-  friend bool operator<=(double lhs, approx const& rhs) {
-    return lhs < rhs._magnitude || lhs == rhs;
-  }
-  friend bool operator<=(approx const& lhs, double rhs) {
-    return lhs._magnitude < rhs || lhs == rhs;
-  }
-  friend bool operator>=(double lhs, approx const& rhs) {
-    return lhs > rhs._magnitude || lhs == rhs;
-  }
-  friend bool operator>=(approx const& lhs, double rhs) {
-    return lhs._magnitude > rhs || lhs == rhs;
-  }
-
- private:
-  double _epsilon;
-  double _magnitude;
-};
+using util::approx;
 
 // _____________________________________________________________________________
 int main(int argc, char** argv) {
 	UNUSED(argc);
 	UNUSED(argv);
 
+  std::setlocale(LC_ALL, "en_US.utf8");
+
+  QuadTreeTest quadTreeTest;
+  quadTreeTest.run();
+
   // ___________________________________________________________________________
   {
-    assert(util::atof("45.534215") == approx(45.534215));
-    assert(util::atof("5.534") == approx(5.534));
-    assert(util::atof("534") == approx(534));
-    assert(util::atof("-534") == approx(-534));
-    assert(util::atof("-45.534215") == approx(-45.534215));
-    assert(util::atof("-45.534215", 2) == approx(-45.53));
+    TEST(geo::frechetDist(Line<double>{{0, 0}, {10, 10}}, Line<double>{{0, 0},
+                                  {10, 10}}, 1) == approx(0));
+
+    TEST(geo::frechetDist(Line<double>{{0, 0}, {10, 10}}, Line<double>{{0, 0},
+                                  {10, 10}}, 0.1) == approx(0));
+
+    TEST(geo::frechetDist(Line<double>{{0, 10}, {10, 10}}, Line<double>{{0, 0},
+                                  {10, 0}}, 0.1) == approx(10));
+
+    TEST(geo::frechetDist(Line<double>{{0, 10}, {10, 10}}, Line<double>{{0, 0},
+                                  {0, 0}}, 0.1)
+        == approx(util::geo::dist(Point<double>{0, 0}, Point<double>{10, 10})));
+
+    TEST(geo::frechetDist(Line<double>{{0, 10}, {0, 10}}, Line<double>{{0, 0},
+                                  {0, 5}}, 0.1) == approx(10));
+
+    TEST(geo::frechetDist(Line<double>{{0, 10}, {0, 10}}, Line<double>{{0, 5},
+                                  {0, 5}}, 0.1) == approx(5));
+  }
+
+  // ___________________________________________________________________________
+  {
+    std::string test = u8"Zürich, Hauptbahnhof (Nord)";
+    auto tokens = util::tokenize(test);
+
+    TEST(tokens.size(), ==, 3);
+
+    TEST(util::jaccardSimi("Zürich Hauptbahnhof Nord", "Zürich, Hauptbahnhof (Nord)"), ==, approx(1));
+    TEST(util::jaccardSimi("Zürich Hauptbahnhof", "Zürich, Hauptbahnhof ()"), ==, approx(1));
+    TEST(util::jaccardSimi("Zürich Hauptbahnhof", "Zürich, Hauptbahnhof (Nord)"), ==, approx(2./3.));
+  }
+
+  // ___________________________________________________________________________
+  {
+    TEST(util::atof("45.534215"), ==, approx(45.534215));
+    TEST(util::atof("5.534"), ==, approx(5.534));
+    TEST(util::atof("534"), ==, approx(534));
+    TEST(util::atof("-534"), ==, approx(-534));
+    TEST(util::atof("-45.534215"), ==, approx(-45.534215));
+    TEST(util::atof("-45.534215", 2), ==, approx(-45.53));
 
     // TODO: more test cases
   }
@@ -92,28 +97,28 @@ int main(int argc, char** argv) {
     util::json::Val i({1, json::Array{2, json::Null(), 4}, true});
     wr.val(i);
     wr.closeAll();
-    assert(ss.str() == "[1,[2,null,4],true]");
+    TEST(ss.str(), ==, "[1,[2,null,4],true]");
 
     ss.str("");
     wr = util::json::Writer(&ss, 2, false);
     i = util::json::Val({1, json::Array{2, json::Null(), 4}, false});
     wr.val(i);
     wr.closeAll();
-    assert(ss.str() == "[1,[2,null,4],false]");
+    TEST(ss.str(), ==, "[1,[2,null,4],false]");
 
     ss.str("");
     wr = util::json::Writer(&ss, 2, false);
     i = util::json::Val({1, json::Array{2, json::Null(), 4}, false});
     wr.val(i);
     wr.closeAll();
-    assert(ss.str() == "[1,[2,null,4],false]");
+    TEST(ss.str(), ==, "[1,[2,null,4],false]");
 
     ss.str("");
     wr = util::json::Writer(&ss, 2, false);
     i = util::json::Val({1, json::Array{2.13, "", 4}, 0});
     wr.val(i);
     wr.closeAll();
-    assert(ss.str() == "[1,[2.13,\"\",4],0]");
+    TEST(ss.str(), ==, "[1,[2.13,\"\",4],0]");
 
     ss.str("");
     wr = util::json::Writer(&ss, 2, false);
@@ -121,7 +126,7 @@ int main(int argc, char** argv) {
         {1, json::Array{2.13, json::Dict{{"a", 1}, {"B", 2.123}}, 4}, 0});
     wr.val(i);
     wr.closeAll();
-    assert((ss.str() == "[1,[2.13,{\"a\":1,\"B\":2.12},4],0]" ||
+    TEST((ss.str() == "[1,[2.13,{\"a\":1,\"B\":2.12},4],0]" ||
             ss.str() == "[1,[2.13,{\"B\":2.12,\"a\":1},4],0]"));
   }
 
@@ -132,36 +137,36 @@ int main(int argc, char** argv) {
     DirNode<int, int>* a = new DirNode<int, int>(0);
     DirNode<int, int>* b = new DirNode<int, int>(0);
     g.addNd(a);
-    assert(g.getNds()->size() == (size_t)1);
+    TEST(g.getNds().size(), ==, (size_t)1);
     g.addNd(b);
-    assert(g.getNds()->size() == (size_t)2);
+    TEST(g.getNds().size(), ==, (size_t)2);
 
     g.addEdg(a, b);
-    assert(a->getDeg() == (size_t)1);
-    assert(b->getDeg() == (size_t)0);
+    TEST(a->getDeg(), ==, (size_t)1);
+    TEST(b->getDeg(), ==, (size_t)0);
 
     auto c = g.addNd();
 
     g.addEdg(a, c);
     g.addEdg(c, b);
-    assert(a->getDeg() == (size_t)2);
-    assert(b->getDeg() == (size_t)0);
-    assert(c->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)2);
+    TEST(b->getDeg(), ==, (size_t)0);
+    TEST(c->getDeg(), ==, (size_t)1);
 
     g.delEdg(a, c);
 
-    assert(a->getDeg() == (size_t)1);
-    assert(b->getDeg() == (size_t)0);
-    assert(c->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)1);
+    TEST(b->getDeg(), ==, (size_t)0);
+    TEST(c->getDeg(), ==, (size_t)1);
 
     g.addEdg(a, a);
-    assert(a->getDeg() == (size_t)2);
+    TEST(a->getDeg(), ==, (size_t)2);
 
     g.delEdg(a, a);
-    assert(a->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)1);
 
     g.delEdg(a, a);
-    assert(a->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)1);
 
     // TODO: more test cases
   }
@@ -173,38 +178,38 @@ int main(int argc, char** argv) {
     UndirNode<int, int>* a = new UndirNode<int, int>(0);
     UndirNode<int, int>* b = new UndirNode<int, int>(0);
     g.addNd(a);
-    assert(g.getNds()->size() == (size_t)1);
+    TEST(g.getNds().size(), ==, (size_t)1);
     g.addNd(b);
-    assert(g.getNds()->size() == (size_t)2);
+    TEST(g.getNds().size(), ==, (size_t)2);
 
     g.addEdg(a, b);
-    assert(a->getDeg() == (size_t)1);
-    assert(b->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)1);
+    TEST(b->getDeg(), ==, (size_t)1);
 
     auto c = g.addNd();
 
     g.addEdg(a, c);
     g.addEdg(c, b);
-    assert(a->getDeg() == (size_t)2);
-    assert(b->getDeg() == (size_t)2);
-    assert(c->getDeg() == (size_t)2);
+    TEST(a->getDeg(), ==, (size_t)2);
+    TEST(b->getDeg(), ==, (size_t)2);
+    TEST(c->getDeg(), ==, (size_t)2);
 
     g.delEdg(a, c);
 
-    assert(a->getDeg() == (size_t)1);
-    assert(b->getDeg() == (size_t)2);
-    assert(c->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)1);
+    TEST(b->getDeg(), ==, (size_t)2);
+    TEST(c->getDeg(), ==, (size_t)1);
 
     g.delNd(b);
 
-    assert(a->getDeg() == (size_t)0);
-    assert(c->getDeg() == (size_t)0);
+    TEST(a->getDeg(), ==, (size_t)0);
+    TEST(c->getDeg(), ==, (size_t)0);
 
     g.addEdg(a, a);
-    assert(a->getDeg() == (size_t)1);
+    TEST(a->getDeg(), ==, (size_t)1);
 
     g.delEdg(a, a);
-    assert(a->getDeg() == (size_t)0);
+    TEST(a->getDeg(), ==, (size_t)0);
 
     // TODO: more test cases
   }
@@ -229,15 +234,15 @@ int main(int argc, char** argv) {
 
     Box<double> req(Point<double>(.5, 1), Point<double>(1, 1.5));
     g.get(req, &ret);
-    assert(ret.size() == (size_t)1);
+    TEST(ret.size(), ==, (size_t)1);
 
     ret.clear();
     g.getNeighbors(1, 0, &ret);
-    assert(ret.size() == (size_t)1);
+    TEST(ret.size(), ==, (size_t)1);
 
     ret.clear();
     g.getNeighbors(1, 0.55, &ret);
-    assert(ret.size() == (size_t)2);
+    TEST(ret.size(), ==, (size_t)2);
 
     // TODO: more test cases
   }
@@ -250,14 +255,14 @@ int main(int argc, char** argv) {
 
     auto dense = util::geo::densify(a, 1);
 
-    assert(dense.size() == (size_t)10);
+    TEST(dense.size(), ==, (size_t)10);
 
     for (int i = 0; i < 10; i++) {
-      assert(dense[i].getX() == approx(i + 1.0));
+      TEST(dense[i].getX(), ==, approx(i + 1.0));
     }
 
     dense = util::geo::simplify(dense, 0.1);
-    assert(dense.size() == (size_t)2);
+    TEST(dense.size(), ==, (size_t)2);
 
     Line<double> b;
     b.push_back(Point<double>(1, 1));
@@ -267,7 +272,7 @@ int main(int argc, char** argv) {
     dense = util::geo::densify(b, 1);
 
     dense = util::geo::simplify(dense, 0.1);
-    assert(dense.size() == (size_t)3);
+    TEST(dense.size(), ==, (size_t)3);
   }
 
   // ___________________________________________________________________________
@@ -291,7 +296,7 @@ int main(int argc, char** argv) {
     b.push_back(Point<double>(6, 1));
 
     double fd = util::geo::accFrechetDistC(a, b, 0.1);
-    assert(fd == approx(2));
+    TEST(fd, ==, approx(2));
   }
 
   // ___________________________________________________________________________
@@ -306,7 +311,7 @@ int main(int argc, char** argv) {
 
     double fd = util::geo::frechetDist(e, f, 0.1);
 
-    assert(fd == approx(0));
+    TEST(fd, ==, approx(0));
 
     Line<double> a;
     a.push_back(Point<double>(1, 1));
@@ -329,7 +334,7 @@ int main(int argc, char** argv) {
 
     fd = util::geo::frechetDist(a, b, 0.1);
 
-    assert(fd == approx(1));
+    TEST(fd, ==, approx(1));
 
     Line<double> c;
     c.push_back(Point<double>(1, 1));
@@ -341,7 +346,7 @@ int main(int argc, char** argv) {
 
     fd = util::geo::frechetDist(c, d, 0.1);
 
-    assert(fd == approx(2));
+    TEST(fd, ==, approx(2));
 
     Line<double> g;
     g.push_back(Point<double>(1, 1));
@@ -355,7 +360,7 @@ int main(int argc, char** argv) {
 
     fd = util::geo::frechetDist(g, h, 0.1);
 
-    assert(fd == approx(1));
+    TEST(fd, ==, approx(1));
   }
 
   // ___________________________________________________________________________
@@ -383,130 +388,130 @@ int main(int argc, char** argv) {
     ml.push_back(c);
     ml.push_back(d);
 
-    assert(parallelity(box, ml) == approx(1));
+    TEST(parallelity(box, ml), ==, approx(1));
     ml = rotate(ml, 45);
-    assert(parallelity(box, ml) == approx(0));
+    TEST(parallelity(box, ml), ==, approx(0));
     ml = rotate(ml, 45);
-    assert(parallelity(box, ml) == approx(1));
+    TEST(parallelity(box, ml), ==, approx(1));
     ml = rotate(ml, 45);
-    assert(parallelity(box, ml) == approx(0));
+    TEST(parallelity(box, ml), ==, approx(0));
     ml = rotate(ml, 45);
-    assert(parallelity(box, ml) == approx(1));
+    TEST(parallelity(box, ml), ==, approx(1));
   }
 
   // ___________________________________________________________________________
   {
-    assert("zürich" == util::urlDecode("z%C3%BCrich"));
-    assert("!@$%^*()" == util::urlDecode("!%40%24%25%5E*()"));
-    assert("Løkken" == util::urlDecode("L%C3%B8kken"));
-    assert("á é" == util::urlDecode("%C3%A1%20%C3%A9"));
-    assert("á é" == util::urlDecode("%C3%A1+%C3%A9"));
+    TEST("zürich", ==, util::urlDecode("z%C3%BCrich"));
+    TEST("!@$%^*()", ==, util::urlDecode("!%40%24%25%5E*()"));
+    TEST("Løkken", ==, util::urlDecode("L%C3%B8kken"));
+    TEST("á é", ==, util::urlDecode("%C3%A1%20%C3%A9"));
+    TEST("á é", ==, util::urlDecode("%C3%A1+%C3%A9"));
   }
 
   // ___________________________________________________________________________
   {
-    assert("Hello\\\\Goodbye!" == util::jsonStringEscape("Hello\\Goodbye!"));
-    assert("\\\"Hello\\\"" == util::jsonStringEscape("\"Hello\""));
+    TEST("Hello\\\\Goodbye!" == util::jsonStringEscape("Hello\\Goodbye!"));
+    TEST("\\\"Hello\\\"" == util::jsonStringEscape("\"Hello\""));
   }
 
   // ___________________________________________________________________________
   {
-    assert(util::split("hello,again", ',').size() == (size_t)2);
-    assert(util::split("hello,,again", ',').size() == (size_t)3);
-    assert(util::split("hello", ',').size() == (size_t)1);
-    assert(util::split("", ',').size() == (size_t)0);
+    TEST(util::split("hello,again", ',').size(), ==, (size_t)2);
+    TEST(util::split("hello,,again", ',').size(), ==, (size_t)3);
+    TEST(util::split("hello", ',').size(), ==, (size_t)1);
+    TEST(util::split("", ',').size(), ==, (size_t)0);
   }
 
   // ___________________________________________________________________________
   {
-    assert(util::editDist("hello", "mello") == (size_t)1);
-    assert(util::editDist("mello", "hello") == (size_t)1);
-    assert(util::editDist("abcde", "abfde") == (size_t)1);
-    assert(util::editDist("abcd", "abcde") == (size_t)1);
-    assert(util::editDist("xabcd", "abcde") == (size_t)2);
-    assert(util::editDist("abcd", "abcdes") == (size_t)2);
-    assert(util::editDist("hello", "hello") == (size_t)0);
+    TEST(util::editDist("hello", "mello"), ==, (size_t)1);
+    TEST(util::editDist("mello", "hello"), ==, (size_t)1);
+    TEST(util::editDist("abcde", "abfde"), ==, (size_t)1);
+    TEST(util::editDist("abcd", "abcde"), ==, (size_t)1);
+    TEST(util::editDist("xabcd", "abcde"), ==, (size_t)2);
+    TEST(util::editDist("abcd", "abcdes"), ==, (size_t)2);
+    TEST(util::editDist("hello", "hello"), ==, (size_t)0);
   }
 
   // ___________________________________________________________________________
   {
-    assert(util::prefixEditDist("hello", "hello", 0) == (size_t)0);
-    assert(util::prefixEditDist("hello", "hello", 100) == (size_t)0);
-    assert(util::prefixEditDist("hello", "hello") == (size_t)0);
-    assert(util::prefixEditDist("hel", "hello") == (size_t)0);
-    assert(util::prefixEditDist("hel", "hello", 0) == (size_t)0);
-    assert(util::prefixEditDist("hel", "hello", 1) == (size_t)0);
-    assert(util::prefixEditDist("hel", "hello", 2) == (size_t)0);
-    assert(util::prefixEditDist("hal", "hello", 2) == (size_t)1);
-    assert(util::prefixEditDist("hal", "hello", 1) == (size_t)1);
-    assert(util::prefixEditDist("hal", "hello", 0) > (size_t)0);
-    assert(util::prefixEditDist("fel", "hello", 0) > (size_t)0);
-    assert(util::prefixEditDist("fel", "hello", 1) == (size_t)1);
-    assert(util::prefixEditDist("fel", "hello", 2) == (size_t)1);
-    assert(util::prefixEditDist("fal", "hello", 2) == (size_t)2);
-    assert(util::prefixEditDist("fal", "hello", 1) > (size_t)1);
-    assert(util::prefixEditDist("fal", "hello", 0) > (size_t)0);
-    assert(util::prefixEditDist("far", "hello", 0) > (size_t)0);
-    assert(util::prefixEditDist("far", "hello", 1) > (size_t)1);
-    assert(util::prefixEditDist("far", "hello", 2) > (size_t)2);
-    assert(util::prefixEditDist("far", "hello", 3) == (size_t)3);
-    assert(util::prefixEditDist("far", "hello", 4) == (size_t)3);
-    assert(util::prefixEditDist("far", "hello") == (size_t)3);
-    assert(util::prefixEditDist("hefar", "hello") == (size_t)3);
-    assert(util::prefixEditDist("hefaree", "hello") == (size_t)5);
-    assert(util::prefixEditDist("helloo", "hello") == (size_t)1);
-    assert(util::prefixEditDist("helloo", "hello", 0) > (size_t)0);
-    assert(util::prefixEditDist("helloo", "hello", 1) == (size_t)1);
-    assert(util::prefixEditDist("helloo", "hello", 2) == (size_t)1);
-    assert(util::prefixEditDist("", "hello", 2) == (size_t)0);
-    assert(util::prefixEditDist("e", "hello", 2) == (size_t)1);
-    assert(util::prefixEditDist("el", "hello", 2) == (size_t)1);
-    assert(util::prefixEditDist("ello", "hello", 2) == (size_t)1);
-    assert(util::prefixEditDist("hell", "hello", 2) == (size_t)0);
-    assert(util::prefixEditDist("hell", "", 2) > (size_t)2);
-    assert(util::prefixEditDist("hell", "") == (size_t)4);
+    TEST(util::prefixEditDist("hello", "hello", 0), ==, (size_t)0);
+    TEST(util::prefixEditDist("hello", "hello", 100), ==, (size_t)0);
+    TEST(util::prefixEditDist("hello", "hello"), ==, (size_t)0);
+    TEST(util::prefixEditDist("hel", "hello"), ==, (size_t)0);
+    TEST(util::prefixEditDist("hel", "hello", 0), ==, (size_t)0);
+    TEST(util::prefixEditDist("hel", "hello", 1), ==, (size_t)0);
+    TEST(util::prefixEditDist("hel", "hello", 2), ==, (size_t)0);
+    TEST(util::prefixEditDist("hal", "hello", 2), ==, (size_t)1);
+    TEST(util::prefixEditDist("hal", "hello", 1), ==, (size_t)1);
+    TEST(util::prefixEditDist("hal", "hello", 0), >, (size_t)0);
+    TEST(util::prefixEditDist("fel", "hello", 0), >, (size_t)0);
+    TEST(util::prefixEditDist("fel", "hello", 1), ==, (size_t)1);
+    TEST(util::prefixEditDist("fel", "hello", 2), ==, (size_t)1);
+    TEST(util::prefixEditDist("fal", "hello", 2), ==, (size_t)2);
+    TEST(util::prefixEditDist("fal", "hello", 1), >, (size_t)1);
+    TEST(util::prefixEditDist("fal", "hello", 0), >, (size_t)0);
+    TEST(util::prefixEditDist("far", "hello", 0), >, (size_t)0);
+    TEST(util::prefixEditDist("far", "hello", 1), >, (size_t)1);
+    TEST(util::prefixEditDist("far", "hello", 2), >, (size_t)2);
+    TEST(util::prefixEditDist("far", "hello", 3), ==, (size_t)3);
+    TEST(util::prefixEditDist("far", "hello", 4), ==, (size_t)3);
+    TEST(util::prefixEditDist("far", "hello"), ==, (size_t)3);
+    TEST(util::prefixEditDist("hefar", "hello"), ==, (size_t)3);
+    TEST(util::prefixEditDist("hefaree", "hello"), ==, (size_t)5);
+    TEST(util::prefixEditDist("helloo", "hello"), ==, (size_t)1);
+    TEST(util::prefixEditDist("helloo", "hello", 0), >, (size_t)0);
+    TEST(util::prefixEditDist("helloo", "hello", 1), ==, (size_t)1);
+    TEST(util::prefixEditDist("helloo", "hello", 2), ==, (size_t)1);
+    TEST(util::prefixEditDist("", "hello", 2), ==, (size_t)0);
+    TEST(util::prefixEditDist("e", "hello", 2), ==, (size_t)1);
+    TEST(util::prefixEditDist("el", "hello", 2), ==, (size_t)1);
+    TEST(util::prefixEditDist("ello", "hello", 2), ==, (size_t)1);
+    TEST(util::prefixEditDist("hell", "hello", 2), ==, (size_t)0);
+    TEST(util::prefixEditDist("hell", "", 2), >, (size_t)2);
+    TEST(util::prefixEditDist("hell", ""), ==, (size_t)4);
   }
 
   // ___________________________________________________________________________
   {
-    assert(util::toString(34) == "34");
-    assert(util::toString("34") == "34");
+    TEST(util::toString(34) == "34");
+    TEST(util::toString("34") == "34");
   }
 
   // ___________________________________________________________________________
   {
     std::string a("lorem ipsum ipsum lorem");
 
-    assert(util::replace(a, "ips", "aa"));
-    assert(a == "lorem aaum ipsum lorem");
+    TEST(util::replace(a, "ips", "aa"));
+    TEST(a, ==, "lorem aaum ipsum lorem");
 
-    assert(!util::replace(a, "blablabla", ""));
-    assert(a == "lorem aaum ipsum lorem");
+    TEST(!util::replace(a, "blablabla", ""));
+    TEST(a, ==, "lorem aaum ipsum lorem");
 
-    assert(util::replace(a, "m", ""));
-    assert(a == "lore aaum ipsum lorem");
+    TEST(util::replace(a, "m", ""));
+    TEST(a, ==, "lore aaum ipsum lorem");
 
-    assert(!util::replace(a, "", ""));
-    assert(a == "lore aaum ipsum lorem");
+    TEST(!util::replace(a, "", ""));
+    TEST(a, ==, "lore aaum ipsum lorem");
 
     std::string b("lorem ipsum ipsum lorem");
-    assert(util::replaceAll(b, "ips", "aa"));
-    assert(b == "lorem aaum aaum lorem");
+    TEST(util::replaceAll(b, "ips", "aa"));
+    TEST(b, ==, "lorem aaum aaum lorem");
 
-    assert(util::replaceAll(b, "m", ""));
-    assert(b == "lore aau aau lore");
+    TEST(util::replaceAll(b, "m", ""));
+    TEST(b, ==, "lore aau aau lore");
 
-    assert(util::replaceAll(b, "a", "aa"));
-    assert(b == "lore aaaau aaaau lore");
+    TEST(util::replaceAll(b, "a", "aa"));
+    TEST(b, ==, "lore aaaau aaaau lore");
 
-    assert(util::replaceAll(b, "e", "e"));
-    assert(b == "lore aaaau aaaau lore");
+    TEST(util::replaceAll(b, "e", "e"));
+    TEST(b, ==, "lore aaaau aaaau lore");
 
-    assert(util::replaceAll(b, "e", "ee"));
-    assert(b == "loree aaaau aaaau loree");
+    TEST(util::replaceAll(b, "e", "ee"));
+    TEST(b, ==, "loree aaaau aaaau loree");
 
-    assert(!util::replaceAll(b, "", "ee"));
-    assert(b == "loree aaaau aaaau loree");
+    TEST(!util::replaceAll(b, "", "ee"));
+    TEST(b, ==, "loree aaaau aaaau loree");
   }
 
   // ___________________________________________________________________________
@@ -528,28 +533,28 @@ int main(int argc, char** argv) {
 
     auto comps = util::graph::Algorithm::connectedComponents(g);
 
-    assert(comps.size() == static_cast<size_t>(1));
-    assert(comps[0].count(a));
-    assert(comps[0].count(b));
-    assert(comps[0].count(c));
-    assert(comps[0].count(d));
-    assert(comps[0].count(e));
+    TEST(comps.size(), ==, static_cast<size_t>(1));
+    TEST(comps[0].count(a));
+    TEST(comps[0].count(b));
+    TEST(comps[0].count(c));
+    TEST(comps[0].count(d));
+    TEST(comps[0].count(e));
 
     auto f = g.addNd("F");
     comps = util::graph::Algorithm::connectedComponents(g);
-    assert(comps.size() == static_cast<size_t>(2));
+    TEST(comps.size(), ==, static_cast<size_t>(2));
 
     auto gn = g.addNd("G");
     comps = util::graph::Algorithm::connectedComponents(g);
-    assert(comps.size() == static_cast<size_t>(3));
+    TEST(comps.size(), ==, static_cast<size_t>(3));
 
     g.addEdg(f, gn, 1);
     comps = util::graph::Algorithm::connectedComponents(g);
-    assert(comps.size() == static_cast<size_t>(2));
+    TEST(comps.size(), ==, static_cast<size_t>(2));
 
     g.addEdg(f, a, 1);
     comps = util::graph::Algorithm::connectedComponents(g);
-    assert(comps.size() == static_cast<size_t>(1));
+    TEST(comps.size(), ==, static_cast<size_t>(1));
   }
 
   // ___________________________________________________________________________
@@ -594,7 +599,7 @@ int main(int argc, char** argv) {
 
     for (auto u : cost) {
       int single = EDijkstra::shortestPath(eAB, u.first, cFunc);
-      assert(single == u.second);
+      TEST(single, ==, u.second);
     }
 
     // all to 1
@@ -603,7 +608,7 @@ int main(int argc, char** argv) {
     auto costb = EDijkstra::shortestPathRev(eBC, cFunc);
     for (auto u : costb) {
       int single = EDijkstra::shortestPath(u.first, eBC, cFunc);
-      assert(single == u.second);
+      TEST(single, ==, u.second);
     }
   }
 
@@ -649,20 +654,20 @@ int main(int argc, char** argv) {
     EDijkstra::EList<std::string, int> resE;
     int cost = EDijkstra::shortestPath(eAB, d, cFunc, &resE, &res);
 
-    assert(cost == 2);
+    TEST(cost, ==, 2);
 
-    assert(resE.size() == (size_t)3);
-    assert(res.size() == (size_t)3);
-    assert((*(res.rbegin()))->pl() == "A");
-    assert((*(++res.rbegin()))->pl() == "C");
-    assert((*(++++res.rbegin()))->pl() == "D");
+    TEST(resE.size(), ==, (size_t)3);
+    TEST(res.size(), ==, (size_t)3);
+    TEST((*(res.rbegin()))->pl(), ==, "A");
+    TEST((*(++res.rbegin()))->pl(), ==, "C");
+    TEST((*(++++res.rbegin()))->pl(), ==, "D");
 
-    assert((*(resE.rbegin())) == eAB);
-    assert((*(++resE.rbegin())) == eAC);
-    assert((*(++++resE.rbegin())) == eDC);
+    TEST((*(resE.rbegin())), ==, eAB);
+    TEST((*(++resE.rbegin())), ==, eAC);
+    TEST((*(++++resE.rbegin())), ==, eDC);
 
     cost = EDijkstra::shortestPath(eAB, b, cFunc, &resE, &res);
-    assert(cost == 0);
+    TEST(cost, ==, 0);
   }
 
   // ___________________________________________________________________________
@@ -711,7 +716,7 @@ int main(int argc, char** argv) {
     EDijkstra::NList<std::string, int> res;
     EDijkstra::EList<std::string, int> resE;
     int cost = EDijkstra::shortestPath(eAB, tos, cFunc, &resE, &res);
-    assert(cost == 0);
+    TEST(cost, ==, 0);
   }
 
   // ___________________________________________________________________________
@@ -760,18 +765,18 @@ int main(int argc, char** argv) {
         res;
     res[eDC] = new EDijkstra::NList<std::string, int>();
     res[eED] = new EDijkstra::NList<std::string, int>();
-    auto hFunc = EDijkstra::ZeroHeurFunc<std::string, int, int>();
+    auto hFunc = ZeroHeurFunc<std::string, int, int>();
     std::unordered_map<Edge<std::string, int>*, int> cost =
         EDijkstra::shortestPath(eAB, tos, cFunc, hFunc, resE, res);
 
-    assert(cost[eDC] == 2);
-    assert(cost[eED] == 2);
+    TEST(cost[eDC], ==, 2);
+    TEST(cost[eED], ==, 2);
 
-    assert(resE[eDC]->size() == (size_t)3);
-    assert(res[eED]->size() == (size_t)3);
+    TEST(resE[eDC]->size(), ==, (size_t)3);
+    TEST(res[eED]->size(), ==, (size_t)3);
 
-    assert(resE[eDC]->size() == (size_t)3);
-    assert(res[eED]->size() == (size_t)3);
+    TEST(resE[eDC]->size(), ==, (size_t)3);
+    TEST(res[eED]->size(), ==, (size_t)3);
   }
 
   // ___________________________________________________________________________
@@ -808,43 +813,43 @@ int main(int argc, char** argv) {
     EDijkstra::EList<std::string, int> resE;
     int cost = EDijkstra::shortestPath(a, b, cFunc, &resE, &res);
 
-    assert(res.size() == (size_t)5);
-    assert((*(res.rbegin()))->pl() == "A");
-    assert((*(++res.rbegin()))->pl() == "C");
-    assert((*(++++res.rbegin()))->pl() == "D");
-    assert((*(++++++res.rbegin()))->pl() == "E");
-    assert((*(++++++++res.rbegin()))->pl() == "B");
-    assert(cost == 4);
-    assert((*(resE.rbegin()))->getFrom()->pl() == "A");
-    assert((*(++resE.rbegin()))->getFrom()->pl() == "D");
-    assert((*(++++resE.rbegin()))->getFrom()->pl() == "E");
-    assert((*(++++++resE.rbegin()))->getTo()->pl() == "B");
+    TEST(res.size(), ==, (size_t)5);
+    TEST((*(res.rbegin()))->pl(), ==, "A");
+    TEST((*(++res.rbegin()))->pl(), ==, "C");
+    TEST((*(++++res.rbegin()))->pl(), ==, "D");
+    TEST((*(++++++res.rbegin()))->pl(), ==, "E");
+    TEST((*(++++++++res.rbegin()))->pl(), ==, "B");
+    TEST(cost, ==, 4);
+    TEST((*(resE.rbegin()))->getFrom()->pl(), ==, "A");
+    TEST((*(++resE.rbegin()))->getFrom()->pl(), ==, "D");
+    TEST((*(++++resE.rbegin()))->getFrom()->pl(), ==, "E");
+    TEST((*(++++++resE.rbegin()))->getTo()->pl(), ==, "B");
 
-    assert(resE.size() == (size_t)4);
+    TEST(resE.size(), ==, (size_t)4);
 
     cost = EDijkstra::shortestPath(d, b, cFunc, &res);
-    assert(cost == 2);
+    TEST(cost, ==, 2);
 
     cost = EDijkstra::shortestPath(b, d, cFunc, &res);
-    assert(cost == 2);
+    TEST(cost, ==, 2);
 
     cost = EDijkstra::shortestPath(e, b, cFunc, &res);
-    assert(cost == 1);
+    TEST(cost, ==, 1);
 
     cost = EDijkstra::shortestPath(b, e, cFunc, &res);
-    assert(cost == 1);
+    TEST(cost, ==, 1);
 
     cost = EDijkstra::shortestPath(b, a, cFunc, &res);
-    assert(cost == 4);
+    TEST(cost, ==, 4);
 
     cost = EDijkstra::shortestPath(c, a, cFunc, &res);
-    assert(cost == 1);
+    TEST(cost, ==, 1);
 
     cost = EDijkstra::shortestPath(a, c, cFunc, &res);
-    assert(cost == 1);
+    TEST(cost, ==, 1);
 
     cost = EDijkstra::shortestPath(a, d, cFunc, &res);
-    assert(cost == 2);
+    TEST(cost, ==, 2);
   }
 
   // ___________________________________________________________________________
@@ -880,18 +885,114 @@ int main(int argc, char** argv) {
     EDijkstra::NList<int, int> res;
     int cost = EDijkstra::shortestPath(a, d, cFunc, &res);
 
-    assert(cost == 3);
+    TEST(cost, ==, 3);
 
     g.addEdg(c, d, 3);
     cost = EDijkstra::shortestPath(a, d, cFunc, &res);
 
-    assert(cost == 3);
+    TEST(cost, ==, 3);
 
     g.addEdg(a, b, 1);
     g.addEdg(x, a, 1);
     cost = EDijkstra::shortestPath(a, d, cFunc, &res);
 
-    assert(cost == 2);
+    TEST(cost, ==, 2);
+  }
+
+  // ___________________________________________________________________________
+  {
+    DirGraph<int, int> g;
+
+    auto source = g.addNd();
+    auto target = g.addNd();
+    auto a = g.addNd();
+    auto b = g.addNd();
+
+    g.addEdg(source, a, 4);
+    g.addEdg(source, b, 5);
+    g.addEdg(a, target, 3);
+    g.addEdg(b, target, 1);
+
+    struct CostFunc : public BiDijkstra::CostFunc<int, int, int> {
+      int operator()(const Node<int, int>* fr, const Edge<int, int>* e,
+                     const Node<int, int>* to) const {
+        UNUSED(fr);
+        UNUSED(to);
+        return e->pl();
+      };
+      int inf() const { return 999; };
+    };
+
+    CostFunc cFunc;
+
+    BiDijkstra::NList<int, int> res;
+    int cost = BiDijkstra::shortestPath(source, target, cFunc, &res);
+
+    TEST(cost, ==, 6);
+  }
+
+  // ___________________________________________________________________________
+  {
+    DirGraph<int, int> g;
+
+    DirNode<int, int>* a = new DirNode<int, int>(1);
+    DirNode<int, int>* b = new DirNode<int, int>(0);
+    g.addNd(a);
+    g.addNd(b);
+
+    auto c = g.addNd();
+    auto d = g.addNd(4);
+    auto x = g.addNd();
+
+    g.addEdg(a, d, 4);
+    g.addEdg(a, c, 1);
+    g.addEdg(c, b, 1);
+    g.addEdg(b, d, 1);
+
+    struct CostFunc : public BiDijkstra::CostFunc<int, int, int> {
+      int operator()(const Node<int, int>* fr, const Edge<int, int>* e,
+                     const Node<int, int>* to) const {
+        UNUSED(fr);
+        UNUSED(to);
+        return e->pl();
+      };
+      int inf() const { return 999; };
+    };
+
+    CostFunc cFunc;
+
+    BiDijkstra::NList<int, int> res;
+    int cost = BiDijkstra::shortestPath(a, d, cFunc, &res);
+
+    TEST(cost, ==, 3);
+    TEST(res.size(), ==, (size_t)4);
+
+    g.addEdg(c, d, 3);
+    cost = BiDijkstra::shortestPath(a, d, cFunc, &res);
+
+    TEST(cost, ==, 3);
+
+    g.addEdg(a, b, 1);
+    g.addEdg(x, a, 1);
+    cost = BiDijkstra::shortestPath(a, d, cFunc, &res);
+
+    TEST(cost, ==, 2);
+
+    // const std::set<Node<int, int>*> to{b, c, d, x};
+    // std::unordered_map<Node<int, int>*, BiDijkstra::EList<int, int>*> resEdges;
+    // std::unordered_map<Node<int, int>*, BiDijkstra::NList<int, int>*> resNodes;
+
+    // for (auto n : to) {
+      // resEdges[n] = new BiDijkstra::EList<int, int>();
+      // resNodes[n] = new BiDijkstra::NList<int, int>();
+    // }
+
+    // auto costs = BiDijkstra::shortestPath(a, to, cFunc, resEdges, resNodes);
+
+    // TEST(costs[b], ==, 1);
+    // TEST(costs[c], ==, 1);
+    // TEST(costs[d], ==, 2);
+    // TEST(costs[x], ==, 999);
   }
 
   // ___________________________________________________________________________
@@ -927,19 +1028,19 @@ int main(int argc, char** argv) {
     Dijkstra::NList<int, int> res;
     int cost = Dijkstra::shortestPath(a, d, cFunc, &res);
 
-    assert(cost == 3);
-    assert(res.size() == (size_t)4);
+    TEST(cost, ==, 3);
+    TEST(res.size(), ==, (size_t)4);
 
     g.addEdg(c, d, 3);
     cost = Dijkstra::shortestPath(a, d, cFunc, &res);
 
-    assert(cost == 3);
+    TEST(cost, ==, 3);
 
     g.addEdg(a, b, 1);
     g.addEdg(x, a, 1);
     cost = Dijkstra::shortestPath(a, d, cFunc, &res);
 
-    assert(cost == 2);
+    TEST(cost, ==, 2);
 
     const std::set<Node<int, int>*> to{b, c, d, x};
     std::unordered_map<Node<int, int>*, Dijkstra::EList<int, int>*> resEdges;
@@ -952,186 +1053,186 @@ int main(int argc, char** argv) {
 
     auto costs = Dijkstra::shortestPath(a, to, cFunc, resEdges, resNodes);
 
-    assert(costs[b] == 1);
-    assert(costs[c] == 1);
-    assert(costs[d] == 2);
-    assert(costs[x] == 999);
+    TEST(costs[b], ==, 1);
+    TEST(costs[c], ==, 1);
+    TEST(costs[d], ==, 2);
+    TEST(costs[x], ==, 999);
   }
 
   // ___________________________________________________________________________
   {{util::Nullable<std::string> nullable;
-  assert(nullable.isNull());
+  TEST(nullable.isNull());
 }
 
 {
   util::Nullable<std::string> nullable(0);
-  assert(nullable.isNull());
+  TEST(nullable.isNull());
 }
 
 {
   std::string str = "aa";
   util::Nullable<std::string> nullable(&str);
-  assert(!nullable.isNull());
+  TEST(!nullable.isNull());
 
-  assert(nullable == "aa");
-  assert(!(nullable == "aaa"));
-  assert(!(nullable != "aa"));
-  assert(nullable == "aa");
+  TEST(nullable == "aa");
+  TEST(!(nullable == "aaa"));
+  TEST(!(nullable != "aa"));
+  TEST(nullable == "aa");
 
-  assert(nullable.get() == "aa");
-  assert(std::string(nullable) == "aa");
+  TEST(nullable.get(), ==, "aa");
+  TEST(std::string(nullable), ==, "aa");
 }
 
 {
   int a = 23;
   util::Nullable<int> nullable(a);
   util::Nullable<int> nullable2(24);
-  assert(!nullable.isNull());
+  TEST(!nullable.isNull());
 
-  assert(nullable == 23);
-  assert(nullable >= 23);
-  assert(nullable <= 23);
-  assert(nullable < 24);
-  assert(nullable < 24);
-  assert(!(nullable < 22));
-  assert(nullable != nullable2);
-  assert(nullable < nullable2);
-  assert(nullable2 > nullable);
+  TEST(nullable, ==, 23);
+  TEST(nullable, >=, 23);
+  TEST(nullable, <=, 23);
+  TEST(nullable, <, 24);
+  TEST(nullable, <, 24);
+  TEST(!(nullable < 22));
+  TEST(nullable, !=, nullable2);
+  TEST(nullable, <, nullable2);
+  TEST(nullable2, >, nullable);
 
   util::Nullable<int> nullable3(nullable);
-  assert(nullable == nullable3);
+  TEST(nullable == nullable3);
 
   nullable3 = nullable2;
-  assert(nullable2 == nullable3);
-  assert(nullable3 == 24);
-  assert(nullable2 == 24);
-  assert(nullable2 == nullable2.get());
-  assert(int(nullable2) == nullable2.get());
-  assert(!nullable3.isNull());
-  assert(!nullable2.isNull());
+  TEST(nullable2 == nullable3);
+  TEST(nullable3 == 24);
+  TEST(nullable2 == 24);
+  TEST(nullable2 == nullable2.get());
+  TEST(int(nullable2) == nullable2.get());
+  TEST(!nullable3.isNull());
+  TEST(!nullable2.isNull());
 
   util::Nullable<int> voidnull;
-  assert(voidnull.isNull());
+  TEST(voidnull.isNull());
 }
 }
 
 // ___________________________________________________________________________
 {
   auto p = pointFromWKT<double>("POINT(10 50)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("POINT( 10 50)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("POINT (10 50 30)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("POINT (10     50 30)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("POINT(10 50 30)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("POINT (10    50) ");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("MPOINT(10 50 30)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("MPOINT(10 50)");
-  assert(p.getX() == approx(10));
-  assert(p.getY() == approx(50));
+  TEST(p.getX(), ==, approx(10));
+  TEST(p.getY(), ==, approx(50));
 
   p = pointFromWKT<double>("POINT(10.05 50.05)");
-  assert(p.getX() == approx(10.05));
-  assert(p.getY() == approx(50.05));
+  TEST(p.getX(), ==, approx(10.05));
+  TEST(p.getY(), ==, approx(50.05));
 
   auto wktl = lineFromWKT<double>("LINESTRING(0 0, 1 1,2 3, 0 1)");
-  assert(wktl.size() == (size_t)4);
-  assert(wktl[0].getX() == approx(0));
-  assert(wktl[0].getY() == approx(0));
-  assert(wktl[1].getX() == approx(1));
-  assert(wktl[1].getY() == approx(1));
-  assert(wktl[2].getX() == approx(2));
-  assert(wktl[2].getY() == approx(3));
-  assert(wktl[3].getX() == approx(0));
-  assert(wktl[3].getY() == approx(1));
+  TEST(wktl.size(), ==, (size_t)4);
+  TEST(wktl[0].getX(), ==, approx(0));
+  TEST(wktl[0].getY(), ==, approx(0));
+  TEST(wktl[1].getX(), ==, approx(1));
+  TEST(wktl[1].getY(), ==, approx(1));
+  TEST(wktl[2].getX(), ==, approx(2));
+  TEST(wktl[2].getY(), ==, approx(3));
+  TEST(wktl[3].getX(), ==, approx(0));
+  TEST(wktl[3].getY(), ==, approx(1));
 
   wktl = lineFromWKT<double>("MLINESTRING(0 0, 1 1,2 3, 0 1)");
-  assert(wktl.size() == (size_t)4);
-  assert(wktl[0].getX() == approx(0));
-  assert(wktl[0].getY() == approx(0));
-  assert(wktl[1].getX() == approx(1));
-  assert(wktl[1].getY() == approx(1));
-  assert(wktl[2].getX() == approx(2));
-  assert(wktl[2].getY() == approx(3));
-  assert(wktl[3].getX() == approx(0));
-  assert(wktl[3].getY() == approx(1));
+  TEST(wktl.size(), ==, (size_t)4);
+  TEST(wktl[0].getX(), ==, approx(0));
+  TEST(wktl[0].getY(), ==, approx(0));
+  TEST(wktl[1].getX(), ==, approx(1));
+  TEST(wktl[1].getY(), ==, approx(1));
+  TEST(wktl[2].getX(), ==, approx(2));
+  TEST(wktl[2].getY(), ==, approx(3));
+  TEST(wktl[3].getX(), ==, approx(0));
+  TEST(wktl[3].getY(), ==, approx(1));
 
   wktl = lineFromWKT<double>("MLINESTRING (0 0, 1  1,2   3, 0 1 )");
-  assert(wktl.size() == (size_t)4);
-  assert(wktl[0].getX() == approx(0));
-  assert(wktl[0].getY() == approx(0));
-  assert(wktl[1].getX() == approx(1));
-  assert(wktl[1].getY() == approx(1));
-  assert(wktl[2].getX() == approx(2));
-  assert(wktl[2].getY() == approx(3));
-  assert(wktl[3].getX() == approx(0));
-  assert(wktl[3].getY() == approx(1));
+  TEST(wktl.size(), ==, (size_t)4);
+  TEST(wktl[0].getX(), ==, approx(0));
+  TEST(wktl[0].getY(), ==, approx(0));
+  TEST(wktl[1].getX(), ==, approx(1));
+  TEST(wktl[1].getY(), ==, approx(1));
+  TEST(wktl[2].getX(), ==, approx(2));
+  TEST(wktl[2].getY(), ==, approx(3));
+  TEST(wktl[3].getX(), ==, approx(0));
+  TEST(wktl[3].getY(), ==, approx(1));
 }
 // ___________________________________________________________________________
 {
   geo::Point<double> a(1, 2);
   geo::Point<double> b(2, 3);
   geo::Point<double> c(4, 5);
-  assert(a.getX() == approx(1));
-  assert(a.getY() == approx(2));
+  TEST(a.getX(), ==, approx(1));
+  TEST(a.getY(), ==, approx(2));
 
   a.setX(3);
-  assert(a.getX() == approx(3));
-  assert(a.getY() == approx(2));
+  TEST(a.getX(), ==, approx(3));
+  TEST(a.getY(), ==, approx(2));
 
   a.setY(4);
-  assert(a.getX() == approx(3));
-  assert(a.getY() == approx(4));
+  TEST(a.getX(), ==, approx(3));
+  TEST(a.getY(), ==, approx(4));
 
   auto d = a + b;
-  assert(d.getX() == approx(5));
-  assert(d.getY() == approx(7));
+  TEST(d.getX(), ==, approx(5));
+  TEST(d.getY(), ==, approx(7));
 
   a.setX(1);
   a.setY(2);
 
-  assert(geo::dist(a, a) == approx(0));
-  assert(geo::dist(a, b) == approx(sqrt(2)));
+  TEST(geo::dist(a, a), ==, approx(0));
+  TEST(geo::dist(a, b), ==, approx(sqrt(2)));
 
   d = d + d;
 
   geo::Box<double> box(a, c);
-  assert(geo::contains(a, box));
-  assert(geo::contains(b, box));
-  assert(geo::contains(c, box));
-  assert(!geo::contains(d, box));
+  TEST(geo::contains(a, box));
+  TEST(geo::contains(b, box));
+  TEST(geo::contains(c, box));
+  TEST(!geo::contains(d, box));
 
   geo::Line<double> line{a, b, c};
 
-  assert(geo::contains(line, box));
+  TEST(geo::contains(line, box));
   line.push_back(d);
-  assert(!geo::contains(line, box));
+  TEST(!geo::contains(line, box));
 
   geo::LineSegment<double> ls{a, b};
-  assert(geo::contains(a, ls));
-  assert(geo::contains(b, ls));
-  assert(!geo::contains(c, ls));
-  assert(geo::contains(a + geo::Point<double>(.5, .5), ls));
-  assert(!geo::contains(a + geo::Point<double>(1.5, 1.5), ls));
+  TEST(geo::contains(a, ls));
+  TEST(geo::contains(b, ls));
+  TEST(!geo::contains(c, ls));
+  TEST(geo::contains(a + geo::Point<double>(.5, .5), ls));
+  TEST(!geo::contains(a + geo::Point<double>(1.5, 1.5), ls));
 
   geo::LineSegment<double> lsa{geo::Point<double>(1, 1),
                                geo::Point<double>(2, 2)};
@@ -1140,187 +1241,187 @@ int main(int argc, char** argv) {
   geo::LineSegment<double> lsc{geo::Point<double>(2.1, 2),
                                geo::Point<double>(3, 3)};
 
-  assert(geo::crossProd(lsa.first, lsb) == approx(-1));
-  assert(geo::crossProd(lsa.second, lsb) == approx(1));
+  TEST(geo::crossProd(lsa.first, lsb), ==, approx(-1));
+  TEST(geo::crossProd(lsa.second, lsb), ==, approx(1));
 
-  assert(geo::intersects(lsa, lsb));
+  TEST(geo::intersects(lsa, lsb));
 
-  assert(!geo::intersects(lsa, lsa));
-  assert(!geo::intersects(lsb, lsb));
-  assert(!geo::intersects(lsa, lsc));
+  TEST(!geo::intersects(lsa, lsa));
+  TEST(!geo::intersects(lsb, lsb));
+  TEST(!geo::intersects(lsa, lsc));
 
-  assert(!geo::intersects(geo::Point<double>(871569.2, 6104550.4),
+  TEST(!geo::intersects(geo::Point<double>(871569.2, 6104550.4),
                           geo::Point<double>(871581.2, 6104536),
                           geo::Point<double>(871580.3, 6104541.3),
                           geo::Point<double>(871625.7, 6104510.1)));
 
-  assert(!geo::intersects(geo::Point<double>(0, 0), geo::Point<double>(1, 1),
+  TEST(!geo::intersects(geo::Point<double>(0, 0), geo::Point<double>(1, 1),
                           geo::Point<double>(0.5, 0.5),
                           geo::Point<double>(1.5, 1.5)));
 
   geo::Line<double> l{geo::Point<double>(1, 1), geo::Point<double>(2, 2),
                       geo::Point<double>(2, 4)};
-  assert(!geo::contains(geo::Point<double>(1, 2), l));
-  assert(geo::contains(geo::Point<double>(2, 2), l));
-  assert(geo::contains(geo::Point<double>(2, 3), l));
+  TEST(!geo::contains(geo::Point<double>(1, 2), l));
+  TEST(geo::contains(geo::Point<double>(2, 2), l));
+  TEST(geo::contains(geo::Point<double>(2, 3), l));
 
   geo::Box<double> bbox(geo::Point<double>(1, 1), geo::Point<double>(3, 3));
-  assert(geo::intersects(l, bbox));
+  TEST(geo::intersects(l, bbox));
   geo::Line<double> ll{geo::Point<double>(0, 0), geo::Point<double>(4, 4)};
-  assert(geo::intersects(ll, bbox));
+  TEST(geo::intersects(ll, bbox));
   geo::Line<double> lll{geo::Point<double>(0, 0), geo::Point<double>(0, 4)};
-  assert(!geo::intersects(lll, bbox));
+  TEST(!geo::intersects(lll, bbox));
   geo::Line<double> llll{geo::Point<double>(1.2, 0), geo::Point<double>(1, 2)};
-  assert(geo::intersects(llll, bbox));
+  TEST(geo::intersects(llll, bbox));
 
   Line<double> l5new;
   l5new.push_back(Point<double>(-10, -5));
   l5new.push_back(Point<double>(-8, -4));
-  assert(geo::getBoundingBox(l5new).getUpperRight().getX() == approx(-8));
-  assert(geo::getBoundingBox(l5new).getUpperRight().getY() == approx(-4));
+  TEST(geo::getBoundingBox(l5new).getUpperRight().getX(), ==, approx(-8));
+  TEST(geo::getBoundingBox(l5new).getUpperRight().getY(), ==, approx(-4));
 
   Line<double> l5;
   l5.push_back(Point<double>(0, 0));
   l5.push_back(Point<double>(1.5, 2));
   Box<double> req(Point<double>(.5, 1), Point<double>(1, 1.5));
 
-  assert(geo::getBoundingBox(l5[0]).getLowerLeft().getX() == approx(0));
-  assert(geo::getBoundingBox(l5[0]).getLowerLeft().getY() == approx(0));
+  TEST(geo::getBoundingBox(l5[0]).getLowerLeft().getX(), ==, approx(0));
+  TEST(geo::getBoundingBox(l5[0]).getLowerLeft().getY(), ==, approx(0));
 
-  assert(geo::getBoundingBox(l5).getLowerLeft().getX() == approx(0));
-  assert(geo::getBoundingBox(l5).getLowerLeft().getY() == approx(0));
-  assert(geo::getBoundingBox(l5).getUpperRight().getX() == approx(1.5));
-  assert(geo::getBoundingBox(l5).getUpperRight().getY() == approx(2));
-  assert(geo::intersects(geo::getBoundingBox(l5),
+  TEST(geo::getBoundingBox(l5).getLowerLeft().getX(), ==, approx(0));
+  TEST(geo::getBoundingBox(l5).getLowerLeft().getY(), ==, approx(0));
+  TEST(geo::getBoundingBox(l5).getUpperRight().getX(), ==, approx(1.5));
+  TEST(geo::getBoundingBox(l5).getUpperRight().getY(), ==, approx(2));
+  TEST(geo::intersects(geo::getBoundingBox(l5),
                          geo::getBoundingBox(Line<double>{
                              Point<double>(.5, 1), Point<double>(1, 1)})));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       l5, Line<double>{Point<double>(.5, 1), Point<double>(1, 1)}));
-  assert(geo::intersects(l5, req));
+  TEST(geo::intersects(l5, req));
 
   Box<double> boxa(Point<double>(1, 1), Point<double>(2, 2));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       boxa, Box<double>(Point<double>(1.5, 1.5), Point<double>(1.7, 1.7))));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       boxa, Box<double>(Point<double>(0, 0), Point<double>(3, 3))));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       boxa, Box<double>(Point<double>(1.5, 1.5), Point<double>(3, 3))));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       boxa, Box<double>(Point<double>(0, 0), Point<double>(1.5, 1.5))));
 
-  assert(geo::intersects(
+  TEST(geo::intersects(
       Box<double>(Point<double>(1.5, 1.5), Point<double>(1.7, 1.7)), boxa));
-  assert(geo::intersects(Box<double>(Point<double>(0, 0), Point<double>(3, 3)),
+  TEST(geo::intersects(Box<double>(Point<double>(0, 0), Point<double>(3, 3)),
                          boxa));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       Box<double>(Point<double>(1.5, 1.5), Point<double>(3, 3)), boxa));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       Box<double>(Point<double>(0, 0), Point<double>(1.5, 1.5)), boxa));
 
   Polygon<double> poly({Point<double>(1, 1), Point<double>(3, 2),
                         Point<double>(4, 3), Point<double>(6, 3),
                         Point<double>(5, 1)});
-  assert(geo::getWKT(poly) == "POLYGON ((1 1, 3 2, 4 3, 6 3, 5 1, 1 1))");
-  assert(geo::contains(Point<double>(4, 2), poly));
-  assert(!geo::contains(Point<double>(3, 3), poly));
-  assert(geo::contains(Point<double>(1, 1), poly));
-  assert(geo::contains(Point<double>(3, 2), poly));
-  assert(geo::contains(Point<double>(4, 3), poly));
-  assert(geo::contains(Point<double>(6, 3), poly));
-  assert(geo::contains(Point<double>(5, 1), poly));
+  TEST(geo::getWKT(poly), ==, "POLYGON ((1 1, 3 2, 4 3, 6 3, 5 1, 1 1))");
+  TEST(geo::contains(Point<double>(4, 2), poly));
+  TEST(!geo::contains(Point<double>(3, 3), poly));
+  TEST(geo::contains(Point<double>(1, 1), poly));
+  TEST(geo::contains(Point<double>(3, 2), poly));
+  TEST(geo::contains(Point<double>(4, 3), poly));
+  TEST(geo::contains(Point<double>(6, 3), poly));
+  TEST(geo::contains(Point<double>(5, 1), poly));
 
-  assert(geo::contains(Line<double>{Point<double>(6, 3), Point<double>(5, 1)},
+  TEST(geo::contains(Line<double>{Point<double>(6, 3), Point<double>(5, 1)},
                        poly));
-  assert(!geo::contains(Line<double>{Point<double>(6, 3), Point<double>(50, 1)},
+  TEST(!geo::contains(Line<double>{Point<double>(6, 3), Point<double>(50, 1)},
                         poly));
-  assert(geo::contains(Line<double>{Point<double>(4, 2), Point<double>(4.5, 2)},
+  TEST(geo::contains(Line<double>{Point<double>(4, 2), Point<double>(4.5, 2)},
                        poly));
-  assert(geo::contains(Line<double>{Point<double>(4, 2), Point<double>(5, 1)},
+  TEST(geo::contains(Line<double>{Point<double>(4, 2), Point<double>(5, 1)},
                        poly));
 
   Box<double> polybox(Point<double>(1, 1), Point<double>(6, 4));
-  assert(geo::centroid(polybox).getX() == approx(3.5));
-  assert(geo::centroid(polybox).getY() == approx(2.5));
-  assert(geo::contains(poly, polybox));
-  assert(!geo::contains(polybox, poly));
+  TEST(geo::centroid(polybox).getX(), ==, approx(3.5));
+  TEST(geo::centroid(polybox).getY(), ==, approx(2.5));
+  TEST(geo::contains(poly, polybox));
+  TEST(!geo::contains(polybox, poly));
   Box<double> polybox2(Point<double>(4, 1), Point<double>(5, 2));
-  assert(geo::contains(polybox2, poly));
-  assert(geo::contains(poly, getBoundingBox(poly)));
+  TEST(geo::contains(polybox2, poly));
+  TEST(geo::contains(poly, getBoundingBox(poly)));
 
   Point<double> rotP(2, 2);
-  assert(geo::dist(geo::rotate(rotP, 180, Point<double>(1, 1)),
+  TEST(geo::dist(geo::rotate(rotP, 180, Point<double>(1, 1)),
                    Point<double>(0, 0)) == approx(0));
-  assert(geo::dist(geo::rotate(rotP, 360, Point<double>(1, 1)), rotP) ==
+  TEST(geo::dist(geo::rotate(rotP, 360, Point<double>(1, 1)), rotP) ==
          approx(0));
 
   Line<double> rotLine({{1, 1}, {3, 3}});
-  assert(geo::rotate(rotLine, 90, Point<double>(2, 2))[0].getX() == approx(1));
-  assert(geo::rotate(rotLine, 90, Point<double>(2, 2))[0].getY() == approx(3));
-  assert(geo::rotate(rotLine, 90, Point<double>(2, 2))[1].getX() == approx(3));
-  assert(geo::rotate(rotLine, 90, Point<double>(2, 2))[1].getY() == approx(1));
+  TEST(geo::rotate(rotLine, 90, Point<double>(2, 2))[0].getX(), ==, approx(1));
+  TEST(geo::rotate(rotLine, 90, Point<double>(2, 2))[0].getY(), ==, approx(3));
+  TEST(geo::rotate(rotLine, 90, Point<double>(2, 2))[1].getX(), ==, approx(3));
+  TEST(geo::rotate(rotLine, 90, Point<double>(2, 2))[1].getY(), ==, approx(1));
 
   MultiLine<double> multiRotLine({{{1, 1}, {3, 3}}, {{1, 3}, {3, 1}}});
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][0].getX() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][0].getX() ==
          approx(1));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][0].getY() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][0].getY() ==
          approx(3));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][1].getX() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][1].getX() ==
          approx(3));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][1].getY() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[0][1].getY() ==
          approx(1));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][0].getX() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][0].getX() ==
          approx(3));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][0].getY() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][0].getY() ==
          approx(3));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][1].getX() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][1].getX() ==
          approx(1));
-  assert(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][1].getY() ==
+  TEST(geo::rotate(multiRotLine, 90, Point<double>(2, 2))[1][1].getY() ==
          approx(1));
 
-  assert(geo::getWKT(multiRotLine) ==
+  TEST(geo::getWKT(multiRotLine) ==
          "MULTILINESTRING ((1 1, 3 3), (1 3, 3 1))");
 
-  assert(geo::contains(
+  TEST(geo::contains(
       multiRotLine[0],
       geo::move(geo::move(multiRotLine, 1.0, 2.0), -1.0, -2.0)[0]));
-  assert(geo::contains(multiRotLine, geo::getBoundingBox(Line<double>{
+  TEST(geo::contains(multiRotLine, geo::getBoundingBox(Line<double>{
                                          {1, 1}, {3, 3}, {1, 3}, {3, 1}})));
 
-  assert(geo::contains(
+  TEST(geo::contains(
       getBoundingBox(multiRotLine),
       geo::getBoundingBox(Line<double>{{1, 1}, {3, 3}, {1, 3}, {3, 1}})));
-  assert(geo::contains(
+  TEST(geo::contains(
       geo::getBoundingBox(Line<double>{{1, 1}, {3, 3}, {1, 3}, {3, 1}}),
       getBoundingBox(multiRotLine)));
 
-  assert(geo::dist(geo::centroid(rotP), rotP) == approx(0));
-  assert(geo::dist(geo::centroid(rotLine), rotP) == approx(0));
-  assert(geo::dist(geo::centroid(polybox), Point<double>(3.5, 2.5)) ==
+  TEST(geo::dist(geo::centroid(rotP), rotP), ==, approx(0));
+  TEST(geo::dist(geo::centroid(rotLine), rotP), ==, approx(0));
+  TEST(geo::dist(geo::centroid(polybox), Point<double>(3.5, 2.5)) ==
          approx(0));
-  assert(geo::dist(geo::centroid(Polygon<double>({{0, 0}, {3, 4}, {4, 3}})),
+  TEST(geo::dist(geo::centroid(Polygon<double>({{0, 0}, {3, 4}, {4, 3}})),
                    Point<double>(7.0 / 3.0, 7.0 / 3.0)) == approx(0));
 
   auto polyy = Polygon<double>({{0, 0}, {3, 4}, {4, 3}});
   MultiPolygon<double> mpoly{polyy, polyy};
 
-  assert(geo::getWKT(polyy) == "POLYGON ((0 0, 3 4, 4 3, 0 0))");
-  assert(geo::getWKT(mpoly) ==
+  TEST(geo::getWKT(polyy), ==, "POLYGON ((0 0, 3 4, 4 3, 0 0))");
+  TEST(geo::getWKT(mpoly) ==
          "MULTIPOLYGON (((0 0, 3 4, 4 3, 0 0)), ((0 0, 3 4, 4 3, 0 0)))");
 
   auto hull = geo::convexHull(Line<double>{
       {0.1, 3}, {1, 1}, {2, 2}, {4, 4}, {0, 0}, {1, 2}, {3, 1}, {3, 3}});
-  assert(hull.getOuter().size() == size_t(4));
-  assert(hull.getOuter()[0].getX() == approx(0));
-  assert(hull.getOuter()[0].getY() == approx(0));
-  assert(hull.getOuter()[1].getX() == approx(0.1));
-  assert(hull.getOuter()[1].getY() == approx(3));
-  assert(hull.getOuter()[2].getX() == approx(4));
-  assert(hull.getOuter()[2].getY() == approx(4));
-  assert(hull.getOuter()[3].getX() == approx(3));
-  assert(hull.getOuter()[3].getY() == approx(1));
-  assert(geo::contains(geo::convexHull(geo::getBoundingBox(poly)),
+  TEST(hull.getOuter().size(), ==, size_t(4));
+  TEST(hull.getOuter()[0].getX(), ==, approx(0));
+  TEST(hull.getOuter()[0].getY(), ==, approx(0));
+  TEST(hull.getOuter()[1].getX(), ==, approx(0.1));
+  TEST(hull.getOuter()[1].getY(), ==, approx(3));
+  TEST(hull.getOuter()[2].getX(), ==, approx(4));
+  TEST(hull.getOuter()[2].getY(), ==, approx(4));
+  TEST(hull.getOuter()[3].getX(), ==, approx(3));
+  TEST(hull.getOuter()[3].getY(), ==, approx(1));
+  TEST(geo::contains(geo::convexHull(geo::getBoundingBox(poly)),
                        geo::getBoundingBox(poly)));
-  assert(geo::contains(geo::getBoundingBox(poly),
+  TEST(geo::contains(geo::getBoundingBox(poly),
                        geo::convexHull(geo::getBoundingBox(poly))));
 
   auto hull2 = geo::convexHull(Line<double>{{0.1, 3},
@@ -1332,71 +1433,71 @@ int main(int argc, char** argv) {
                                             {3, 1},
                                             {3, 3},
                                             {-0.1, 1}});
-  assert(hull2.getOuter().size() == size_t(5));
-  assert(hull2.getOuter()[0].getX() == approx(-.1));
-  assert(hull2.getOuter()[0].getY() == approx(1));
-  assert(hull2.getOuter()[1].getX() == approx(0.1));
-  assert(hull2.getOuter()[1].getY() == approx(3));
-  assert(hull2.getOuter()[2].getX() == approx(4));
-  assert(hull2.getOuter()[2].getY() == approx(4));
-  assert(hull2.getOuter()[3].getX() == approx(3));
-  assert(hull2.getOuter()[3].getY() == approx(1));
-  assert(hull2.getOuter()[4].getX() == approx(0));
-  assert(hull2.getOuter()[4].getY() == approx(0));
+  TEST(hull2.getOuter().size(), ==, size_t(5));
+  TEST(hull2.getOuter()[0].getX(), ==, approx(-.1));
+  TEST(hull2.getOuter()[0].getY(), ==, approx(1));
+  TEST(hull2.getOuter()[1].getX(), ==, approx(0.1));
+  TEST(hull2.getOuter()[1].getY(), ==, approx(3));
+  TEST(hull2.getOuter()[2].getX(), ==, approx(4));
+  TEST(hull2.getOuter()[2].getY(), ==, approx(4));
+  TEST(hull2.getOuter()[3].getX(), ==, approx(3));
+  TEST(hull2.getOuter()[3].getY(), ==, approx(1));
+  TEST(hull2.getOuter()[4].getX(), ==, approx(0));
+  TEST(hull2.getOuter()[4].getY(), ==, approx(0));
 
   auto hull3 =
       geo::convexHull(Line<double>{{0.1, 3}, {4, 4}, {0, 0}, {1, 2}, {3, 1}});
-  assert(hull3.getOuter().size() == size_t(4));
-  assert(hull3.getOuter()[0].getX() == approx(0));
-  assert(hull3.getOuter()[0].getY() == approx(0));
-  assert(hull3.getOuter()[3].getX() == approx(3));
-  assert(hull3.getOuter()[3].getY() == approx(1));
-  assert(hull3.getOuter()[2].getX() == approx(4));
-  assert(hull3.getOuter()[2].getY() == approx(4));
-  assert(hull3.getOuter()[1].getX() == approx(0.1));
-  assert(hull3.getOuter()[1].getY() == approx(3));
+  TEST(hull3.getOuter().size(), ==, size_t(4));
+  TEST(hull3.getOuter()[0].getX(), ==, approx(0));
+  TEST(hull3.getOuter()[0].getY(), ==, approx(0));
+  TEST(hull3.getOuter()[3].getX(), ==, approx(3));
+  TEST(hull3.getOuter()[3].getY(), ==, approx(1));
+  TEST(hull3.getOuter()[2].getX(), ==, approx(4));
+  TEST(hull3.getOuter()[2].getY(), ==, approx(4));
+  TEST(hull3.getOuter()[1].getX(), ==, approx(0.1));
+  TEST(hull3.getOuter()[1].getY(), ==, approx(3));
 
   hull3 = geo::convexHull(
       Line<double>{{0.1, 3}, {4, 4}, {2, 1}, {3, 2}, {0, 0}, {1, 2}, {3, 1}});
-  assert(hull3.getOuter().size() == size_t(4));
-  assert(hull3.getOuter()[0].getX() == approx(0));
-  assert(hull3.getOuter()[0].getY() == approx(0));
-  assert(hull3.getOuter()[3].getX() == approx(3));
-  assert(hull3.getOuter()[3].getY() == approx(1));
-  assert(hull3.getOuter()[2].getX() == approx(4));
-  assert(hull3.getOuter()[2].getY() == approx(4));
-  assert(hull3.getOuter()[1].getX() == approx(0.1));
-  assert(hull3.getOuter()[1].getY() == approx(3));
+  TEST(hull3.getOuter().size(), ==, size_t(4));
+  TEST(hull3.getOuter()[0].getX(), ==, approx(0));
+  TEST(hull3.getOuter()[0].getY(), ==, approx(0));
+  TEST(hull3.getOuter()[3].getX(), ==, approx(3));
+  TEST(hull3.getOuter()[3].getY(), ==, approx(1));
+  TEST(hull3.getOuter()[2].getX(), ==, approx(4));
+  TEST(hull3.getOuter()[2].getY(), ==, approx(4));
+  TEST(hull3.getOuter()[1].getX(), ==, approx(0.1));
+  TEST(hull3.getOuter()[1].getY(), ==, approx(3));
 
   hull3 = geo::convexHull(Line<double>{
       {4, 4}, {1, 2}, {2, 1}, {3, 2}, {0.1, 3}, {0, 0}, {1, 2}, {3, 1}});
-  assert(hull3.getOuter().size() == size_t(4));
-  assert(hull3.getOuter()[0].getX() == approx(0));
-  assert(hull3.getOuter()[0].getY() == approx(0));
-  assert(hull3.getOuter()[3].getX() == approx(3));
-  assert(hull3.getOuter()[3].getY() == approx(1));
-  assert(hull3.getOuter()[2].getX() == approx(4));
-  assert(hull3.getOuter()[2].getY() == approx(4));
-  assert(hull3.getOuter()[1].getX() == approx(0.1));
-  assert(hull3.getOuter()[1].getY() == approx(3));
+  TEST(hull3.getOuter().size(), ==, size_t(4));
+  TEST(hull3.getOuter()[0].getX(), ==, approx(0));
+  TEST(hull3.getOuter()[0].getY(), ==, approx(0));
+  TEST(hull3.getOuter()[3].getX(), ==, approx(3));
+  TEST(hull3.getOuter()[3].getY(), ==, approx(1));
+  TEST(hull3.getOuter()[2].getX(), ==, approx(4));
+  TEST(hull3.getOuter()[2].getY(), ==, approx(4));
+  TEST(hull3.getOuter()[1].getX(), ==, approx(0.1));
+  TEST(hull3.getOuter()[1].getY(), ==, approx(3));
 
   hull3 = geo::convexHull(Line<double>{{4, 4}, {1, 2}, {3, 1}});
-  assert(hull3.getOuter().size() == size_t(3));
-  assert(hull3.getOuter()[0].getX() == approx(1));
-  assert(hull3.getOuter()[0].getY() == approx(2));
-  assert(hull3.getOuter()[2].getX() == approx(3));
-  assert(hull3.getOuter()[2].getY() == approx(1));
-  assert(hull3.getOuter()[1].getX() == approx(4));
-  assert(hull3.getOuter()[1].getY() == approx(4));
+  TEST(hull3.getOuter().size(), ==, size_t(3));
+  TEST(hull3.getOuter()[0].getX(), ==, approx(1));
+  TEST(hull3.getOuter()[0].getY(), ==, approx(2));
+  TEST(hull3.getOuter()[2].getX(), ==, approx(3));
+  TEST(hull3.getOuter()[2].getY(), ==, approx(1));
+  TEST(hull3.getOuter()[1].getX(), ==, approx(4));
+  TEST(hull3.getOuter()[1].getY(), ==, approx(4));
 
   hull3 = geo::convexHull(Line<double>{{4, 4}, {1, 2}, {3, 10}});
-  assert(hull3.getOuter().size() == size_t(3));
-  assert(hull3.getOuter()[0].getX() == approx(1));
-  assert(hull3.getOuter()[0].getY() == approx(2));
-  assert(hull3.getOuter()[2].getX() == approx(4));
-  assert(hull3.getOuter()[2].getY() == approx(4));
-  assert(hull3.getOuter()[1].getX() == approx(3));
-  assert(hull3.getOuter()[1].getY() == approx(10));
+  TEST(hull3.getOuter().size(), ==, size_t(3));
+  TEST(hull3.getOuter()[0].getX(), ==, approx(1));
+  TEST(hull3.getOuter()[0].getY(), ==, approx(2));
+  TEST(hull3.getOuter()[2].getX(), ==, approx(4));
+  TEST(hull3.getOuter()[2].getY(), ==, approx(4));
+  TEST(hull3.getOuter()[1].getX(), ==, approx(3));
+  TEST(hull3.getOuter()[1].getY(), ==, approx(10));
 
   Line<double> test{{0.3215348546593775, 0.03629583077160248},
                     {0.02402358131857918, -0.2356728797179394},
@@ -1441,9 +1542,9 @@ int main(int argc, char** argv) {
 
   };
   hull3 = geo::convexHull(test);
-  assert(geo::contains(test, hull3));
-  assert(hull3.getOuter().size() == size_t(8));
-  assert(geo::contains(
+  TEST(geo::contains(test, hull3));
+  TEST(hull3.getOuter().size(), ==, size_t(8));
+  TEST(geo::contains(
       Polygon<double>({{-0.161920957418085, -0.4055339716426413},
                        {0.05054295812784038, 0.4754929463150845},
                        {0.4823896228171788, -0.4776170002088109},
@@ -1453,7 +1554,7 @@ int main(int argc, char** argv) {
                        {0.4916198379282093, -0.345391701297268},
                        {-0.4404289572876217, -0.2894855991839297}}),
       hull3));
-  assert(geo::contains(
+  TEST(geo::contains(
       hull3, Polygon<double>({{-0.161920957418085, -0.4055339716426413},
                               {0.05054295812784038, 0.4754929463150845},
                               {0.4823896228171788, -0.4776170002088109},
@@ -1474,22 +1575,22 @@ int main(int argc, char** argv) {
                                        {30, -9},
                                        {3, 14},
                                        {25, -5.5}});
-  assert(hull3.getOuter().size() == size_t(5));
-  assert(hull3.getOuter()[0].getX() == approx(-4));
-  assert(hull3.getOuter()[0].getY() == approx(5));
-  assert(hull3.getOuter()[4].getX() == approx(20));
-  assert(hull3.getOuter()[4].getY() == approx(-10));
-  assert(hull3.getOuter()[3].getX() == approx(30));
-  assert(hull3.getOuter()[3].getY() == approx(-9));
-  assert(hull3.getOuter()[2].getX() == approx(45));
-  assert(hull3.getOuter()[2].getY() == approx(1));
-  assert(hull3.getOuter()[1].getX() == approx(3));
-  assert(hull3.getOuter()[1].getY() == approx(14));
+  TEST(hull3.getOuter().size(), ==, size_t(5));
+  TEST(hull3.getOuter()[0].getX(), ==, approx(-4));
+  TEST(hull3.getOuter()[0].getY(), ==, approx(5));
+  TEST(hull3.getOuter()[4].getX(), ==, approx(20));
+  TEST(hull3.getOuter()[4].getY(), ==, approx(-10));
+  TEST(hull3.getOuter()[3].getX(), ==, approx(30));
+  TEST(hull3.getOuter()[3].getY(), ==, approx(-9));
+  TEST(hull3.getOuter()[2].getX(), ==, approx(45));
+  TEST(hull3.getOuter()[2].getY(), ==, approx(1));
+  TEST(hull3.getOuter()[1].getX(), ==, approx(3));
+  TEST(hull3.getOuter()[1].getY(), ==, approx(14));
 
   hull3 = geo::convexHull(Line<double>{
       {7, 7}, {7, -7}, {-7, -7}, {-7, 7}, {9, 0}, {-9, 0}, {0, 9}, {0, -9}});
-  assert(hull3.getOuter().size() == size_t(8));
-  assert(geo::contains(geo::Polygon<double>({{-9, 0},
+  TEST(hull3.getOuter().size(), ==, size_t(8));
+  TEST(geo::contains(geo::Polygon<double>({{-9, 0},
                                              {-7, -7},
                                              {0, -9},
                                              {7, -7},
@@ -1498,7 +1599,7 @@ int main(int argc, char** argv) {
                                              {0, 9},
                                              {-7, 7}}),
                        hull3));
-  assert(geo::contains(hull3, geo::Polygon<double>({{-9, 0},
+  TEST(geo::contains(hull3, geo::Polygon<double>({{-9, 0},
                                                     {-7, -7},
                                                     {0, -9},
                                                     {7, -7},
@@ -1523,8 +1624,8 @@ int main(int argc, char** argv) {
                                        {4, 3},
                                        {-5, 4},
                                        {6, 5}});
-  assert(hull3.getOuter().size() == size_t(8));
-  assert(geo::contains(geo::Polygon<double>({{-9, 0},
+  TEST(hull3.getOuter().size(), ==, size_t(8));
+  TEST(geo::contains(geo::Polygon<double>({{-9, 0},
                                              {-7, -7},
                                              {0, -9},
                                              {7, -7},
@@ -1533,7 +1634,7 @@ int main(int argc, char** argv) {
                                              {0, 9},
                                              {-7, 7}}),
                        hull3));
-  assert(geo::contains(hull3, geo::Polygon<double>({{-9, 0},
+  TEST(geo::contains(hull3, geo::Polygon<double>({{-9, 0},
                                                     {-7, -7},
                                                     {0, -9},
                                                     {7, -7},
@@ -1554,8 +1655,8 @@ int main(int argc, char** argv) {
       {3, -3},  {4, -4}, {5, -5}, {6, -6},  {-1, 1},  {-2, 2},  {-3, 3},
       {-4, 4},  {-5, 5}, {-6, 6}, {-1, -1}, {-2, -2}, {-3, -3}, {-4, -4},
       {-5, -5}, {-6, -6}});
-  assert(hull3.getOuter().size() == size_t(8));
-  assert(geo::contains(geo::Polygon<double>({{-9, 0},
+  TEST(hull3.getOuter().size(), ==, size_t(8));
+  TEST(geo::contains(geo::Polygon<double>({{-9, 0},
                                              {-7, -7},
                                              {0, -9},
                                              {7, -7},
@@ -1564,7 +1665,7 @@ int main(int argc, char** argv) {
                                              {0, 9},
                                              {-7, 7}}),
                        hull3));
-  assert(geo::contains(hull3, geo::Polygon<double>({{-9, 0},
+  TEST(geo::contains(hull3, geo::Polygon<double>({{-9, 0},
                                                     {-7, -7},
                                                     {0, -9},
                                                     {7, -7},
@@ -1573,46 +1674,46 @@ int main(int argc, char** argv) {
                                                     {0, 9},
                                                     {-7, 7}})));
 
-  assert(geo::area(geo::Point<double>(1, 2)) == approx(0));
-  assert(geo::area(geo::Line<double>{{1, 2}, {2, 5}}) == approx(0));
-  assert(geo::area(geo::Box<double>({0, 0}, {1, 1})) == approx(1));
-  assert(geo::area(geo::Box<double>({1, 1}, {1, 1})) == approx(0));
-  assert(geo::area(geo::Box<double>({0, 0}, {2, 2})) == approx(4));
-  assert(geo::area(geo::Polygon<double>({{0, 0}, {1, 0}, {1, 1}, {0, 1}})) ==
+  TEST(geo::area(geo::Point<double>(1, 2)), ==, approx(0));
+  TEST(geo::area(geo::Line<double>{{1, 2}, {2, 5}}), ==, approx(0));
+  TEST(geo::area(geo::Box<double>({0, 0}, {1, 1})), ==, approx(1));
+  TEST(geo::area(geo::Box<double>({1, 1}, {1, 1})), ==, approx(0));
+  TEST(geo::area(geo::Box<double>({0, 0}, {2, 2})), ==, approx(4));
+  TEST(geo::area(geo::Polygon<double>({{0, 0}, {1, 0}, {1, 1}, {0, 1}})) ==
          approx(1));
-  assert(geo::area(geo::Polygon<double>({{0, 0}, {1, 0}, {1, 1}})) ==
+  TEST(geo::area(geo::Polygon<double>({{0, 0}, {1, 0}, {1, 1}})) ==
          approx(0.5));
 
   auto obox =
       geo::getOrientedEnvelope(geo::Line<double>{{0, 0}, {1, 1}, {1.5, 0.5}});
-  assert(geo::contains(
+  TEST(geo::contains(
       geo::convexHull(obox),
       geo::Polygon<double>({{0.0, 0.0}, {1.0, 1.0}, {1.5, 0.5}, {0.5, -0.5}})));
-  assert(geo::contains(
+  TEST(geo::contains(
       geo::Polygon<double>({{0.0, 0.0}, {1.0, 1.0}, {1.5, 0.5}, {0.5, -0.5}}),
       geo::convexHull(obox)));
 
-  assert(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
                    geo::LineSegment<double>{{2, 2}, {2, 0}}) == approx(0));
-  assert(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
                    geo::LineSegment<double>{{2, 4}, {2, 2}}) == approx(1));
-  assert(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
                    geo::LineSegment<double>{{1, 1}, {3, 1}}) == approx(0));
-  assert(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
                    geo::LineSegment<double>{{1, 2}, {3, 2}}) == approx(1));
-  assert(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::LineSegment<double>{{1, 1}, {3, 1}},
                    geo::LineSegment<double>{{1, 2}, {3, 5}}) == approx(1));
 
-  assert(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
                    geo::Point<double>{2, 1}) == approx(0));
-  assert(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
                    geo::Point<double>{2, 2}) == approx(1));
-  assert(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
                    geo::Point<double>{3, 1}) == approx(0));
-  assert(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
+  TEST(geo::dist(geo::Line<double>{{1, 1}, {3, 1}},
                    geo::Point<double>{1, 1}) == approx(0));
 
-  assert(geo::dist(Line<double>{{7, 7},
+  TEST(geo::dist(Line<double>{{7, 7},
                                 {7, -7},
                                 {-7, -7},
                                 {-7, 7},
@@ -1628,7 +1729,7 @@ int main(int argc, char** argv) {
                                 {-9, 0},
                                 {0, 9},
                                 {0, -9}}) == approx(0));
-  assert(geo::dist(Line<double>{{7, 7},
+  TEST(geo::dist(Line<double>{{7, 7},
                                 {7, -7},
                                 {-7, -7},
                                 {-7, 7},
@@ -1637,7 +1738,7 @@ int main(int argc, char** argv) {
                                 {0, 9},
                                 {0, -9}},
                    LineSegment<double>{{6, 7}, {8, -7}}) == approx(0));
-  assert(geo::dist(Line<double>{{7, 7},
+  TEST(geo::dist(Line<double>{{7, 7},
                                 {7, -7},
                                 {-7, -7},
                                 {-7, 7},
@@ -1646,46 +1747,46 @@ int main(int argc, char** argv) {
                                 {0, 9},
                                 {0, -9}},
                    Point<double>{7, 4}) == approx(0));
-  assert(geo::dist(Line<double>{{0, 0}, {1, 1}, {2, 0}},
+  TEST(geo::dist(Line<double>{{0, 0}, {1, 1}, {2, 0}},
                    Line<double>{{1.5, 0.5}, {1.5, 100}}) == approx(0));
-  assert(geo::dist(Line<double>{{0, 0}, {1, 1}, {2, 0}},
+  TEST(geo::dist(Line<double>{{0, 0}, {1, 1}, {2, 0}},
                    Line<double>{{2, 0.5}, {2, 100}}) == approx(0.353553));
 
-  assert(geo::contains(util::geo::Point<double>{1.5, 0.5},
+  TEST(geo::contains(util::geo::Point<double>{1.5, 0.5},
                        util::geo::LineSegment<double>{{1, 1}, {1.5, 0.5}}));
-  assert(geo::contains(util::geo::Point<double>{1.5, 0.5},
+  TEST(geo::contains(util::geo::Point<double>{1.5, 0.5},
                        util::geo::LineSegment<double>{{1, 1}, {1.5, 0.5}}));
 
   auto polyTest =
       geo::Polygon<double>({{1, 1}, {3, 1}, {2, 2}, {3, 3}, {1, 3}});
-  assert(!geo::contains(util::geo::LineSegment<double>({2.5, 1.3}, {2.5, 2.6}),
+  TEST(!geo::contains(util::geo::LineSegment<double>({2.5, 1.3}, {2.5, 2.6}),
                         polyTest));
 
-  assert(!geo::contains(util::geo::LineSegment<double>{{2.5, 1.3}, {2.5, 2.6}},
+  TEST(!geo::contains(util::geo::LineSegment<double>{{2.5, 1.3}, {2.5, 2.6}},
                         polyTest));
-  assert(geo::contains(util::geo::LineSegment<double>{{2.5, 2.6}, {1.5, 2}},
+  TEST(geo::contains(util::geo::LineSegment<double>{{2.5, 2.6}, {1.5, 2}},
                        polyTest));
-  assert(!geo::contains(
+  TEST(!geo::contains(
       util::geo::Line<double>{{2.5, 1.3}, {2.5, 2.6}, {1.5, 2}}, polyTest));
-  assert(geo::contains(
+  TEST(geo::contains(
       util::geo::Line<double>{{2.5, 1.3}, {1.5, 2}, {2.5, 2.6}}, polyTest));
 
-  assert(!geo::contains(util::geo::Box<double>{{1, 1}, {2.5, 2.6}}, polyTest));
+  TEST(!geo::contains(util::geo::Box<double>{{1, 1}, {2.5, 2.6}}, polyTest));
 
-  assert(
+  TEST(
       geo::intersects(Box<double>(Point<double>(0, 0), Point<double>(10, 10)),
                       Box<double>(Point<double>(2, 2), Point<double>(8, 8))));
-  assert(
+  TEST(
       geo::intersects(Box<double>(Point<double>(0, 0), Point<double>(10, 10)),
                       Box<double>(Point<double>(-2, -2), Point<double>(8, 8))));
-  assert(geo::intersects(
+  TEST(geo::intersects(
       Box<double>(Point<double>(0, 0), Point<double>(10, 10)),
       Box<double>(Point<double>(-2, -2), Point<double>(12, 12))));
-  assert(
+  TEST(
       geo::intersects(Box<double>(Point<double>(0, 0), Point<double>(10, 10)),
                       Box<double>(Point<double>(5, 5), Point<double>(12, 12))));
 
-  assert(!geo::intersects(
+  TEST(!geo::intersects(
       Box<double>(Point<double>(0, 0), Point<double>(10, 10)),
       Box<double>(Point<double>(15, 15), Point<double>(12, 12))));
 
@@ -1704,6 +1805,57 @@ int main(int argc, char** argv) {
 
   auto h = util::geo::convexHull(mp);
 
-  assert(geo::contains(mp, h));
+  TEST(geo::contains(mp, h));
+
+  TEST(geo::dist(geo::interpolate(DPoint(1.0, 1.0), DPoint(1.0, 3.0), 0.5), DPoint(1.0, 2.0)), ==, approx(0));
+  TEST(geo::dist(geo::interpolate(DPoint(1.0, 1.0), DPoint(2.0, 2.0), 0), DPoint(1.0, 1.0)), ==, approx(0));
+  TEST(geo::dist(geo::interpolate(DPoint(1.0, 1.0), DPoint(2.0, 2.0), 0.5), DPoint(1.5, 1.5)), ==, approx(0));
+  TEST(geo::dist(geo::interpolate(DPoint(1.0, 1.0), DPoint(2.0, 2.0), 1), DPoint(2, 2)), ==, approx(0));
+  TEST(geo::dist(geo::pointAtDist(DLine{{0, 0}, {0, 1}, {0, 2}}, 1), DPoint{0, 1}), ==, approx(0));
+  TEST(geo::dist(geo::pointAtDist(DLine{{0, 0}, {0, 1}, {0, 2}}, 2), DPoint{0, 2}), ==, approx(0));
+  TEST(geo::dist(geo::pointAtDist(DLine{{0, 0}, {0, 1}, {0, 2}}, 0), DPoint{0, 0}), ==, approx(0));
+
+  TEST(geo::getWKT(geo::orthoLineAtDist(DLine{{0, 0}, {0, 1}, {0, 2}}, 1, 1)), ==, "LINESTRING (-0.5 1, 0.5 1)");
+
+  TEST(geo::getWKT(geo::segment(DLine{{0, 0}, {0, 1}, {0, 2}}, 0, 0.5)), ==, "LINESTRING (0 0, 0 1)");
+  TEST(geo::getWKT(geo::segment(DLine{{0, 0}, {0, 1}, {0, 2}}, 0.5, 1)), ==, "LINESTRING (0 1, 0 2)");
 }
+
+
+  // inversion count
+  std::vector<int> test = {2, 1};
+  TEST(inversions(test), ==, 1);
+
+  test = {};
+  TEST(inversions(test), ==, 0);
+
+  test = {2};
+  TEST(inversions(test), ==, 0);
+
+  test = {2, 1};
+  TEST(inversions(test), ==, 1);
+
+  test = {1, 2};
+  TEST(inversions(test), ==, 0);
+
+  test = {2, 1, 3};
+  TEST(inversions(test), ==, 1);
+
+  test = {2, 3, 1};
+  TEST(inversions(test), ==, 2);
+
+  test = {3, 2, 1};
+  TEST(inversions(test), ==, 3);
+
+  test = {1, 2, 3};
+  TEST(inversions(test), ==, 0);
+
+  test = {1, 3, 2, 6, 5, 4, 8, 7, 9};
+  TEST(inversions(test), ==, 5);
+
+  test = {1, 2, 3, 4, 5, 6};
+  TEST(inversions(test), ==, 0);
+
+  test = {9, 8, 7, 6, 5, 4, 3, 2, 1};
+  TEST(inversions(test), ==, 8 + 7 + 6 + 5 + 4 + 3 + 2 + 1);
 }
diff --git a/src/xml b/src/xml
index 23cc358..ee92108 160000
--- a/src/xml
+++ b/src/xml
@@ -1 +1 @@
-Subproject commit 23cc358256df7f567cb249736e216c01b65aaf6f
+Subproject commit ee9210828b1d1f81fb9ff9f3b7da87327c3390e6