Commit Graph

926 Commits

Author SHA1 Message Date
Dustin Carlino
09c77ee705 creating a new map to study lake wash blvd. for now, disabling all
mapfixes.
2020-04-20 15:11:04 -07:00
Dustin Carlino
d80513235d defer choosing a starting lane for borders in scenarios, to respond to lane edits 2020-04-19 10:51:23 -07:00
Dustin Carlino
6d9695fb59 fix a bug where a crosswalk and road turn group incorrectly conflicted.
was causing a crash trying to edit traffic signals downtown
2020-04-18 19:42:48 -07:00
Dustin Carlino
c2ecd1e06d sort ascending or descending, to look at improved trips too. and fix a
bug counting lanes in a modified path
2020-04-09 14:43:09 -07:00
Dustin Carlino
f986dd8683 switch back to upstream fast_graphs, using the new 32-bit wasm-friendly
serialization. no measured performance impact. file sizes shrink!
2020-04-05 09:41:51 -07:00
Dustin Carlino
88bad05d39 clean up agent properties. lots of tweaks needed, but i'm exhausted 2020-04-02 21:36:19 -07:00
Dustin Carlino
2181d8a56d two sanity refactors
- btreeset macro
- switch to "ID #123" by default
2020-03-31 16:40:07 -07:00
Dustin Carlino
b3028fd69c adjust edit overlay color, and add an explicit reset button to edits 2020-03-21 10:12:13 -07:00
Dustin Carlino
718c6a346a more arrows for one-ways. forces some changes to edit tracking -- more
computation, less code.
2020-03-21 09:56:43 -07:00
Dustin Carlino
0bcbac1fee upgrade a few misc packages 2020-03-17 10:35:37 -07:00
Dustin Carlino
e47d5f7917 fix parking markings and where pedestrians walk for left-hand maps for #27 2020-03-17 10:09:44 -07:00
Dustin Carlino
be9671a51f more fixes for left-hand maps (#27):
- avoid a crash by deduping intersection polygon points
- make shared sidewalk corners saner by flipping order of points
- improve crosswalk determination
2020-03-16 18:27:33 -07:00
Dustin Carlino
812c7fa640 start support driving on the left, more carefully tracking all the dependencies. part of #27. lots of bugs left, but it doesn't break anything for driving on the right. 2020-03-16 17:40:12 -07:00
Dustin Carlino
1cce49648b some fixes to get Perth to import, part of #27
- filter out indoor corridors
- plumb through a flag for driving on the right/left. don't use it yet.
2020-03-16 15:20:35 -07:00
Dustin Carlino
4accd788f2 new overlay showing elevation changes. data is bad, but the overlay is decent. 2020-03-15 12:42:30 -07:00
Dustin Carlino
4634ae094b temporarily treat u-turn restrictions as left turns, for #27 2020-03-13 10:50:11 -07:00
Dustin Carlino
6e8846bf85 bring back elevation data before the hackathon. manual revert of 35b7c18df9 2020-03-11 11:08:49 -07:00
Dustin Carlino
377fed6ce0 cutover to the separate traffic signals repo 2020-03-10 17:08:19 -07:00
Dustin Carlino
2939dadf23 cut out the metadata and walk button mapping for now, in favor of freeform notes. 2020-03-10 16:41:37 -07:00
Dustin Carlino
c1b9684929 editing for walk buttons. doing it the straightforwardish way requires a
dependency on abstutil for Cloneable! time to try something much nicer
2020-03-05 12:51:04 -08:00
Dustin Carlino
39ff3b1310 representing beg buttons, but no data entry yet. 2020-03-04 16:38:01 -08:00
Dustin Carlino
1ad434f3d6 record some metadata about the traffic signals. bad UI for now. 2020-03-04 14:40:32 -08:00
Dustin Carlino
68cd66b1c7 import signal data and use by default 2020-03-04 13:44:40 -08:00
Dustin Carlino
d44303de5c starting a new crate with a JSON schema for traffic signals. exporting
to it.
2020-03-04 11:59:41 -08:00
Dustin Carlino
0f5ab2f410 change turn group representation to prepare for cross-map edits 2020-03-03 17:20:56 -08:00
Dustin Carlino
543d815677 use 2-phase traffic signals by default, not 4. avoids some gridlock. now
23rd actually completes just fine!
2020-02-26 14:02:21 -08:00
Dustin Carlino
34b1f342a2 fix map deserialization in wasm. 64-bit usizes in fast_paths was the problem. 2020-02-25 14:49:56 -08:00
Dustin Carlino
044eef2b43 fix traffic signal editing, broken by the EditCmd refactor 2020-02-19 09:55:50 -08:00
Dustin Carlino
8434369d94 simplify representation of intersection edits, to allow proper undoing 2020-02-18 10:45:50 -08:00
Dustin Carlino
93c159b844 convert between stop signs and traffic signals. fixes #16 2020-02-18 09:54:14 -08:00
Dustin Carlino
3555e58369 new map! tried to grab fresh OSM, but some of the old fixes broke it, so
will find a workaround tomorrow
2020-02-17 21:54:50 -08:00
Dustin Carlino
bd51208684 name intersections in info panels better, and avoid horizontal scrolling
in most?? cases
2020-02-17 17:07:25 -08:00
Dustin Carlino
691dcdfbbc also revamp panels for other objects, except for the trip details part 2020-02-12 12:22:43 -08:00
Dustin Carlino
ba089572e5 better error if a map is missing, to help with #43 2020-02-07 15:12:37 -08:00
Dustin Carlino
a3149d2219 no_edits -> untitled edits 2020-02-06 13:15:09 -08:00
Dustin Carlino
872cd0cba6 'save as' feature for map edits. autosave otherwise. 2020-02-06 12:31:06 -08:00
Dustin Carlino
0890a37ee1 carve out a section for showing off curated proposals [rebuild] 2020-02-03 18:01:49 -08:00
Dustin Carlino
6f6dda72bd better turn group blocks that handle variable lane width and
non-contiguous turn lanes. also clarify part of tutorial for #42
2020-02-01 19:11:01 -08:00
Dustin Carlino
1d13ae39c3 explain a few more things in the tutorial, improve arrows a bit
[rebuild]
2020-01-31 12:18:44 -08:00
Dustin Carlino
79de16a840 get the sim crate to build to wasm. a small step towards #21 2020-01-30 17:28:52 -08:00
Dustin Carlino
b2216bb482 not all lanes have to be the same width. make sidewalks a bit thinner. 2020-01-28 17:26:14 -08:00
Dustin Carlino
5048c69750 scrape named amenities from OSM, match to buildings 2020-01-28 15:57:45 -08:00
Dustin Carlino
4f60d6cb77 make the all-walk conversion idempotent, and some other bugfixes to the
editor
2020-01-24 15:30:32 -08:00
Dustin Carlino
971e8ae3a5 rainy night fixes:
- skip out-of-bounds turn restrictions during map creation
- don't enter sandbox mode with a tutorial map loaded
- fix intersection demand overlay getting clobbered
- keep updating info panel even when we hover over something else
- tweak bad order in trip details info
2020-01-23 23:03:07 -08:00
Dustin Carlino
95a84fd26a tweaking rustfmt options; the long literal string vecs in tutorial look awful 2020-01-21 15:20:02 -08:00
Dustin Carlino
bc8eb8d6e0 ahhh, fix bug that made crosswalks not conflict with turns 2020-01-10 09:18:21 -06:00
Dustin Carlino
53f33a31e4 hide IDs unless in dev mode 2020-01-09 11:50:56 -06:00
Dustin Carlino
c049221743 add a timeline showing bus location 2020-01-08 13:59:01 -06:00
Dustin Carlino
38d731e2a5 adjust traffic signal diagram based on yuwen's mocks 2019-12-20 13:11:50 -08:00
Dustin Carlino
a67b1bf19a refactor Polygon::rectangle_top_left and a few more things... taking
Distance everywhere is kind of silly
2019-12-20 12:42:49 -08:00
Dustin Carlino
875ce494fe woops, was keeping around temporary driveway lines in one case 2019-12-19 16:48:52 -08:00
Dustin Carlino
585cdfea63 express pedestrian pathfinding costs as time. this lets us more realistically model riding a bus as a time cost. as a nice side-effect, computing the CH for the walk_with_transit graph for huge_seattle drops from 10 minutes to 25s. 2019-12-19 12:41:53 -08:00
Dustin Carlino
959a89e81c dont serialize paths of yet-to-be-spawned stuff. drastically reduces savestate size. 2019-12-17 18:08:59 -08:00
Dustin Carlino
e307e1f56d only need to prebake once per map+scenario 2019-12-13 13:57:27 -08:00
Dustin Carlino
16c9819a0d Check in the first manifest for data/system/, after fixing a
nondeterminism issue in fast_paths
2019-12-13 13:44:03 -08:00
Dustin Carlino
5157d87109 start tracking when data/system changes, so I know when to upload new seed data. but oops... RawMap->Map isn't deterministic. fixed one problem, working on another in fast_paths 2019-12-13 12:59:50 -08:00
Dustin Carlino
201c0edaab moving some debug info from the info panel to the console log 2019-12-12 16:09:01 -08:00
Dustin Carlino
ed2f703e85 add some logging to debug #19 2019-12-12 10:35:51 -08:00
Dustin Carlino
ee598b6ae4 round of clippy. not fixing everything. 2019-12-11 16:17:15 -08:00
Dustin Carlino
2afa2ef43f experimenting with tracking and visualizing demand at traffic signals 2019-12-09 15:23:30 -08:00
Dustin Carlino
89a3d1cf5f one generic prebake method to rule them all 2019-12-06 13:45:15 -08:00
Dustin Carlino
e4a34306b0 make pedestrian pathfinding graph use sidewalk endpoints. simpler to
construct final route, and the routes look much more realistic.
2019-12-05 14:09:03 -08:00
Dustin Carlino
3501aa6d72 reviving some way of saving and using purely synthetic maps. creating a
few for the traffic signal tutorial.
2019-12-04 12:19:17 -08:00
Dustin Carlino
a043a9ba05 clean up more of abstutil path/filesystem API 2019-12-03 09:59:43 -08:00
Dustin Carlino
6170792328 centralize a little more path building in abstutil 2019-12-02 20:49:55 -08:00
Dustin Carlino
720f9b8b30 similar for writing 2019-12-02 20:41:09 -08:00
Dustin Carlino
808c3da141 panic early with a nice error if we cant read a binary or json file 2019-12-02 20:35:20 -08:00
Dustin Carlino
b533377159 come up with some building address when there are no building tags 2019-12-02 15:00:53 -08:00
Dustin Carlino
8d34759b7c start tracking and debugging phases of a trip 2019-11-29 13:15:10 -08:00
Dustin Carlino
1648b56009 fix crashes in all trip viz 2019-11-29 11:57:25 -08:00
Dustin Carlino
2c49d68a0f last lingering cleanups for Duration / Time types 2019-11-27 13:12:19 -08:00
Dustin Carlino
819e27aa5d cutover sim time (via the API) to time 2019-11-27 11:49:57 -08:00
Dustin Carlino
51bb492953 speed up import of huge_seattle by 90s by computing node order from scratch for bikes 2019-11-24 14:06:55 -08:00
Dustin Carlino
3ee73d40f0 guarantee protected turns actually get first dibs in the scheduler 2019-11-22 18:56:39 -08:00
Dustin Carlino
1145bbc8e6 overhaul ControlTrafficSignal to natively understand TurnGroups. but
it... didn't solve the problem of a left turn yield going first?!
2019-11-22 18:42:44 -08:00
Dustin Carlino
44128b3615 hanle turn groups a bit more correctly in ControlTrafficSignal... but
not yet natively
2019-11-22 12:11:04 -08:00
Dustin Carlino
17c5532aca store the turn groups in the traffic signal 2019-11-22 11:36:50 -08:00
Dustin Carlino
a3f1261557 precompute TurnGroup stuff 2019-11-22 10:55:04 -08:00
Dustin Carlino
1f972e5afb handle crosswalks too 2019-11-21 16:55:40 -08:00
Dustin Carlino
55eead8ec7 improve turn block rendering 2019-11-21 16:04:53 -08:00
Dustin Carlino
aa1d7faa00 prototyping turn grouping for editing and understanding traffic signals.
half-baked, but worth moving forwards. starting to rip out old turn icon
stuff (oops, accidentally squished into this commit)
2019-11-21 15:09:57 -08:00
Dustin Carlino
318b467f69 add in traffic signal offset end-to-end 2019-11-21 10:18:01 -08:00
Dustin Carlino
60d59c4fc1 dont let player leave traffic sig editor with missing turns 2019-11-20 15:42:25 -08:00
Dustin Carlino
a5c517851e trying fixes again, for 23rd. i think the problem was making montlake
fixes, then more huge_seattle fixes that invalidated the montlake fixes.
it's not hard to do the last-minute border trimming, so be willing to
restart that.

but actually, also have to skip deleting intersections if roads are
connected. urgh.
2019-11-20 12:39:10 -08:00
Dustin Carlino
0e6f89f88b for now, just clobber turn restrictions when merging roads. want to move forward with fixing other maps. also remove label from previous fixes 2019-11-20 11:27:22 -08:00
Dustin Carlino
ba2206d02a be able to start and end bike trips on bike lanes. use driving
blackholes for now.
2019-11-19 14:10:02 -08:00
Dustin Carlino
c7fbaaf7e1 reset edits when leaving sandbox mode 2019-11-19 11:47:40 -08:00
Dustin Carlino
c0fea0811f analyze a bike route and warn when bike lanes arent used 2019-11-18 14:01:15 -08:00
Dustin Carlino
0c2bd1ec0c no need to clobber stop signs when lanes nearby are edited. also, er, i
bricked setting lane types -- fixed ><
2019-11-18 10:43:53 -08:00
Dustin Carlino
463ed7022e small fixes/cleanups to map layer:
- print highest cost in heatmap over all turns
- rm defunct label support for roads/bldgs
- trim out unused methods from Map
- making spawner go through sim layer to get paths, consolidating a bit
2019-11-18 10:33:36 -08:00
Dustin Carlino
c148016877 compress edits when saving 2019-11-17 18:36:07 -08:00
Dustin Carlino
bd108b8d9a redraw stop signs and traffic signals as changes happen 2019-11-17 18:05:35 -08:00
Dustin Carlino
8c2d383fd7 undo button, and displaying last 5 edits 2019-11-17 17:02:14 -08:00
Dustin Carlino
83352965b0 woops, forgot about a block of commented stuff in apply_edits. prevent
orphaning a bus stop
2019-11-17 12:44:24 -08:00
Dustin Carlino
2e2fd1d931 computing the actual set of modified stuff, using it for revert and info 2019-11-17 12:28:48 -08:00
Dustin Carlino
b670299b89 support un-closing an intersection. prevent closing borders. 2019-11-17 11:35:37 -08:00
Dustin Carlino
05ba77ba9b prototyping map edits as a sequence of commands. some existing behavior
temporarily lost. i think this is simpler, will forge ahead
2019-11-16 20:27:10 -08:00
Dustin Carlino
f840175ef4 display pathfinding cost in info panel and heatmap 2019-11-16 15:16:28 -08:00
Dustin Carlino
b8abeccb43 very basic pathfinding penalty for not using bike/bus lanes when theyre available. except it's not working! argh 2019-11-15 15:00:14 -08:00
Dustin Carlino
22397b93a7 NOW ban bikes from motorways. popdat trip filtering needed to handle
some impossible-to-fulfill requests involving borders
2019-11-15 10:48:33 -08:00