Commit Graph

339 Commits

Author SHA1 Message Date
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
Dustin Carlino
77768588a7 Import Neukölln #777. and attempt a [rebuild] [release] 2021-10-12 15:03:52 -07:00
Dustin Carlino
be9ba5a80e Clean up the absurd number of Seattle maps. Ideally we'd have some way
to further organize them by purpose, but for the moment, two problems:

1) the city picker UI is getting way too crowded
2) on native, the initial download is up to 145MB

Removing:

- the 3 Aurora maps and Green Lake, added for the ARC workshop, but no
  longer the most active of collaborations
- Ballard is now subsumed by central Seattle -- the only advantage would
  be keeping its full scenario of walking and transit trips, but the
  simulation is horribly gridlocked there anyway
- the Rainier Valley map, originally meant for an SNG traffic light
  timing study
- the larger udistrict map
2021-10-11 14:37:59 -07:00
Dustin Carlino
755e723251 Get some different boundaries set up in Seattle, to support the bike
network tool reasonably on the web. #743, #746

I'm declaring the budget to be 20MB gzipped map files.

- north and south seattle boundaries extended a bit
- central seattle added
- stripping out unused pathfinding data for walking and transit to
  squeeze down the size. avoiding crashes for empty pathfinding -- if
  you try to simulate a minified map, most trips will just fail
2021-10-11 14:06:49 -07:00
Dustin Carlino
0fc1af0dd9 Import Geneva for Sven's project 2021-10-05 09:33:33 -07:00
Dustin Carlino
ab312a2528 Import St Albans for use with the LTN tool 2021-10-02 10:39:27 -07:00
Dustin Carlino
2288b0d42a Add a smaller study area in Tehran.
- Procedurally generate houses there, so the automatic travel demand
  model doesn't produce totally silly patterns.
- Disable parking
- Allow vehicles to enter the intersection even when it looks like they
  might get stuck; this lets the default scenario complete without
  gridlock.
- Prebake the scenario, so a researcher can make edits and use all of
  the A/B testing data viz.

The home-to-work scenario produces laughably bogus patterns... everyone
working at Bank Sepah.
2021-09-30 14:51:56 -07:00
Dustin Carlino
a5ed6e79fb Import some new places:
- part of Sao Paulo where some new bus lanes are going in
- Tucson, for #760
- 3 parts of Bonn in Germany
2021-09-23 10:32:09 -07:00
Dustin Carlino
db5ceb1b40 Upload Zurich data from #759 [rebuild] [release] 2021-09-19 10:05:11 -07:00
Lorenz Schmid
f27d14a285 Add Zurich (CH) city 2021-09-19 10:01:32 -07:00
Dustin Carlino
642c87a845 Fix up references to the CLI tools in shell scripts and code. #745
[rebuild]
2021-09-17 18:29:23 -07:00
Dustin Carlino
c28dba4b47 Make the importer itself a library, called from the CLI tool. #745 2021-09-17 18:29:23 -07:00
Dustin Carlino
3fba6111de Add a few more tools to the CLI, introducing tokio and making
one_step_import call library functions directly now. #745
2021-09-17 18:29:23 -07:00
Dustin Carlino
194088ac16 The CLI consumes even more. #745
Remove the ability for the building procgen tool to generate a map from
OSM. If we still need that, can just do two steps. It complicates the
flags.
2021-09-17 18:29:23 -07:00
Dustin Carlino
7c41134ca8 Folding more tools into the CLI tool. #745 2021-09-17 18:29:23 -07:00
Dustin Carlino
11aeb9e2a4 Start a consolidated CLI tool with a few one of the importer crate's tools. #745 2021-09-17 18:29:23 -07:00
Dustin Carlino
59bccacdea Automate the process of importing external scenario JSON files for built-in maps. Right now this is just actdev sites. I've been doing this manually when I remember to.
And remove some background scenarios for actdev sites; I don't know how
those crept in.
2021-09-13 14:01:56 -07:00
Dustin Carlino
b7d010058c Store Movements per Intersection, instead of constantly calculating them! #746
Regenerating everything...
2021-09-06 14:53:37 -07:00
Dustin Carlino
6dcf417cd0 Fix some clippy warnings, and now regenerate everything...
Green Lake sim crashes, not investigating.

[rebuild] [release]
2021-09-05 19:53:10 -07:00
Dustin Carlino
442523ae6c Simplify some lane lookups that just needed to find the parent 2021-09-05 19:53:10 -07:00
Dustin Carlino
4c46510342 Cleaning up a few APIs, now that lanes belong to roads... 2021-09-05 19:53:10 -07:00
Dustin Carlino
0f4a31e915 Moving lanes from a BTreeMap to be stored inlined in their parent Roads. #746
Somewhat invasive API change internal to map_model, but not much impact
elsewhere.

