Commit Graph

171 Commits

Author SHA1 Message Date
Dustin Carlino
819aa179d7 add map to study mt baker area. extending lakeslice had some problems.
updated blockface, so some other spurious little changes
2020-05-08 13:52:19 -07:00
Dustin Carlino
07c48f612d change speed limits in the map_model layer 2020-05-06 15:18:59 -07:00
Dustin Carlino
86f01f2736 starting to export edits in a longer-lasting format. getting some
round-trip code set up, not handling stop signs or lane edits yet
2020-05-06 11:45:42 -07:00
Dustin Carlino
e1c827ed24 adjust signal timing and workaround an intersection with unrealistically
large geometry, and... lakeslice runs!
2020-05-05 20:29:50 -07:00
Dustin Carlino
4be2d66750 grab some upstreamed fixes from OSM 2020-05-05 18:59:53 -07:00
Dustin Carlino
7dd392b27f make the prebaking a little more flexible; cut off lakeslice at noon for now 2020-05-05 12:31:00 -07:00
Dustin Carlino
4339f49adf expand huge_seattle's boundaries, so west seattle scenario works 2020-05-05 10:35:55 -07:00
Dustin Carlino
9569fd6159 filter out access=no roads. removes the old 520 entrance that's causing lots of unrealistic border traffic in lakeslice. add a map to study west seattle 2020-05-05 09:46:03 -07:00
Dustin Carlino
6877189da7 actually, allow disconnecting some parking via edits 2020-05-04 15:33:18 -07:00
Dustin Carlino
0f39ea46ce simple idea: render roads/intersections with a low zorder as slightly transparent. makes downtown and 99 more palatable 2020-05-04 14:05:43 -07:00
Dustin Carlino
3a8e56f16b optionally detect when a path violates one of these complicated TRs 2020-05-03 11:43:21 -07:00
Dustin Carlino
7d2fa77323 grab turn restrictions across roads from OSM, plumb into RawMap 2020-05-03 10:41:00 -07:00
Dustin Carlino
912d964b75 store screenshots as much smaller .gifs. this lets us start taking screenshots of a larger area, since i'm making substantial changes there now 2020-05-02 18:44:09 -07:00
Dustin Carlino
f1ac0dccc0 new city: Barranquilla 2020-05-02 15:43:19 -07:00
Dustin Carlino
f53220820f fixes for the uploader. [rebuild] 2020-05-02 15:19:50 -07:00
Dustin Carlino
7f16ea879c the downloader half of the updater. grabs all files for now. 2020-05-01 22:44:38 -07:00
Dustin Carlino
43fe432e07 starting a tool to more granularly manage data files. my half, uploading 2020-05-01 19:22:03 -07:00
Dustin Carlino
02c5b6617b dismantle importing for neighborhoods. long unused. just retain a simple
osmosis polygon editor.
2020-05-01 14:11:41 -07:00
Dustin Carlino
270c7d0712 just small cleanups. taking a break from gridlock / map quality for a while. 2020-05-01 11:50:35 -07:00
Dustin Carlino
01bd4aec6f clean up some fallout from the grand data refreshening. mostly
robustifying tutorials/challenges by using IDs stable across map updates
2020-05-01 10:54:43 -07:00
Dustin Carlino
dbc47aee7d fresh osm, finally. accept some regression, charge forward
montlake: FINE!
23rd: naw
lakeslice: regression
2020-04-30 22:37:43 -07:00
Dustin Carlino
7a551277f1 prebake lakeslice data 2020-04-30 19:11:51 -07:00
Dustin Carlino
543d95a41c new lights, get lakeslice working again. and add absolute counts to
intersection demand viz
2020-04-30 18:00:51 -07:00
Dustin Carlino
50a5f59239 good enough. cut-off point. removing map fixes!
(leaving the code around for now)
2020-04-30 14:27:54 -07:00
Dustin Carlino
773ea6d5cf fix graph connectivity problems
- forcing a sidewalk until we can snap OSM footpaths better
- fixing 0-cost CH edges

