Commit Graph

641 Commits

Author SHA1 Message Date
Dustin Carlino
1304f30b9b add a simple proposal to remove a crossing along the burke gilman 2020-05-20 16:52:45 -07:00
Dustin Carlino
95efd40053 new osm with lots of parking fixes and a vital new turn restriction.
23rd now finishes!
2020-05-20 10:54:22 -07:00
Dustin Carlino
90bc73580d the 'has the coffee really kicked in yet' change: make the contraction hierarchy prevent illegal uber-turns. probably doesnt properly handle changing lane types inside a cluster yet. 2020-05-19 14:03:01 -07:00
Dustin Carlino
65a69612e0 few adjustments to get Manhattan initially imported. not making
permanent yet
2020-05-18 11:42:44 -07:00
Dustin Carlino
c04ce5a5c0 another update after lots of parking mapping 2020-05-16 19:26:42 -07:00
Dustin Carlino
d257535a7c grab new OSM, try to get mt baker running. rainier is just a mess. 2020-05-16 17:32:01 -07:00
Dustin Carlino
e679eed6e6 some buildings come from relations 2020-05-16 16:05:34 -07:00
Dustin Carlino
20f8548634 debug association between soundcast parcels and buildings 2020-05-16 12:36:10 -07:00
Dustin Carlino
0fa4b30521 turn soundcast parcels into extrashapes / kml to understand skipped
parcels
2020-05-16 10:26:59 -07:00
Dustin Carlino
1c3073d0e2 work on getting the udistrict to run better. add options to handle
outliers in the heatmap
2020-05-15 16:46:12 -07:00
Dustin Carlino
ca33695431 get rid of raw thruput_stats. in-game throughput plots are a little
different now, but everything's still usable, and this takes us down
from 342MB + 39MB to 74MB + 11MB for prebaked data! include lakeslice
prebaked results in releases now [rebuild]
2020-05-15 15:07:42 -07:00
Dustin Carlino
63b6d4c515 start a page describing west seattle 2020-05-14 15:49:43 -07:00
Dustin Carlino
95a0f2f620 working on west seattle 2020-05-14 12:03:19 -07:00
Dustin Carlino
f6bd936c53 grab fresh osm. also keep some intermediate files, to make some binary
format changes less of a disruption
2020-05-13 22:55:05 -07:00
Dustin Carlino
dd99936fa0 also scrape amenities from buildings themselves. make an 'other'
category
2020-05-13 13:58:15 -07:00
Dustin Carlino
d7df50ab37 make a one-command version of the importer. remove barranquilla and LA,
since they can just be handled by the oneshot tool, and arent being
actively used yet
2020-05-12 10:27:07 -07:00
Dustin Carlino
4a7ea37ee9 add missing amenities; the shop tag was being ignored 2020-05-12 09:28:14 -07:00
Dustin Carlino
c6f34de3d7 add udistrict map. lots of work before this will run reasonably 2020-05-10 22:01:52 -07:00
Dustin Carlino
dbf4b15959 start to figure out where to compress Analytics [rebuild] 2020-05-10 16:08:45 -07:00
Dustin Carlino
5ae94168f6 fix mt baker a little, at least get the north half of i90 included. lots
of jams along rainier.
2020-05-10 15:49:24 -07:00
Dustin Carlino
82876647b2 record throughput for border intersections too 2020-05-10 15:03:20 -07:00
Dustin Carlino
e22b472a2d handle when dropbox sharelink fails in updater 2020-05-10 10:48:49 -07:00
Dustin Carlino
182f5139a5 rip out old mapfixes code. pure OSM is more maintainable. keep map_editor for drawing synthetic maps and debugging raw maps 2020-05-10 10:39:08 -07:00
Dustin Carlino
b756edb36f grab fresh OSM and enable smarter border matching. few fixes to keep
lakeslice working
2020-05-09 19:51:48 -07:00
Dustin Carlino
f3b396a7e9 set a window icon 2020-05-09 09:48:24 -07:00
Dustin Carlino
7f867fda70 trim down map file size a bit by not storing building OSM tags, which
weren't useful anyway. 873MB for all maps down to 786MB. huge_seattle
343MB to 305MB
2020-05-08 14:46:36 -07:00
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
4c56a4babd working on the article 2020-05-07 16:54:36 -07:00
Dustin Carlino
5c0c133253 finally get the first community proposal baked in! 2020-05-06 16:58:09 -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
ce0c5d4d04 update osm. stop crashing when switching to map without weekday scenario 2020-05-04 13:25:06 -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
4f05a19786 remove old data seeding scripts, document how to use the updater 2020-05-02 16:05:31 -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
55e0d2a364 overhauling offstreet parking model:
- almost all buildings can have a few spots
- render things a little differently
- increase paranoia of buildings that can have driveways, to avoid many
complicated simulation issues
2020-04-24 12:50:22 -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
93227a138b ありがとう, Mr Roboto. You've served us well, but switch to Overpass 2020-04-01 09:32:52 -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
0fb22b5f50 sloppy (and incorrect!) implementation of gradients. temporarily breaks
non-glium backends, about to cleanup.
2020-03-30 15:48:23 -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
9525b11b20 start a standalone ezgui example 2020-03-03 16:24:27 -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
41fe85fe4b buttons in trip timeline to jump to endpoints 2020-03-02 14:14:54 -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
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
06759dc58c new tutorial flow [rebuild] 2020-02-25 12:17:19 -08:00
Dustin Carlino
c3b3b9d74c new lyon can handle the last two svgs! remove the pngs 2020-02-20 18:16:46 -08:00
Dustin Carlino
db69dbd4df fix the active agents calculation. buckets... don't make any sense. 2020-02-20 17:50:42 -08:00
Dustin Carlino
848347a9b5 change up agent meters 2020-02-19 08:23:06 -08:00
Dustin Carlino
f71c1d521e add the trip data button. just removed the svg clip and it worked fine. 2020-02-18 12:19:34 -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
d56803a12a include ongoing trips in measured trip times. adjust wording of
"finished trips" things.
2020-02-17 15:58:27 -08:00
Dustin Carlino
3e0246edec find some way to prebake tutorial scenarios 2020-02-16 11:45:23 -08:00
Dustin Carlino
9a9619ec32 moving game assets to data/system, to more easily bundle in wasm
[rebuild]
2020-02-15 16:19:23 -08:00
Dustin Carlino
4660dd077c rip out the old support for mapping UV coordinates onto a polygon 2020-02-08 16:48:01 -08:00
Dustin Carlino
0fc864ee51 limit text cache size. work on build scripts again [rebuild] 2020-02-08 13:25:48 -08:00
Dustin Carlino
a5e9505fd2 manually add padding to text, making it look reasonably usable. cutover!
[rebuild]
2020-02-08 13:08:31 -08:00
Dustin Carlino
fad4cdbda2 plumb font directory so it'll work anywhere, but still would prefer to bundle binary data properly 2020-02-08 10:36:44 -08:00
Dustin Carlino
1b1f191663 smaller bootstrap data option for people not building maps. part of #43
[rebuild]
2020-02-07 15:05:24 -08:00
Dustin Carlino
a3149d2219 no_edits -> untitled edits 2020-02-06 13:15:09 -08:00
Dustin Carlino
f4c6b4453a scrape info from PSRC to relate trips to people. not plumbed into
scenario layer yet.
2020-02-04 19:54:13 -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
800008dc03 making the histogram more clear about same trips 2020-01-30 15:33:27 -08:00
Dustin Carlino
e96fa0f96f fix bounds of tutorial levels, so max unzoom and minimap and such work.
always display minimap in sim modes.
2020-01-30 14:25:02 -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
07995fb060 starting a tutorial for bus lanes too 2020-01-27 12:38:51 -08:00
Dustin Carlino
06b83a5f73 less colors: use sidewalk/road color for building connections 2020-01-22 14:12:12 -08:00
Dustin Carlino
f198a6c35f dont insist on prebaked data existing in some places. also go update
scenarios with the new name, oops.
2020-01-21 11:50:56 -08:00
Dustin Carlino
ca6b81099c rename scenarios to be less confusing 2020-01-19 14:39:46 -08:00
Dustin Carlino
c039aed4d0 make the github build process produce usable zips [rebuild] 2020-01-11 16:07:19 -06:00
Dustin Carlino
0439e05e4e start a panel for showing live passenger delay 2020-01-04 10:52:25 -06: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
75fa084884 fixing one instance of #28 and making it a bit easier to debug next time 2019-12-19 12:07:20 -08:00
Dustin Carlino
3547c2cf1b move some sandox menu items to tool panel for the moment 2019-12-18 15:14:59 -08:00
Dustin Carlino
dfa1b82c70 stop adjusting agent colors when zoomed in. just one fixed scheme right now. acs just for unzoomed/minimap. get rid of the "arbitrary colors" scheme 2019-12-17 15:50:09 -08:00
Dustin Carlino
a2ac3c5265 make the minimap visibility panel match up with the agent colorscheme.
remove the old color legend
2019-12-17 14:54:25 -08:00
Dustin Carlino
9aa4fda837 overhaul color scheme. no more dynamic picker or saving. sometimes
generate an easily editable JSON file.
2019-12-17 11:05:07 -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
61ef9f0b33 adding turn lanes to the tutorial level 2019-12-07 10:44:05 -08:00
Dustin Carlino
5f8fe5e6a8 hack in a second scenario on a synthetic map, just to start to figure out how to organize this 2019-12-06 11:33:01 -08:00
Dustin Carlino
c523f7fb9c more granularly tracking unexpected new data files 2019-12-04 17:23:47 -08:00
Dustin Carlino
f3f4562e00 simple solution for adjusting map boundaries in editor 2019-12-04 13:03:47 -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
f6471cf5e4 finalize seeded data script. fixes #3, now the initial dev experience is much easier 2019-12-03 16:36:30 -08:00
Dustin Carlino
d47be1e175 start a script to package data, stick it in dropbox, suck it down for
fast bootstrapping. split off developer instructions. not finished,
because I need a better connection to upload the seed data and test
everything...
2019-12-03 14:31:00 -08:00
Dustin Carlino
db8bc73ddd finally grouping system data too. forgot some data/input things... 2019-12-03 12:22:59 -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
e1c5edc76d remove lightrail map for now; precompute crashes on it, not an important one right now 2019-11-23 12:48:05 -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
bdc66526a6 tool to clear interior points of road, nice for fixing dangling borders 2019-11-20 12:45:39 -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
53bbf4e272 manually trim a few disconnected sidewalks 2019-11-13 15:01:53 -08:00
Dustin Carlino
03d599775f clean up some crosswalks generated near roads with sidewalks only on one side 2019-11-12 15:54:47 -08:00
Dustin Carlino
5bb8e0a83b overhaul stop signs. can only toggle which roads have a stop sign or
not. no more granular control of individul turns
2019-11-09 14:20:31 -08:00
Dustin Carlino
e6fcc50696 better crosswalk rendering, and an overlay for finding bus lanes 2019-11-09 13:11:05 -08:00
Dustin Carlino
7400659820 ah, update fixes to remove synthetic field 2019-11-06 11:30:59 -08:00
Dustin Carlino
ada5484501 finishing up the montlake map, no gridlock by default 2019-11-04 12:55:04 -08:00
Dustin Carlino
dbf47cbe52 fixing most of montlake again. need turn restrictions and a few border
cleanups
2019-11-04 11:42:59 -08:00
Dustin Carlino
03e2c0b3f2 one master set of fixes in huge_seattle coordinate space, then a single override per map. start over with fixes... again. for the last time?! all the tricky cases from last time work now... 2019-11-04 09:50:59 -08:00
Dustin Carlino
6cf9ba678c disabled night color scheme 2019-10-31 17:06:03 -07:00
Dustin Carlino
00c9575f0e fix lake washington in the huge_seattle slice in the simplest way, by adjusting the boundary. later have to support the coastline dipping in and out of the boundary multiple times 2019-10-29 11:23:12 -07:00
Dustin Carlino
b3611707c8 transforming fixes into huge_seattle coordinate space, to avoid most
border issues.
2019-10-28 22:26:39 -07:00
Dustin Carlino
8e4bc6961b montlake is completely fixed of short roads! also turn restrictions
around 520, crosswalks over 2 one-ways, decided to use one fix file per
map
2019-10-28 19:08:44 -07:00
Dustin Carlino
ca43e6fb43 woops, wasnt deleting turn restrictions from world layer. fix up
montlake/520 once again, modulo turn restrictions
2019-10-28 16:16:25 -07:00
Dustin Carlino
6771c965b4 fix bug in road creation. montlake roundabout as the test case. 2019-10-28 14:42:18 -07:00
Dustin Carlino
1f7c113267 fix road merging. simpler now that roads only have one object
associated. require turn restrictions to be deleted first. fix the
boston area as a test
2019-10-28 14:33:10 -07:00
Dustin Carlino
ecc86b6d6a revamping MapFixes. very straightforward full override of synthetic/normal stuff, including geometry. no more semantically weird hints like merging roads. some bugs left. 2019-10-27 17:15:27 -07:00
Dustin Carlino
77d0647b4f when gluing together partial multipolygons, trace along the border when possible. improves a few cases. 2019-10-25 13:46:21 -07:00
Dustin Carlino
5890a73a71 woops, accidentally committed deleted map fixes 2019-10-25 09:30:58 -07:00
Dustin Carlino
f107bc1241 fix parking hint application to not erase other side 2019-10-24 17:35:02 -07:00
Dustin Carlino
1a92590c28 some fixes become invalid as osm edits happen. print better errors so the fixes can be manually... fixed. and a script to grab fresh OSM data 2019-10-24 17:11:35 -07:00
Dustin Carlino
a8490aa16f tweaking some map colors 2019-10-24 16:00:27 -07:00
Dustin Carlino
d8b11ca10e some right (by angle) turns cross roads; those should be straight turns 2019-10-23 14:37:00 -07:00
Dustin Carlino
9cab5bf903 prep before bringing in king county sidewalks. clean up lane type
calculation, move motorway/parking filter earlier. stop bringing in
street signs.
2019-10-23 09:35:41 -07:00
Dustin Carlino
996eceea92 with the new traffic signal, add back the 520 EB onramp 2019-10-22 15:00:56 -07:00
Dustin Carlino
d358f574d5 handle OSM polylines that have redundant internal nodes and cause weird shifting later (26th and gilman) 2019-10-21 19:28:31 -07:00
Dustin Carlino
08b0bfa0c2 spot fixes to make caphill flow 2019-10-19 20:53:11 -07:00
Dustin Carlino
50728cf375 use epsilon_eq for polyline extension, so offstreet parking geom doesnt break in one case 2019-10-19 17:42:03 -07:00
Dustin Carlino
5b9a8dd914 seeding buses more robustly. spot fixes to maps to prevent regressions 2019-10-19 16:54:54 -07:00
Dustin Carlino
b4b4e8fae8 solid yellow lines for oneways. dashed looks really strange with offside parking. 2019-10-18 15:08:30 -07:00
Dustin Carlino
96a38b98b1 allow sidewalks on both sides of all oneways. dont remember where the negative case was earlier. this was causing parking->sidewalk crashes in many maps 2019-10-18 14:50:05 -07:00
Dustin Carlino
c78486f039 fixes to short roads in 23rd. full day with freeform policy no longer
gridlocks! starting a vague tracking doc of outstanding issues per map
2019-10-18 14:19:32 -07:00
Dustin Carlino
468fd65021 copy over highway type too for coloring. fill out some metadata in the
520 fixes.
2019-10-18 12:15:51 -07:00
Dustin Carlino
1438a1490b allow parking lanes on the 'backwards' direction of oneways. they exist, still need to use them properly. 2019-10-16 10:23:29 -07:00
Dustin Carlino
51352d05a9 interpret OSM tags to figure out bike lanes on one side 2019-10-14 15:05:45 -07:00
Dustin Carlino
9d35f0f92f fix some bad intersections in 23rd 2019-10-04 12:05:09 -07:00
Dustin Carlino
c82e90bbec allow merging short roads with metadata changes. some fixes around
madison
2019-09-30 10:11:45 -07:00
Dustin Carlino
a539270beb dont compare GPSBounds exactly, bc floating pt serialization problems.
add a turn restriction near uw.
2019-09-30 09:24:17 -07:00
Dustin Carlino
c971a732dd more flexibly merge short roads with stop sign and traffic signal. use it to fix a stuck part of 23rd. 2019-09-29 20:50:14 -07:00
Dustin Carlino
4de97f2f2b fixing two montlake roundabouts; saw some gridlock there. the whole day
now finishes without gridlock. O_O
2019-09-29 14:17:10 -07:00
Dustin Carlino
666896bb88 start over with 520 fixes, after hopefully fixing all the ID issues 2019-09-29 12:59:31 -07:00
Dustin Carlino
e335d2ff02 manually repair the 520 fixes. things look reasonable for montlake and
23rd, but very weird for other maps
2019-09-29 11:49:16 -07:00
Dustin Carlino
b99dfce763 transform geometry in MapFixes based on GPSBounds. also have to
abandon the 520 fixes, because something odd is going on with the newer
osm import. :( IDs changed?
2019-09-29 10:17:02 -07:00
Dustin Carlino
96a50e0076 finally checking in a basic fix for montlake/520 area. no more
gridlock... running out of parking now around 4pm!
2019-09-27 12:56:26 -07:00
Dustin Carlino
39f555a788 trying out traffic signals rendered per lane, resuming from hackathon.
progress, but still doesnt look comprehensible. also flip intersection
color to blend in with roads more -- black doesn't look right, but
matching the parking lanes actually looks reasonable.
2019-09-24 10:20:31 -07:00
Dustin Carlino
c54cffe694 render yellow center lines as dashed 2019-09-23 16:42:49 -07:00
Dustin Carlino
f06db4ecb4 remove the old hacky fix_ramps phase. underlying problem is probably pedestrian islands not being modeled properly. workarounds now possible through synthetic. 2019-09-23 12:48:55 -07:00
Dustin Carlino
9cc20cd87c add a new map that includes a few light rail stops, for the hackathon 2019-09-21 08:41:01 -07:00
Dustin Carlino
b3bfd6a3f2 stop mangling roundabouts. it'll conflict with the next change, and its a hack that should be correctable by manual intervention now... 2019-09-20 14:56:22 -07:00
Dustin Carlino
83834f7d40 actually, deferring remove_disconnected has problems.. still need to remove cul-de-sacs early. also, remove the two synthetic maps... will make them again from scratch once the raw_data format is stable. unused in the meantime. 2019-09-17 10:47:47 -07:00
Dustin Carlino
180fdd1412 builder API for World. restoring synthetic labels 2019-09-12 11:11:31 -07:00
Dustin Carlino
43de343372 stop serializing synthetic's model format, just save raw_data maps 2019-09-11 13:52:49 -07:00
Dustin Carlino
18abb85431 adjust degenerate intersections: only one crosswalk, reduce size of it 2019-09-09 12:28:19 -07:00
Dustin Carlino
43c2c72e71 importing street sign dataset to override bad parking categories from blockface. the signs look overeager... so disabling 2019-09-08 17:23:53 -07:00
Dustin Carlino
408078247c fix fix_map_geom. the grand raw_data simplification is now over! 2019-08-26 17:40:10 -07:00
Dustin Carlino
9fac44e28b fix roundabout handling. clearing out hints, because many no longer
apply with the back-and-forth gps/pt2d stuff... reasonable to reset
efforts anyway, now that I'm considering patching in OSM edits instead
2019-08-26 14:40:47 -07:00
Dustin Carlino
ce4369be27 raw_data::Building too 2019-08-26 10:36:00 -07:00
Dustin Carlino
29eb463a6f base gps_bounds off of boundary polygon only. temporarily allow some out-of-bound coordinates, and deal with them during clipping. this means the osmosis boundary polygon is required. 2019-08-25 19:07:12 -07:00
Dustin Carlino
96db77e8b2 stop importing traffic signal data from king county. OSM's data is higher-quality and already attached to specific nodes. 2019-08-15 14:19:11 -07:00
Dustin Carlino
574e30b3d8 adding a new hint for extra turn restrictions 2019-08-06 14:02:34 -07:00
Dustin Carlino
c82413fca5 make a per-map editor_state, and move a few more things into data/ 2019-08-05 13:04:31 -07:00
Dustin Carlino
2e41b2284e use the turn restriction data to filter more turns 2019-07-04 19:57:07 -05:00
Dustin Carlino
57425c170c actually use OSM turn restrictions 2019-07-03 09:44:50 -05:00
Dustin Carlino
142c34af4e interpret lanes:forward and lanes:backward from OSM 2019-07-02 14:00:54 -05:00
Dustin Carlino
f26289e176 woops, we were double-drawing in debug mode. detected by trying to screenshot everything 2019-07-01 14:37:07 -05:00
Dustin Carlino
6bb5ed4407 parking lane overrides in hints. removing parking from much of 23rd.
more involved than I anticipated, because the override changes road
width and forces us to recalc intersection polygons
2019-07-01 14:14:18 -05:00
Dustin Carlino
5e1a7238e8 preserve OSM tags when merging degenerate intersections. this lets 24th and lake washington be fixed without messing up the z-layering 2019-06-26 17:33:31 -07:00
Dustin Carlino
d72aefdc7c add more hints, trying to get a full PSRC day on 23rd to work... 2019-06-19 14:27:53 -07:00
Dustin Carlino
177b33795c adjust building color, update screenshot test 2019-06-18 16:34:28 -07:00
Dustin Carlino
1523f3ec7f WIP rewrite of the a/b street features page, adjust colors in
fix_map_geom, add some simple hints (23rd and madison in particular),
make merging degenerate intersections easier by showing OSM tag diff
2019-06-14 12:11:35 -07:00
Dustin Carlino
ec50a277ea switch to one set of hints for all maps, put it under version control. seed with a few easy ones. :) 2019-06-12 15:16:38 -07:00
Dustin Carlino
2d0a53c2d6 improving turn type classification for driving/bus/bike lane interactions; this in turn improves the default intersection policies 2019-06-07 16:32:42 -07:00
Dustin Carlino
e87581a86e adjusting map of 23rd ave for first real demo. making unzoomed colors
match between sim and psrc trip viz
2019-06-05 11:47:17 -07:00
Dustin Carlino
dd9e187db6 simple, but seemingly effective remediation for polylines exploding out
to infinity...
2019-05-29 15:48:33 -07:00
Dustin Carlino
ec015624c0 workaround for awful intersection geometry causing get_outline's that
explode out to some corner and get constantly rendered
2019-05-16 18:49:47 -07:00
Dustin Carlino
a816a3d0be defining a better set of pre-converted maps. disabling fix_ramps in most
cases.
2019-05-16 16:22:52 -07:00
Dustin Carlino
1dca1bd560 handle arrow-making for short last lines 2019-04-20 21:59:17 -07:00
Dustin Carlino
b610139f89 woops, screencap everything cut off the bottom and right 2019-04-15 11:42:38 -07:00
Dustin Carlino
9a2699aab9 take a single screenshot (hiding menus and stuff) 2019-04-15 10:07:50 -07:00
Dustin Carlino
e873f79f67 removing old code for area clipping 2019-04-13 15:54:13 -07:00
Dustin Carlino
0772e6e3c8 make_arrow only for PolyLine, simplify and improve the result in most
cases
2019-04-12 15:06:44 -07:00
Dustin Carlino
11a1c3543e clip buildings that're partly out-of-bounds 2019-04-12 13:05:59 -07:00
Dustin Carlino
caded99919 basic linux+windows release script 2019-03-12 08:47:18 -07:00
Dustin Carlino
5bd840d296 populate turns from multiple lanes to a single right/left turn 2019-02-23 11:17:21 -08:00
Dustin Carlino
b02807ceee use quadtree to speed up fix_ramp step 2019-02-22 10:15:13 -08:00
Dustin Carlino
e1259587cb updating OSM source. some tweaks to make things work. 2019-02-17 15:58:04 -08:00
Dustin Carlino
5830908604 version control checksums of screencaps for all maps... well,
still not small_seattle. :P
2019-02-17 14:27:48 -08:00
Dustin Carlino
a52bea9835 some steps to closing off incomplete areas better... mostly stuff to
quickly iterate on this problem later
2019-02-15 09:03:02 -08:00
Dustin Carlino
a2e2c3311e drawing border arrows way better 2019-02-12 14:42:03 -08:00
Dustin Carlino
8b3e3d8f27 final touchups... trim down pts in synthetic maps 2019-01-31 13:47:46 -08:00
Dustin Carlino
a9cd42dd86 fix synthetic maps; field got renamed 2019-01-30 21:46:35 -08:00
Dustin Carlino
d9d89e93dd using glium_glyph... things initially kind of work 2019-01-23 12:10:17 -08:00
Dustin Carlino
d76c0d0652 use StableRoadID directly in synthetic model 2019-01-17 19:31:57 -08:00
Dustin Carlino
af7e12e52b bundle ttf 2019-01-11 10:13:29 -08:00
Dustin Carlino
b7f31cc8f4 make canvas know initial screen size, so centering on map pt initially does work 2018-12-18 15:37:44 -08:00
Dustin Carlino
cdc9c58ab4 start tutorial mode centered on the right thing. improve map label API by returning references. 2018-12-18 09:57:51 -08:00
Dustin Carlino
0f1c475ab7 simplify tutorial map, actually count cars spawning now 2018-12-14 10:55:21 -08:00
Dustin Carlino
e76dede109 label synthetic intersections 2018-12-10 15:59:48 -08:00
Dustin Carlino
dbfd410b0a force synthetic intersections into being border nodes too 2018-12-10 15:45:34 -08:00
Dustin Carlino
f5201bbfa6 WIP thinking about running tutorial mode 2018-12-05 13:40:21 -08:00
Dustin Carlino
7a10378b00 make UI handle loading new maps with no buildings to focus on 2018-12-05 11:47:58 -08:00
Dustin Carlino
56c885e7ab revive the first parking test. make helpers to look up labeled stuff from synthetic maps. make helpers to seed specific parked cars and start certain trips again. 2018-11-26 11:22:17 -08:00
Dustin Carlino
a9ff1906ad label each side of a synthetic road 2018-11-26 09:42:57 -08:00
Dustin Carlino
c46489ca83 naming synthetic buildings 2018-11-26 09:03:38 -08:00
Dustin Carlino
d0b90b9243 also export synthetic maps when saving them 2018-11-26 08:38:16 -08:00
Dustin Carlino
4a1d2c8bb6 making import.sh more magic 2018-10-30 15:07:22 -07:00
Dustin Carlino
b7e184eeca adjusting scripts to convert OSM polygons 2018-10-29 15:53:04 -07:00