Commit Graph

585 Commits

Author SHA1 Message Date
Dustin Carlino
19409dfc8c add krakow as an optional city. need to specify more customization for #171, and given how much work is focused here, using the one-shot importer no longer makes sense 2020-07-09 14:33:39 -07:00
Dustin Carlino
4340ad585b convert the rest of usize IDs to u32. savings:
maps: 645mb -> 625mb
scenarios: 431mb -> 390mb (before all the u32 optimizations, this as
500mb!!!)
prebaked: 80mb -> 73mb

and while I'm at it, grab fresh OSM, with lots of manual lane fixes,
especially near divided highways
2020-07-09 11:43:34 -07:00
Dustin Carlino
438bc39b86 handle cycleway:both, for #168 2020-07-08 17:59:30 -07:00
Dustin Carlino
6304abdcc8 make updater handle new screenshots format, and rm accidentally uploaded krakow map 2020-07-08 14:55:00 -07:00
Dustin Carlino
7c0aaed370 the first link light rail has left the staton. #numtot 2020-07-08 14:29:02 -07:00
Dustin Carlino
b91d6365e0 dont put sidewalks on a roundabout that's explicitly tagged. fixes #165
this actually disconnects the boyer roundabout (which is tagged
correctly in OSM, but not using the separate sidewalks yet). fine for
now, might add a temporary override later
2020-07-08 09:36:35 -07:00
Dustin Carlino
94512d95b9 change LaneID from usize to u32. savings:
scenarios: 458MB -> 431MB
maps: 676MB -> 638MB
prebaked: 85MB -> 80MB

also fix #163
2020-07-08 08:47:02 -07:00
Dustin Carlino
4aaa41dd13 zip screenshots in dropbox, because managing individual files keeps crashing the daemon 2020-07-07 16:31:52 -07:00
Dustin Carlino
3eb8db3f75 interpret OSM center lines as the physical center of the road (excluding
sidewalks), not as the divider between the two directions. this
dramatically changes geometry everywhere for the better.

thanks to
https://wiki.openstreetmap.org/wiki/Proposed_features/placement for
clear explanations. will be looking next at interpreting this tag.

also temporarily removing screenshots, because uploading individual
files and waiting for dropbox to sync isn't sustainable
2020-07-07 15:52:51 -07:00
Dustin Carlino
476e0e101f easy wins: make BuildingID u32, not usize. maps from 680MB to 676MB.
scenarios from 500MB to 458MB.