Not regenerating anything yet.
2021-09-05 19:53:10 -07:00
Dustin Carlino
f83168184d Start a tool to compress Map files by removing information unnecessary to the bike network tool. #746
Just a modest start, switching from CHs to Dijkstra's for pathfinding. Not uploading the minified result yet.
2021-09-01 19:02:42 -07:00
Dustin Carlino
b6e5c4e256 Followup to #742: Adjust name boundary0->center, fill out nice_map_name, upload map data for Lyon. 2021-08-29 08:21:02 -07:00
Grégoire Lodi
d30d9915ca Adds fr/lyon 2021-08-29 08:12:47 -07:00
Dustin Carlino
2042ee89a9 For the Aurora maps, generate a second scenario from Soundcast data just containing the pass-through trips, which're skipped in the regular scenario.
Now we can watch I5 off-ramps explode!
2021-08-26 11:17:28 -07:00
Dustin Carlino
b397f97a12 Splitting Aurora study area into 3 maps, actually 2021-08-23 19:38:36 -07:00
Dustin Carlino
71b54b3ed7 Create two study areas for the Aurora project. Can fine-tune or split
boundaries later, but this roughly captures the interesting bits.
2021-08-20 16:31:08 -07:00
Dustin Carlino
14927feeae Import part of SF 2021-08-06 10:54:46 -07:00
Dustin Carlino
c98b4f293e Regenerate all maps after last few changes. Split out the actdev scripts to more easily regenerate actdev scenarios. This is necessary if map intersection IDs change, for instance.
Rainier Valley starts crashing in the simulation! Not sure why the
regression happened, disabling for now, will look into it later.
2021-07-29 14:19:46 -07:00
Dustin Carlino
ffcf0a8d66 Fix a bug in transit snapping introduced by 163244ace9. Regenerating all maps, also bringing in a Tempe OSM fix...
The deadend trimming is too enthusiastic, getting rid of some unsnapped
cycleways and things connecting to the map border. Will iterate on it
this week; net benefit for now.
2021-07-27 16:56:11 -07:00
Dustin Carlino
7399f2aff2 Prettyprint durations with one decimal place, not two. Loading screens are a little too intense otherwise. This was changed in #699 because the variable name was wrong. 2021-07-25 10:53:57 -07:00
Dustin Carlino
0e472fcfcb For the Overpass import, include ways that're only partly intersecting the polygon. Without this, the map has no borders. #523, #717
I don't pretend to understand the Overpass query language, but I tried https://wiki.openstreetmap.org/wiki/Overpass_API/Advanced_examples#Completed_ways.2C_but_not_relations and it seems to work!
2021-07-25 10:42:57 -07:00
Dustin Carlino
f35538b460 Grab everything from Overpass, so importing from it looks more complete. #523
Because it's so much faster, make it the default!
2021-07-12 14:21:33 -07:00
Dustin Carlino
66be29d752 Import a new city using Overpass, instead of Geofabrik + clipping. #523
The returned XML seems to be missing lots of stuff, but it's much faster
and wasn't hard to wire up. I'll look into fixing the query...
2021-07-12 14:06:54 -07:00
Dustin Carlino
dd24f3ab89 Make the parallel map importer more useful by skipping places where it doesn't properly work 2021-07-10 17:14:10 -07:00
Dustin Carlino
1539091453 Import Loop 101, adding an option to skip local roads to cut down map
size.
2021-07-08 10:25:36 -07:00
Dustin Carlino
4aa971e34e Add a new importer mode to do Raw->Map in parallel. Occasionally useful
now that my faster machine works again.

Running importer jobs in parallel is actually super hard, because
there's async stuff thrown in there now to download files.
2021-07-06 16:21:42 -07:00
Dustin Carlino
d1a7ae4418 Start importing a piece of Sao Paulo for a collaboration.
No elevation data until the next big round of regeneration; having
trouble getting Docker set up on my resurrected machine.
2021-07-06 10:57:53 -07:00
Trevor Nederlof
3faf9893a9 Add downtown brooklyn as a nyc map 2021-07-01 12:27:58 -07:00
Dustin Carlino
137e9a0c2c Fix up some places affected by the f64 serialization:
- offstreet_parking_length in importer config
- backwards compatibility for map edits
- fixing up the baked-in proposals
- working around a few PolyLine bugs that happen with the new rounding
- Don't regenerate actdev scenarios yet -- the upstream JSON format is
  out of date, will have to fix separately.
2021-06-30 06:35:42 -07:00
Dustin Carlino
8546eb4b5f Make the timer hierarchy for --regen_all or any city with many maps more easy to understand 2021-06-25 15:29:28 -07:00
Dustin Carlino
5161474955 Stop building huge_seattle twice in the importer workflow
I have some fuzzy vision of declaring all importer pieces as a dependency graph, with optional caching of some input, that would express this kind of thing better. But... in the meantime.

Now regenerating everything...
2021-06-25 12:18:04 -07:00
Dustin Carlino
c0ce76a92a Two slight adjustments to speed up the map importer development
workflow.
2021-06-24 12:13:47 -07:00