Commit Graph

382 Commits

Author SHA1 Message Date
Dustin Carlino
f3381d3807 Import Oxford and Keelung. The former has LTN blockfinding issues, and
the latter doesn't detect the ocean -- will iterate on both issues
later.
2022-03-22 14:30:18 +00:00
Dustin Carlino
a266d91632 Import a large slice of central London, minus buildings, for an LTN demo. 2022-03-12 22:21:48 +00:00
Dustin Carlino
606a59cec5 Import Pune 2022-03-10 08:29:40 +00:00
Dustin Carlino
a99aec2dc4 Unbrick the UK scenario import 2022-03-08 17:11:34 +00:00
Dustin Carlino
4ea201575d Import Nottingham 2022-03-05 17:33:58 +00:00
Dustin Carlino
d141a2a810 Upgrade all geo dependencies! No behavioral difference 2022-02-22 16:45:49 +00:00
Dustin Carlino
cf27e48202 Import a scenario for São Miguel Paulista #861 2022-02-21 21:10:50 +00:00
Dustin Carlino
e17c875954 Import Derby (and cheat to squeeze it into the 0.3.12 release that just happened) 2022-02-20 22:04:54 +00:00
Dustin Carlino
54634e564a Import São Miguel Paulista 2022-02-18 16:19:09 +00:00
Dustin Carlino
49f3ad6a8d Remove some old London study areas, now that most boroughs are imported instead. #794, #577 2022-02-17 10:10:41 +00:00
Dustin Carlino
205c17a2f0 Remove the command to do Raw->Map conversion in parallel, now that I've got pueue working. That command has major caveats with a few cities anyway. #326 2022-02-10 16:12:03 +00:00
Dustin Carlino
741040840a Use pueue to import cities in parallel as separate processes. #326
We need to name elevation directories differently to avoid conflicts
2022-02-10 16:02:43 +00:00
Dustin Carlino
9054666a0b Use RDP simplification to road center-lines when we glue them together after collapsing degenerate intersections. This is a followup to #833.
And clean up some other things that RDP does better.

Fallout from regenerating everything:

- Enfield borough crashed, so removed it
- All UK scenarios are now much bigger, due to the changes in #853 being
  picked up
- Poundbury gridlocks now due to that
2022-02-10 14:40:11 +00:00
Dustin Carlino
2cca84c19b Import most London boroughs. #794
I used the simplified boundaries from
https://skgrange.github.io/data.html. 4 boroughs failed early in
conversion, need to investigate separately. Plenty of weird clipping
issues with the Thames.
2022-02-09 22:12:16 +00:00
Dustin Carlino
d5f7756d5f Import another part of Melbourne 2022-02-09 16:39:05 +00:00
Dustin Carlino
7fdfdd5e10 Import Melbourne 2022-02-08 09:45:03 +00:00
Dustin Carlino
b62954ef30 Add procgen houses for Levenshulme, since parts of the map are just missing buildings.
Regenerate the scenario in S3 now. Comparison with traffic counts barely
changed, so this didn't make much of a difference, but it can't hurt.
2022-02-03 14:40:57 +00:00
Dustin Carlino
f22590ae0c Refactor MapBorders, used to snap trips starting/ending off-map to a
border. Try weighting by road classification. #848