but, uh, now montlake without fixes gridlocks again. :D
2020-04-30 12:12:36 -07:00
Dustin Carlino
1814857319 park closer to buildings 2020-04-30 10:36:58 -07:00
Dustin Carlino
cea84757e1 making a little progress with ballard 2020-04-29 18:49:14 -07:00
Dustin Carlino
956b1ec4ea banning an extremely questionable left turn... AND LAKESLICE WORKS 2020-04-29 18:11:03 -07:00
Dustin Carlino
2570db2501 update some lights and allow a little more box-blocking. making it to
5pm on lakeslice, no regressions elsewhere. officially cutover to
nofixes version of 23rd
2020-04-29 17:20:33 -07:00
Dustin Carlino
0bc965f0b9 updated a few traffic signals along 23rd. have to filter out signal data
from fixed intersections, urgh
2020-04-29 12:15:22 -07:00
Dustin Carlino
734c06418a It is 5 am
And you are listening
To Los Angeles
2020-04-28 14:31:23 -07:00
Dustin Carlino
18779c10ad organizing data/input by city. (I tried organizing everything in data/,
but it's too big a change. small steps.)
2020-04-28 12:28:37 -07:00
Dustin Carlino
bba8ac9941 remove the screenshot MANIFEST; the more general one suffices 2020-04-28 11:39:10 -07:00
Dustin Carlino
b93f96628f hackily add a second city to the importer. remove the per-map
.gitignore; MANIFEST covers this better
2020-04-27 20:36:04 -07:00
Dustin Carlino
077035aacb better offstreet parking rendering: don't jitter the parking icon, face
the correct direction unparking, make the driveway line extend from the
sidewalk line
2020-04-27 17:29:20 -07:00
Dustin Carlino
193ff2344a require a particular directed road for spawning from borders 2020-04-26 12:35:07 -07:00
Dustin Carlino
1f9e9f5479 woops, didnt regenerate popdat.bin after a change yesterday, causing all the driving trips to disappear. just regenerating data.
and add a hint to the tutorial to fix #51
2020-04-26 11:29:32 -07:00
Dustin Carlino
3f48b4bf22 simplify stuff in analytics, removing a major bottleneck in the everyone_weekday scenario 2020-04-25 21:42:29 -07:00
Dustin Carlino
1ecea0a88f delete old code for scoring things in currently inactive challenge
modes. counting ongoing trips is complicated from a player perspective
and also expensive in analytics. has the nice side-effect of forcing me
to make one of the tutorial levels more robust
2020-04-25 21:29:48 -07:00
Dustin Carlino
725e9e4532 generate a scenario purely with off-map trips. problems running it, but
good start.
2020-04-25 15:18:27 -07:00
Dustin Carlino
2c774224ce ahhh the free offstreet spots were not being generated at ALL correctly 2020-04-25 12:54:51 -07:00
Dustin Carlino
7eba721145 decide extra offstreet parking by an option in convert_osm. remove the old standalone binary in favor of just using importer 2020-04-25 10:36:49 -07:00
Dustin Carlino
dd1c9f936d plumb through exact off-map locations from popdat->scenario 2020-04-24 22:05:33 -07:00
Dustin Carlino
a25751ea43 add more sanity checks for schedules, because every other map is
crashing

and fix the problem -- SpawnTrip -> TripSpec MUST succeed. auto-abort
some trips, to still warp the person to the right spot.
2020-04-23 13:20:25 -07:00
Dustin Carlino
6594de3000 remove a hack from multi-day trips and stumble upon the people needing
10 cars

also prebake data again
2020-04-23 12:37:21 -07:00
Dustin Carlino
11d106e26a associate vehicles with people, not trips 2020-04-22 19:57:25 -07:00
Dustin Carlino
36ed6395e6 some fixes for interactively spawned agents. merge back into master!!! 2020-04-22 16:34:26 -07:00
Dustin Carlino
c4c61cf7d9 recording and communicating delayed starts 2020-04-22 16:16:17 -07:00
Dustin Carlino
a39d19f36a remove the tiny fraction of people with non-continuous schedules from
the PSRC scenarios
2020-04-20 17:55:26 -07:00
Dustin Carlino
0f2962094f dont filter out any parcels from psrc. plumb through oob points, match to borders a little later. also pick up school bus as transit 2020-04-20 17:14:30 -07:00
Dustin Carlino
0574d4316c add some stuff to match people in scenarios with the raw input 2020-04-20 16:52:54 -07:00
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
5d043197a0 filter out private roads entirely. an amusing amount of traffic cutting
through broadmoor, otherwise
2020-04-20 13:42:14 -07:00
Dustin Carlino
40eed3f116 show parking utilization of a single lane over time 2020-04-20 11:30:19 -07:00
Dustin Carlino
50cca5ce5e when clicking on a building, show the "closest" parking spot 2020-04-20 10:51:18 -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
0005feb0ac adjust time warp experience for trips 2020-04-17 12:22:55 -07:00
Dustin Carlino
371d98ba03 skip to end of commute challenge as soon as last trip is done. show
sentiment of matching goal so far or not
2020-04-16 12:49:36 -07:00
Dustin Carlino
97d31fe682 remove the fixed end-of-day; make it easier to jump to times in multi-day scenarios 2020-04-15 16:26:01 -07:00
Dustin Carlino
a104088ccd pt2: rest of sim layer, which forces the UI changes too 2020-04-15 15:48:16 -07:00
Dustin Carlino
1060ed208f adding a cutscene to a challenge mode 2020-04-12 09:37:46 -07:00
Dustin Carlino
bced89ce85 less dumb choices for nearest parking spot, ordering by distance and not number of lanes 2020-04-09 14:20:12 -07:00
Dustin Carlino
ff093e79f4 pick the closest parked car when dynamically reserving 2020-04-09 14:02:56 -07:00
Dustin Carlino
ff68a77979 have to fork rng again to prevent ped speeds from changing. wow. 2020-04-09 13:02:10 -07:00
Dustin Carlino
7ff9a90516 use colored checkboxes in plot too. generate the shape programatically. 2020-04-06 14:45:22 -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
51d91640e4 load different colorschemes in another way 2020-04-04 14:29:45 -07:00
Dustin Carlino
b09c7d2726 moved rest of colors over 2020-04-04 14:15:34 -07:00
Dustin Carlino
af2708df67 goodbye eyes, hello colored checkboxes. also switch to a vertical
visibility panel when unzoomed. [rebuild]
2020-04-03 17:41:20 -07:00
Dustin Carlino
eedbb2b967 rearrange minimap controls. nearly matching the new design. 2020-04-03 16:46:11 -07:00
Dustin Carlino
51a81fc74d handle people being in the same building, bus stop, and bus in one
uniform way. also the first unit tests in an amusingly long time
2020-04-02 16:08:20 -07:00
Dustin Carlino
c12775e5ea change the pandemic model to be a first-class, optional part of Sim 2020-04-02 14:30:18 -07:00
Dustin Carlino
70875d104d Scenario should just have specific trips. split a different structure for generating Scenarios. has the happy side effect of removing lots of weird old spawning code, duplicated checks 2020-04-01 13:50:36 -07:00
Dustin Carlino
b16aceaa9a be more precise with building entry/exit events. they can also happen when a car parks inside a building's garage. also emit events at the start of day to get rid of the weird initial case. 2020-03-30 22:31:36 -07:00
Dustin Carlino
7f35d06c96 prototyping an example of finding overlapping time indoors by "infected"
agents
2020-03-30 22:12:48 -07:00
Dustin Carlino
69dab9e27d typography overhaul... [rebuild] 2020-03-26 15:42:37 -07:00
Dustin Carlino
bf8c35788b moving popdat+precompute into the new unified importer 2020-03-26 10:26:01 -07:00
Dustin Carlino
0133685eb7 converted the import.sh shell script into Rust. towards #27
as part of this, wound up grabbing fresh OSM and GTFS. but actually cant
reimport OSM right now, because fixes reference old OSM IDs and things
break. so sticking with old OSM, but new GTFS. urgh.
2020-03-25 19:54:33 -07:00
Dustin Carlino
ce180f7228 merge TripStart and TripEnd 2020-03-25 13:42:33 -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
469c11e532 fix up overlays, part 2:
- say what layer is active when zoomed in
- zoom out after opening an overlay, if needed
- sadly, scrap the heatmap icons for now
[rebuild]
2020-03-20 12:31:08 -07:00
Dustin Carlino
3aacb06fa5 adjust tutorial top panel to make task selection more clear 2020-03-20 10:23:30 -07:00
Dustin Carlino
fea6129f00 filling out trip timeline icons and colors (with some placeholders).
fixing the icon for locating an object and for visibility hidden.
2020-03-18 19:47:21 -07:00
Dustin Carlino
41ce8fe8f3 force trips per person to be time ordered 2020-03-18 14:01:03 -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
41f37f666c switch popdat from cs2cs binary to gdal bindings. cleaner and will likely need gdal for elevation data anyway. also fix synthetic maps, which i accidentally broke few days ago with elevation 2020-03-15 12:34:23 -07:00
Dustin Carlino
5c8529a201 argh, fix bug in prev commit. seed_parked_car happens in the middle of the TripSpawner existing. 2020-03-12 15:53:06 -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
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
b835f8a6f7 unused deps 2020-03-06 08:27:00 -08: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
1ad434f3d6 record some metadata about the traffic signals. bad UI for now. 2020-03-04 14:40:32 -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
cc1ee8384a enum for trip phases 2020-03-03 12:42:51 -08:00
Dustin Carlino
08cd956faa filling out the trip timeline a bit more 2020-03-03 12:12:42 -08:00
Dustin Carlino
7407e5778f some investigation into psrc tour segments again 2020-03-02 15:50:32 -08:00
Dustin Carlino
59ec571aae tweaks to tutorial UI 2020-02-26 15:18:05 -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