use bus=designated

eval/Makefile

@@ -15,12 +15,12 @@ clean:
 osmconvert:
 	wget -O - 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 eval-wo-osm.cfg
+%.lighteval: osm/%.osm gtfs/%/stops.txt gtfs/%/stop_times.txt gtfs/%/trips.txt gtfs/%/routes.txt eval.cfg
 	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.cfg
+%.eval: osm/%.osm gtfs/%/stops.txt gtfs/%/stop_times.txt gtfs/%/trips.txt gtfs/%/routes.txt eval.cfg eval-wo-osm-line-rels.cfg
 	mkdir -p gtfs/$*/shaped
 	rm -f gtfs/$*/shaped/*
 	mkdir -p evalout/
@@ -38,7 +38,7 @@ osmconvert:
 	find evalout/$*/greedy2/ -name "*.json" -print0 | xargs -0 rm
 
 	mkdir -p evalout/$*/hmm
-	../build/pfaedle -x $< -i gtfs/$* -c eval-wo-osm.cfg --eval-path evalout/$*/hmm -o gtfs/$*/shaped -D -m all --eval --eval-df-bins $(EVAL_DF_BINS) 2>&1 | tee $@
+	../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:

eval/eval-wo-osm-line-rels.cfg

@@ -292,6 +292,9 @@ osm_filter_keep:
 	route=bus
 	route=trolleybus
 	bus=yes
+	bus=designated
+	minibus=designated
+	minibus=yes
 
 	public_transport=stop_position
 	bus_stop=*
@@ -308,6 +311,10 @@ osm_filter_lvl1:
 	highway=secondary
 	highway=secondary_link
 	bus=yes
+	bus=designated
+	minibus=yes
+	minibus=designated
+	psv=designated
 	psv=yes
 	access=psv
 	access=bus
@@ -330,8 +337,10 @@ osm_filter_lvl4:
 	highway=living_street
 	highway=pedestrian
 	highway=service
+	psv=no
 
 osm_filter_lvl5:
+	bus=no
 	service=siding
 	access=permissive
 	access=private
@@ -458,7 +467,6 @@ osm_filter_station:
 # 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
@@ -615,7 +623,6 @@ osm_filter_station:
 # 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
@@ -713,7 +720,6 @@ osm_filter_station:
 # 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

eval/eval.cfg

@@ -295,6 +295,9 @@ osm_filter_keep:
 	route=bus
 	route=trolleybus
 	bus=yes
+	bus=designated
+	minibus=designated
+	minibus=yes
 
 	public_transport=stop_position
 	bus_stop=*
@@ -311,6 +314,10 @@ osm_filter_lvl1:
 	highway=secondary
 	highway=secondary_link
 	bus=yes
+	bus=designated
+	minibus=yes
+	minibus=designated
+	psv=designated
 	psv=yes
 	access=psv
 	access=bus
@@ -333,8 +340,10 @@ osm_filter_lvl4:
 	highway=living_street
 	highway=pedestrian
 	highway=service
+	psv=no
 
 osm_filter_lvl5:
+	bus=no
 	service=siding
 	access=permissive
 	access=private

pfaedle.cfg

@@ -295,6 +295,9 @@ osm_filter_keep:
 	route=bus
 	route=trolleybus
 	bus=yes
+	bus=designated
+	minibus=designated
+	minibus=yes
 
 	public_transport=stop_position
 	bus_stop=*
@@ -311,6 +314,10 @@ osm_filter_lvl1:
 	highway=secondary
 	highway=secondary_link
 	bus=yes
+	bus=designated
+	minibus=yes
+	minibus=designated
+	psv=designated
 	psv=yes
 	access=psv
 	access=bus

src/pfaedle/PfaedleMain.cpp

@@ -128,7 +128,7 @@ int main(int argc, char** argv) {
     ShapeBuilder shapeBuilder(&gtfs, cmdCfgMots, motCfg, &ecoll, cfg);
 
     if (cfg.writeGraph) {
-      LOG(INFO) << "Outputting graph" + filePost + ".json...";
+      LOG(INFO) << "Outputting graph.json...";
       util::geo::output::GeoGraphJsonOutput out;
       std::ofstream fstr(cfg.dbgOutputPath + "/graph.json");
       out.print(*shapeBuilder.getGraph(), fstr);