considered going down to u16, but pretty sure there are already maps
with >65k buildings
2020-07-06 17:55:02 -07:00
Dustin Carlino
c1f752730c woops, needed to regenerate scenarios a few commits ago, the laneids are off 2020-07-06 16:47:41 -07:00
Dustin Carlino
d52a0e8a35 new scenario mod: force everyone to make a mode change 2020-07-06 16:29:51 -07:00
Dustin Carlino
cac35319b2 handle off-side bike lanes on oneway roads. fixes #140 2020-07-06 14:03:22 -07:00
Dustin Carlino
82345767c9 store a bitset of access restrictions per road. derive zones from this only for editing and pathfinding. this unblocks editing zones 2020-07-06 13:09:49 -07:00
Dustin Carlino
b701fcf114 also dedupe building points coming from a relation, for #130 2020-07-06 07:29:20 -07:00
Dustin Carlino
804896cfda relax some old requirements for bus stops not being on the same lane. i
dont remember what the old issue was. this fixes some light rail stops
downtown, because multiple stops are along a single light rail lane.
2020-07-05 12:34:46 -07:00
Dustin Carlino
f818b3877e fresh osm. was trying to fix some intersections along boren, but didnt make much progress 2020-07-04 18:59:17 -07:00
Dustin Carlino
505311a93f improve the signal synchronization a bit for #8. hardcode a few small
intersections to make the downtown map make more progress. make it
easier to copy OSM node IDs.
2020-07-04 08:53:13 -07:00
Dustin Carlino
628ee0fa86 dirt simple method to swap the order of pairs of two-phase signals to
try to synchronize them better. towards #8. not regenerating screenshots
because it's late and there'll be more screenshot churn tomorrow anyway
2020-07-03 21:55:54 -07:00
Dustin Carlino
3a7a75e011 for the heuristically generated traffic signals, handle roads with
sidewalks on only one side. part of #8
2020-07-03 19:50:31 -07:00
Dustin Carlino
575dcfb782 snap bus vehicle/sidewalk positions to the correct side of the road and
a more appropriate lane. also fix #122
2020-07-03 19:00:20 -07:00
Dustin Carlino
ac88a96f61 use a different icon for train stops 2020-07-03 17:49:36 -07:00
Dustin Carlino
56cb59c3ac rip out gtfs code, cutover to osm. will revisit this later; gtfs and osm probably disagree on routes and stops, and gtfs has schedule. but for now, just osm. 2020-07-03 17:33:32 -07:00
Dustin Carlino
0dc42d7e19 use bus stops from OSM instead of gtfs. expose the stop name and the
driving position in the info panel. some issues with the driving
positions, but this is the way forward for light rail.
2020-07-03 15:22:13 -07:00
Dustin Carlino
1175826f3d scrape bus info from OSM into the RawMap layer. don't use it yet. 2020-07-03 12:00:42 -07:00
Dustin Carlino
8b006c037d slim down sidewalk corners, at the repeated urging of julian 2020-07-02 17:12:08 -07:00
Dustin Carlino
3acec91f51 get berlin import working for #119. just had to allow a few more turn
restrictions previously unencountered and deal with weird geometry.
and add some hints to docs for #118.
2020-07-02 09:56:48 -07:00
Dustin Carlino
54b4bd318e way simpler approach for two-step walking paths. fixes the silly loops. 2020-07-01 11:12:47 -07:00
Dustin Carlino
9b42d27e85 finally enable two-step pathfinding for pedestrians too. the weird hack
making this work: pedestrians will sometimes add an extra little
back-and-forth in their paths
2020-06-30 14:52:57 -07:00
Dustin Carlino
2c7440b03f start representing access restrictions by mode 2020-06-30 13:15:57 -07:00
Dustin Carlino
1617a3d3c1 skip missing maps in the city picker 2020-06-29 09:36:37 -07:00
Dustin Carlino
a103c84a40 cluster private roads into zones. don't surface in the UI yet [rebuild] 2020-06-28 18:11:13 -07:00
Dustin Carlino
bb3da1f8eb Make a very primitive form of adaptive traffic signal phases. It should
be easier to write better policies now; this mostly does the work of
changing the map model and UI to handle variable timing. A small step
towards #91
2020-06-28 10:20:47 -07:00
Dustin Carlino
2733d3e791 pull down fresh OSM data, with some fixes along mlk. handle west seattle
bridge being tagged differently. also note some streets in CHAZ/CHOP
disappeared, because they're tagged as pedestrian ways currently. also
forced to pull down fresh traffic signal data to keep lakeslice running
2020-06-27 22:27:03 -07:00
Dustin Carlino
ae6c099bd5 start bringing in private broadmoor roads. omit from the CH, so trips will just fail without a path for now. 2020-06-27 16:19:48 -07:00
Dustin Carlino
455b17faef start playing around with manchester 2020-06-27 12:32:03 -07:00
Dustin Carlino
eab0988bd8 hello light rail! just import the tracks, represent as a new lane type.
make clipping handle starts and ends separately
2020-06-26 16:47:18 -07:00
Dustin Carlino
d254d49591 discard way less buildings, and match driveways away from intersections
more carefully
2020-06-25 16:34:44 -07:00
Dustin Carlino
07bf9725d4 use a regularly spaced marking for construction instead of the weird
stripes. clean up the hack in the shader
2020-06-24 08:36:47 -07:00
Dustin Carlino
626636ece7 remove turn lookup. have always found myself using the src lane. edits invalidated it anyway 2020-06-23 18:36:45 -07:00
Dustin Carlino
684bf72dde recalculate stop signs when lanes change; construction->driving was
breaking the west seattle bridge. fixes #68. include a built-in proposal
to fix the bridge. ;)
2020-06-23 17:46:35 -07:00
Dustin Carlino
d707969af5 remove mt_baker map and replace it with a much wider south_seattle map,
per request [rebuild]
2020-06-23 16:41:36 -07:00
Dustin Carlino
27d3ec3538 fix dead dropbox links in input/. these shouldnt happen anymore. 2020-06-22 23:11:49 -07:00
Dustin Carlino
0c63062034 another attempt at fixing the updater [rebuild] 2020-06-22 17:04:01 -07:00
Dustin Carlino
f3d1ebe70e link to new release 2020-06-22 07:49:29 -07:00
Dustin Carlino
e46f118d27 ready the alpha launch... 2020-06-21 17:49:52 -07:00
Dustin Carlino
506077a7b7 fix road labels. enable them by default! 2020-06-20 15:26:54 -07:00
Dustin Carlino
be4daf421c figure out why some dropbox links are stale [rebuild] 2020-06-20 14:04:48 -07:00
Dustin Carlino
b231809ba2 cap hill's rainbow crosswalks! [rebuild] 2020-06-20 10:05:47 -07:00
Dustin Carlino
f5385b83df restore raw throughput counts deleted in
ca33695431, flagged off, for further
exploration of compressed representations. also, apparently lakeslice
prebaked results have been missing for a while due to dropbox snafu! fix
2020-06-19 11:04:07 -07:00
Dustin Carlino
50de52439f tune wording of tutorial. finally introduce the drone [rebuild] 2020-06-15 17:33:37 -07:00
Dustin Carlino
bfaefe1df3 implement new, better word wrap. remove the old way. applied everywhere
except tutorial instructions, since those need rewriting soon anyway
2020-06-15 11:42:09 -07:00
Dustin Carlino
64fba66e42 add links to proposal write-ups and adjust the UI for that page 2020-06-14 13:04:28 -07:00
Dustin Carlino
5cda64d6fd adjusting start/end marker icons 2020-06-14 12:32:44 -07:00
Dustin Carlino
16bc96c401 try adjusting the offstreet spots in downtown to be a fraction of the
initial demand
2020-06-13 15:38:04 -07:00
Dustin Carlino
42ea64a680 changing parking seeding to fill in private spots first. makes progress
in larger maps. i made sure the optimize challenge is still interesting
after this change.
2020-06-13 15:14:23 -07:00
Dustin Carlino
d92f4536e2 introduce superblock proposal [rebuild] 2020-06-12 21:14:09 -07:00
Dustin Carlino
14c7518787 break down delay by agent 2020-06-12 11:37:12 -07:00
Dustin Carlino
dfb9e7e349 move gameplay meters to the side. also start capturing logs for linux
and mac too
2020-06-11 14:55:56 -07:00
Dustin Carlino
727bd3deb9 pick better colors for borders 2020-06-09 18:23:22 -07:00
Dustin Carlino
4975260911 adding challenge task description, independent of cutscene 2020-06-08 15:17:40 -07:00
Dustin Carlino
03c63ab34d working on new cutscene UI 2020-06-08 13:25:21 -07:00
Dustin Carlino
f8f815d094 tightening up more tutorial stages:
- spawn a better amount of trips for low parking
- adjust contention stage so there's only one real problem to fix

