Commit Graph

585 Commits

Author SHA1 Message Date
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