diff --git a/README.md b/README.md index c0e6dec..f54b1ec 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ This is an experimental rewrite of <15m.abstreet.org>. Stay tuned. To build and run the web app locally, `cd web; npm run wasm; npm run dev`. You need to re-run `npm run wasm` when the Rust code in `backend` changes. -The GTFS data used is built from the [UK BODS](https://data.bus-data.dft.gov.uk/). After downloading and unzipping, you can build using `cd backend; cargo run --release gmd /path/to/gtfs`. The file is encoded using [geomedea](https://github.com/michaelkirk/geomedea). +The GTFS data used is built from the [UK BODS](https://data.bus-data.dft.gov.uk/). After downloading and unzipping, you can build using `cd cli; cargo run --release build-gtfs /path/to/gtfs`. The file is encoded using [geomedea](https://github.com/michaelkirk/geomedea). diff --git a/graph/src/scrape.rs b/graph/src/scrape.rs index 6fea89d..171e697 100644 --- a/graph/src/scrape.rs +++ b/graph/src/scrape.rs @@ -110,6 +110,7 @@ impl Graph { GtfsSource::None => GtfsModel::empty(), }; snap_stops(&mut self.roads, &mut gtfs, &self.router[Mode::Foot], timer); + self.gtfs = gtfs; timer.pop(); Ok(()) } @@ -207,7 +208,10 @@ fn snap_stops( return; } - timer.step("find closest roads per stop"); + timer.step(format!( + "find closest roads per stop ({})", + gtfs.stops.len() + )); // TODO Make an iterator method that returns the IDs too for (idx, stop) in gtfs.stops.iter_mut().enumerate() { let stop_id = crate::gtfs::StopID(idx);