No behavioral change for anything except UK scenarios. Still not
regenerating those.
2022-02-03 14:20:03 +00:00
Dustin Carlino
b93850406f Revive efforts on the generic desire line -> scenario pipeline. Include desire lines for zones that don't intersect the map boundary at all, with very simple border intersection snapping.
Note this changes all UK scenarios, but I'm not going to regenerate any
of them and put in S3 until I'm getting decent results at least in
Manchester.
2022-02-02 16:28:49 +00:00
Dustin Carlino
b9872f6a46 Quickly compare Levenshulme sensor data to generated scenarios, from the console (I guess the UI isn't as useful as I expected yet) 2022-02-02 14:55:53 +00:00
Dustin Carlino
0058f99da2 Mechanical rename of TripEndpoint::Bldg to ::Building, mostly to kick off a [rebuild] [release] 2022-01-30 18:27:36 +00:00
Dustin Carlino
f171ddcb73 Get everything to build again... 2022-01-28 13:13:43 +00:00
Dustin Carlino
e318f2733b Import Wokingham 2022-01-26 12:09:37 +00:00
Dustin Carlino
deffc35fd7 Optionally generate a scenario for one-shot imported UK maps. #842 2022-01-26 10:31:38 +00:00
Dustin Carlino
61d7a03cbd Import Levenshulme for traffic sensor study 2022-01-25 12:32:37 +00:00
Dustin Carlino
518d8fe22e Import Newcastle 2022-01-18 10:00:49 +00:00
Dustin Carlino
bd340a1970 Switch from std::fs to fs_err. When files aren't found, the error message actually includes the path! 2022-01-17 17:30:51 +00:00
Dustin Carlino
8e26fd2fb5 Import Hackney 2022-01-11 15:52:47 +00:00
Dustin Carlino
e863517f13 Adjust Bristol boundary 2022-01-04 11:00:11 +00:00
Dustin Carlino
b08a259059 Import part of east Bristol for LTN work 2022-01-04 10:22:56 +00:00
Dustin Carlino
77ca4141b1 Start importing Fordham regularly 2021-12-20 23:11:36 +00:00
Marcel Dejean
65f086ecb3 PathStep::ContraflowTurn to allow walking turns both ways
* Also implement ContraflowMovement for pathfinder v2
* Change uses of Turn to Turn | ContraflowTurn
* Reverse contraflowturn geometry when tracing pathstep
* Don't start or end a path in a ContraflowTurn either
2021-12-20 23:11:36 +00:00
Dustin Carlino
9ecbdfa47f Shrink the Bradford study area, to load faster on the web. [rebuild] [release] 2021-12-19 12:35:46 +00:00
Dustin Carlino
ec9ed9c64c Import a small slice of Kennington with a very representative set of London-specific map model issues. Add it to the screenshot tests, replacing Great Kneighton as the GB test. And trim out lakeslice from the test; we don't need quite so much redundancy for Seattle. 2021-12-09 14:31:20 +00:00
Dustin Carlino
b45bf869b7 Populating the map_model transit representation from the raw GTFS data. #372 2021-12-07 03:10:38 -08:00
Dustin Carlino
8318bbf5d2 Fix clippy warnings. [rebuild] [release] 2021-12-05 12:29:35 +00:00
Dustin Carlino
534154b0a4 Import more LTN requested places: Bradford and Kingston-upon-Thames 2021-12-04 11:33:31 +00:00
Dustin Carlino
e655e4e1da Import Southwark (full borough and a smaller north bit) and Lisbon. #794, #809 2021-12-03 06:16:21 +00:00
Dustin Carlino
54ff9bf566 Update to rust 1.57.
Fix unused warnings in Soundcast importing code
2021-12-03 05:45:56 +00:00
Dustin Carlino
258ed1c156 Download GTFS for Seattle and SF. #372
Not uploading the downloaded files yet, on a weird connection.
2021-11-19 10:38:01 -08:00
Dustin Carlino
c13ca2d20b
Rip out all old broken code for importing OSM bus stops and routes. #372 (#808)
This code stopped working around July 2020 when I attempted to tackle #190. It's sat dormant since then, with most bus and light rail routes not imported correctly at all. I'm going to (eventually) start another attempt at public transit in A/B Street by treating GTFS as the main source of truth, not trying to understand route relations mapped in OSM. It's simplest to just rip out all this old code first. Some of it may be useful later, but version control preserves it.

Regenerating everything; this is a binary format change.
2021-11-17 18:51:59 -08:00
Dustin Carlino
68d9616875
Use simple Rust code to specify map importing config, instead of conf… (#807) 2021-11-17 15:52:09 -08:00
Marcel Dejean
641c908051
No right on red (#806)
* add turn_on_red config option which is false for nyc

* when making stages, don't add movements that don't share a stage with a protected movement

* Fix a renamed DirectedRoadID field from
cb3693bd7a and the new turn_on_red field
in the test crate

* Update all map config files with the new option

for x in importer/config/*/*/cfg.json; do
	cat $x | jq '.map_config += {turn_on_red: true}' > tmp
	mv -f tmp $x
done

(And then undoing NYC)

* turn on red banned on all non-us maps

* regenerate all maps

Co-authored-by: Marcel Dejean <marcel@dejean.nyc>
Co-authored-by: Dustin Carlino <dabreegster@gmail.com>
2021-11-16 23:06:11 -08:00
Dustin Carlino
3a1e5a66cb Start modeling unmarked pedestrian crossings. #795
- Use the new filter_crosswalks option to downgrade zebra crossings into
  unmarked
- Add a routing penalty
- Render differently than zebras
- They otherwise act the same as marked crosswalks

Simulation behavior (like pedestrians not having priority over vehicles)
not yet implemented. No change to any existing maps, since
filter_crosswalks isn't enabled anywhere.
2021-11-12 13:38:33 -08:00
Dustin Carlino
164439c4d9 Allow filtering crosswalks from GUI map import. #795 2021-11-11 09:26:27 -08:00
Dustin Carlino
fd10ea74dc Add configuration to filter the auto-generaed crosswalks to only exist
near OSM highway=crossing nodes. #795

Not enabled anywhere, because it doesn't seem to produce good results.
Possibly footway=crossing ways need to be used for this as well.

Had to regenerate all maps, since the binary format changes.
2021-11-08 20:08:49 -08:00
Dustin Carlino
bb15d3a368 Convert updater to structopt. #745 2021-11-01 12:46:57 -07:00
Dustin Carlino
04b54b08cd Import Camden. #794 2021-10-31 13:28:45 -07:00
Dustin Carlino
007cf0b28d Split the importer into individual commands with structopt. #745 2021-10-25 13:02:00 -07:00
Dustin Carlino
9f86365cf6 Upgrade to rust 1.56 and cutover to rust edition 2021 2021-10-21 09:38:06 -07:00