also try to fix building the new clipboard dep [rebuild]
2020-06-07 16:59:20 -07:00
Dustin Carlino
863593708a tool to copy OriginalLane to clipboard. also fix wasm build breakage [rebuild] 2020-06-07 16:25:42 -07:00
Dustin Carlino
fafcf57240 make most offstreet spots private 2020-06-06 18:37:20 -07:00
Dustin Carlino
8de9ba0536 stop grabbing parking lot capacity 2020-06-06 14:37:09 -07:00
Dustin Carlino
b15664727d flesh out info panels for parking lots 2020-06-06 14:23:47 -07:00
Dustin Carlino
65b500509e make peds use front paths for parking lots too 2020-06-06 14:04:09 -07:00
Dustin Carlino
1401c1b415 prototype a lasso select 2020-06-04 17:18:57 -07:00
Dustin Carlino
96f68964e3 woops, it's been a while since i regenerated the austin maps 2020-06-03 12:16:31 -07:00
Dustin Carlino
ea6a5c0f9d encode parking spots cheaply, compute up-front 2020-06-03 11:50:46 -07:00
Dustin Carlino
b69d155812 clipping parking aisles to the lots, in most cases 2020-06-03 10:51:59 -07:00
Dustin Carlino
b9da2f2fdc pick up parking aisles that cross the polygon 2020-06-02 19:31:20 -07:00
Dustin Carlino
971ee0f819 cleaning up the parking lot rendering a bit 2020-06-02 15:59:26 -07:00
Dustin Carlino
30eafea94a start representing OSM parking lots in the map model and rendering layer 2020-06-01 12:51:14 -07:00
Dustin Carlino
549cba977e grab fresh osm. notable fix near nickerson fixes a sim crash. also put islands on top of water, woops. 2020-05-29 09:51:14 -07:00
Dustin Carlino
1dd703866f tune montlake polygon slightly to avoid clipping a few roads. i'd like to cover eastlake too with this default map, but the parking situation there will take some work 2020-05-29 08:42:57 -07:00
Dustin Carlino
ad2a216b06 by a miracle of biology, save green lake from being covered in algae 2020-05-29 08:18:17 -07:00
Dustin Carlino
b7790dca40 start doing screenshot diff tests for udistrict and downtown too 2020-05-29 08:00:59 -07:00
Dustin Carlino
8505b3c4ff adjust west seattle and ballard maps 2020-05-28 22:21:34 -07:00
Dustin Carlino
feb7bc6409 adjust downtown boundary. remove redundant caphill and ID [rebuild] 2020-05-28 21:49:44 -07:00
Dustin Carlino
78a38a3fea slightly adjust lakeslice boundary. remove 23rd map. [rebuild] 2020-05-28 21:15:28 -07:00
Dustin Carlino
42a35c736a starting a city region picker 2020-05-28 14:11:34 -07:00
Dustin Carlino
0f8161f006 restore the upper bridge, but mark it under construction 2020-05-27 16:52:39 -07:00
Dustin Carlino
d67e7f4090 less awful bus stop rendering 2020-05-27 15:05:29 -07:00
Dustin Carlino
fe15eae82e add slight border to buildings. makes distinguishing adjacent buildings much easier. 2020-05-26 16:18:02 -07:00
Dustin Carlino
245e4c5c11 fade signal things to show a phase is about to end 2020-05-25 12:40:39 -07:00
Dustin Carlino
f3c5d8a92c grabbing fresh osm; i've been mapping lots of parking [rebuild] 2020-05-24 13:55:07 -07:00
Dustin Carlino
2aebf31669 remove shortcuts feature. UX has issues -- need proper way to edit, delete, reorder shortcuts. never seen clear use case for this. fixes #37, #38, #39 2020-05-24 11:35:52 -07:00
Dustin Carlino
47e6a6b76a clean up old design notes 2020-05-24 11:07:29 -07:00
Dustin Carlino
6bde4d231d working on yuwen's paint select improvements 2020-05-22 14:26:20 -07:00
Dustin Carlino
490df9675c draw islands. in particular, harbord island! 2020-05-21 18:15:48 -07:00
Dustin Carlino
7a7f6f25d9 restore the lower bridge, bus-only. grab fresh osm, with lotsa west
seattle fixes
2020-05-21 17:53:10 -07:00
Dustin Carlino
3dba07e97c detect roads beneath bridges, lower their zorder. adjust min zoom 2020-05-21 16:31:43 -07:00
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