gtfs-actions/generate-shapes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use bus=designated

Browse source
This commit is contained in:
Patrick Brosi 2018-08-09 20:55:23 +02:00
parent 18c00718f6
commit 967963e180
5 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eval/Makefile
View file

@ -15,12 +15,12 @@ clean:
osmconvert: osmconvert:
wget -O - http://m.m.i24.cc/osmconvert.c | cc -x c - -lz -O3 -o 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 mkdir -p gtfs/$*/shaped
rm -f gtfs/$*/shaped/* rm -f gtfs/$*/shaped/*
../build/pfaedle -x $< -i gtfs/$* -c eval.cfg -o gtfs/$*/shaped -D -m all 2>&1 | tee $@ ../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 mkdir -p gtfs/$*/shaped
rm -f gtfs/$*/shaped/* rm -f gtfs/$*/shaped/*
mkdir -p evalout/ mkdir -p evalout/
@ -38,7 +38,7 @@ osmconvert:
find evalout/$*/greedy2/ -name "*.json" -print0 | xargs -0 rm find evalout/$*/greedy2/ -name "*.json" -print0 | xargs -0 rm
mkdir -p evalout/$*/hmm 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 find evalout/$*/hmm/ -name "*.json" -print0 | xargs -0 rm
osm/spain-latest.osm.pbf: osm/spain-latest.osm.pbf:

12
eval/eval-wo-osm.cfg → eval/eval-wo-osm-line-rels.cfg
View file

@ -292,6 +292,9 @@ osm_filter_keep:
route=bus route=bus
route=trolleybus route=trolleybus
bus=yes bus=yes
bus=designated
minibus=designated
minibus=yes
public_transport=stop_position public_transport=stop_position
bus_stop=* bus_stop=*
@ -308,6 +311,10 @@ osm_filter_lvl1:
highway=secondary highway=secondary
highway=secondary_link highway=secondary_link
bus=yes bus=yes
bus=designated
minibus=yes
minibus=designated
psv=designated
psv=yes psv=yes
access=psv access=psv
access=bus access=bus
@ -330,8 +337,10 @@ osm_filter_lvl4:
highway=living_street highway=living_street
highway=pedestrian highway=pedestrian
highway=service highway=service
psv=no
osm_filter_lvl5: osm_filter_lvl5:
bus=no
service=siding service=siding
access=permissive access=permissive
access=private access=private
@ -458,7 +467,6 @@ osm_filter_station:
# taken. # taken.
osm_line_relation_tags: osm_line_relation_tags:
# attr name together with the # attr name together with the
# max distance in meters between any of the groups members and # max distance in meters between any of the groups members and
# a potential new member # a potential new member
@ -615,7 +623,6 @@ osm_filter_station:
# taken. # taken.
osm_line_relation_tags: osm_line_relation_tags:
# attr name together with the # attr name together with the
# max distance in meters between any of the groups members and # max distance in meters between any of the groups members and
# a potential new member # a potential new member
@ -713,7 +720,6 @@ osm_filter_station:
# taken. # taken.
osm_line_relation_tags: osm_line_relation_tags:
# attr name together with the # attr name together with the
# max distance in meters between any of the groups members and # max distance in meters between any of the groups members and
# a potential new member # a potential new member

9
eval/eval.cfg
View file

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

7
pfaedle.cfg
View file

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

2
src/pfaedle/PfaedleMain.cpp
View file

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