a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-27 15:03:20 +03:00
Code Issues Projects Releases Wiki Activity
7,694 Commits 85 Branches 166 Tags 395 MiB
1df9eb940a
Commit Graph

580 Commits

Author SHA1 Message Date
Dustin Carlino
c019304ee3 A skeleton emerges, from whatever sort of place skeletons lurk 2021-08-03 19:23:28 -07:00
Dustin Carlino
9ccc328361 new release 2021-08-01 15:45:01 -07:00
Dustin Carlino
15da28e4a7
The final touches on the new color scheme: color cycleway intersections green. #74 (#715) 
Regenerate screenshot diff. It's done! [rebuild] [release]
 2021-08-01 13:28:02 -07:00
Dustin Carlino
dad9eeb9a6 Make the 'faded zoom' color scheme the new default day mode! Rename the old day mode to classic. #715 2021-08-01 12:57:46 -07:00
Dustin Carlino
b72b4a2843 Make the signal editor match the simulation view better -- need protected arrow outlines. #715 2021-08-01 12:42:09 -07:00
Dustin Carlino
314bed3d83 Adjust traffic signal editor icons, since they blended into the new grey scheme. #715 2021-08-01 12:36:37 -07:00
Dustin Carlino
49adf8a5ac Adjust traffic signal rendering for #715. 
- outlines around protected arrows too
- draw protected arrows on top of permitted
 2021-08-01 12:12:01 -07:00
Dustin Carlino
506e4f3f73 Simplifying traffic signal rendering code 2021-08-01 12:06:05 -07:00
Dustin Carlino
c2f8f177ea Steps towards the new color-scheme. #715 
- Stop using different colors in the city picker. Just using a uniform
  color, different between day/night, that looks fine in all themes.
- Simplify the methods for road markings; not going to change them based
  on rank
 2021-08-01 09:53:48 -07:00
Dustin Carlino
c71c1b91dc Trying to fix corner curbs and failing, but made some maybe useful geom 
API additions.

And not drawing curbs for footways. #715
 2021-07-31 19:46:37 -07:00
Dustin Carlino
a4906a2953 More flag-guarded color scheme progress towards #715: 
- choosing some building colors
- proper unzoomed road/intersection outlines
- adjusting curb color based on road rank (for arterials, it was the
  same grey!)
 2021-07-28 12:12:01 -07:00
Dustin Carlino
07cce162c1 Experiment with 3 different asphalt colors. #715 2021-07-26 11:42:46 -07:00
Dustin Carlino
27135cabb4 Don't draw buildings on the minimap in the new color scheme. #715 It's too much detail for a small view, and the colors bleed into roads. 2021-07-26 11:37:58 -07:00
Dustin Carlino
743c7ae4f0 Start to turn the 'faded zoom' color-scheme into the emerging Streetcomplete scheme in #715. 2021-07-26 11:31:22 -07:00
Dustin Carlino
8b397c8f15 new release 2021-07-25 14:14:54 -07:00
Dustin Carlino
d015014bbc Better curb rendering near shoulders. Towards the #715 vision. [rebuild] [release] 2021-07-25 13:29:54 -07:00
Dustin Carlino
835e4bf7a7 Iterate on the curb rendering for #715. A simple start to it already happens to exist for an old color scheme experiment. 
Still some issues with shoulders, but improved in many cases.
 2021-07-25 13:08:14 -07:00
Dustin Carlino
1a8eecb2ac Remove old color scheme experiments. They're no longer interesting and just clutter the codebase, making big changes like #715 harder to manage 2021-07-23 19:20:36 -07:00
Dustin Carlino
b45f9e0134
Create new lane types to express different types of buffers for prote… (#704) 
* Create new lane types to express different types of buffers for protected bike lanes. They're only created manually right now, to explore rendering.

* Update planter rendering

* Update planter - simplify

* fmt after merge

* Fixing up existing rendering

* Add curb buffer

* Adjust stripes

Co-authored-by: Robin Lovelace <rob00x@gmail.com>
 2021-07-23 11:31:36 -07:00
Dustin Carlino
3db706e7db new release 2021-07-18 16:13:00 -07:00
Dustin Carlino
f6a94e8a58 Allow DrawWithTooltip to return custom data instead of string labels. 
CloneableAny revived from e35c69f6f3
 2021-07-18 14:14:19 -07:00
Dustin Carlino
3d355f720c Clean up CityPicker code using DrawWithTooltips 2021-07-18 14:14:19 -07:00
Dustin Carlino
d142b4fbd0 Refactor lots of the places walking along a PolyLine with a step size 
Verified no behavioral change using the screenshot test. (Which only had
the driveway diff from b3ce53aa5f)
 2021-07-16 14:17:08 -07:00
Dustin Carlino
e1679998c1 Remove RawFileLoader and use a simple trick to avoid deserialization 
instead. #377

See https://www.reddit.com/r/rust/comments/olodm1/how_to_grab_raw_vec8_bytes_from_serde/? for me explaining the problem and then immediately realizing the fix.
 2021-07-16 13:33:31 -07:00
Dustin Carlino
816ae46943 Copy the file size progress bar to RawFileLoader too. #377 2021-07-16 11:25:27 -07:00
Dustin Carlino
76ecccf54b When loading files on the web, print the received and total file size, 
as a slightly better progress bar. #377
 2021-07-16 11:25:27 -07:00
Dustin Carlino
062f38aca3 Speed up the previous by caching road_to_buildings in Map. 2021-07-15 18:12:15 -07:00
Dustin Carlino
b3ce53aa5f Draw building driveways per zoomed-in road, rather than as one map-wide batch. Otherwise, every single edit to road width needs to redraw all driveways. This doesn't scale with larger maps! 
When zoomed in on just a building but not its road, this means the driveway won't show up until the road is in view. Acceptable trade-off.
 2021-07-15 18:05:04 -07:00
Dustin Carlino
65c5b17002 new release, mid-week 2021-07-14 09:37:31 -07:00
Dustin Carlino
f35538b460 Grab everything from Overpass, so importing from it looks more complete. #523 
Because it's so much faster, make it the default!
 2021-07-12 14:21:33 -07:00
Dustin Carlino
66be29d752 Import a new city using Overpass, instead of Geofabrik + clipping. #523 
The returned XML seems to be missing lots of stuff, but it's much faster
and wasn't hard to wire up. I'll look into fixing the query...
 2021-07-12 14:06:54 -07:00
Dustin Carlino
e750048141 Improve intersection merging workflow by hiding popup msg for successful imports #654 2021-07-11 13:41:29 -07:00
Dustin Carlino
2224dccda9 Add a tool in the main UI to try to merge junctions. #654 
It maintains a JSON file of ways to merge that the importer also uses.
For maps fast to import, this is the nicest workflow. Unlike map_editor,
turns and trimmed roads can also be checked.
 2021-07-11 13:19:00 -07:00
Dustin Carlino
b184ecd409 new release 2021-07-11 10:44:32 -07:00
Dustin Carlino
da704b4546 Extend the parking thought bubbles to handle people climbing steep hills. 
(And some clippy fixes)
 2021-07-10 17:14:10 -07:00
Dustin Carlino
1539091453 Import Loop 101, adding an option to skip local roads to cut down map 
size.
 2021-07-08 10:25:36 -07:00
Dustin Carlino
d1a7ae4418 Start importing a piece of Sao Paulo for a collaboration. 
No elevation data until the next big round of regeneration; having
trouble getting Docker set up on my resurrected machine.
 2021-07-06 10:57:53 -07:00
Dustin Carlino
3db4c827b8 Draw building outlines in unzoomed view also. It's a subtle effect, but important in dense areas like Sao Paulo. 2021-07-06 09:53:13 -07:00
Dustin Carlino
b4c776c0fa new release 2021-07-04 16:33:14 -07:00
Trevor Nederlof
3faf9893a9 Add downtown brooklyn as a nyc map 2021-07-01 12:27:58 -07:00
Dustin Carlino
9f4fac58a7 Workaround a crash trying to render building 4582 in Green Lake, which 
has a short driveway that's crashing make_polygons.

This is more fallout from the f64 serialization change. I don't
understand the root cause yet...
 2021-07-01 10:43:42 -07:00
Dustin Carlino
70a9508415 Change the CityPicker to merge the list of maps and cities from the local filesystem and the manifest. 
This fixes various problems when importing local maps (in new or
existing cities) and getting out of sync with the manifest.
 2021-06-25 19:37:42 -07:00
Dustin Carlino
126c62d6ba Simplify CityPicker logic: just use the optional city.bin to draw districts. Always use the filesystem to create the buttons. 2021-06-25 19:11:37 -07:00
Dustin Carlino
3cda1342ab Fix nondeterminism in z-ordering for lanes, hopefully removing noise from the screenshot diff test. 
(Ideally there'd be no overlapping lanes in the first place, but that's
quite hard)
 2021-06-25 12:29:55 -07:00
Dustin Carlino
1bfcba6165 Avoid crash: 
1) Change the language in a map with lot of options
2) Switch to a map with less language options
3) Open settings panel, trying to create dropdown
 2021-06-23 13:13:43 -07:00
Dustin Carlino
190ee4b08f Fix the path v2->v1 and opportunistic lane-changing costs to heavily penalize cars from using bus lanes. 
This doesn't avoid the aforementioned lane-changing crash, but by manual
inspection, it's keeping cars out of bus lanes.
 2021-06-22 17:47:05 -07:00
Dustin Carlino
8db88d0890 new release 2021-06-20 20:08:06 -07:00
Dustin Carlino
03db0675cc Add a Seattle map covering Green Lake 2021-06-20 10:51:30 -07:00
Dustin Carlino
8f199177f5 Upgrade to Rust 1.53 
- arrays are now iterable directly
- switch to using BTree{Set,Map}::retain!
- a round of clippy
- regenerate scenarios and prebaked data; not sure why, but there's a
  diff
 2021-06-17 23:04:35 -07:00
Dustin Carlino
6cafe017c6 new release 2021-06-13 18:33:11 -07:00
Dustin Carlino
76aba75082 Update links to docs after some reorg in the other repo 2021-06-12 13:38:38 -07:00
Dustin Carlino
d827673ace Periodically free memory in the middle of screenshot test, to avoid 
running out on my current machine. Fixes #671.

Finally regenerate screenshots for the first time in ages... just
blindly accepting everything, because the slightly different screen size
means everything was slightly shifted down.
 2021-06-09 14:31:40 -07:00
Dustin Carlino
60352747bf Get importer and game crates to share dependencies again, by enabling 
some features for transitive deps in each crate.
 2021-06-09 10:21:25 -07:00
Dustin Carlino
889c500eb1 Force geojson to use geo-types feature everywhere. This lets different 
binaries properly share workspace dependencies.

See
https://www.reddit.com/r/rust/comments/nvd6y7/common_crates_in_cargo_workspace_recompiled_due/
for the full story behind this mess.

I'm going to keep repeating this process until I get game and importer
to share dependencies again.
 2021-06-09 09:48:53 -07:00
Dustin Carlino
f39a50a7e5 new release 2021-06-06 15:45:40 -07:00
Dustin Carlino
5127a82b54 Import Tehran 2021-06-01 10:19:06 -07:00
Dustin Carlino
d014098f59 Fix an extremely naive implementation of calculating average angle, 
which was causing bizarre turn lane arrows in Tempe.
 2021-06-01 09:52:40 -07:00
Dustin Carlino
00c3614301 new release 2021-05-31 12:12:13 -07:00
Dustin Carlino
f1aacb04e7 Import Chorlton for a demo 2021-05-24 10:13:09 -07:00
Dustin Carlino
0022837cd0 new release 2021-05-23 12:02:37 -07:00
Dustin Carlino
a6e707eb8a Upgrade more dependencies. 
(Can't upgrade winit yet, because glutin doesn't have a crates.io
release that's caught up)
 2021-05-22 16:36:57 -07:00
Vinzent Steinberg
a1899e29f8
Update dependencies (#656) 
* Update dependencies

* Use github for polylabel, to make all dependencies use geo 0.18, not a mix of 0.18 and 0.17

* Downgrade lyon to avoid a crash

Co-authored-by: Dustin Carlino <dabreegster@gmail.com>
 2021-05-22 16:23:06 -07:00
Dustin Carlino
bbc9adc3b7 Initially import Gilbert, AZ 2021-05-21 12:36:20 -07:00
Dustin Carlino
e876998958 Add new actdev site, Cricklewood in London 2021-05-19 13:35:49 -07:00
Dustin Carlino
1e3ed254a9 Reorganize canvas settings, so that they can actually be saved. #216 2021-05-17 13:12:45 -07:00
Dustin Carlino
1fe60eb8bb Automatically save/restore user settings. #216 
On a best-effort basis, of course. If the format changes, just start
fresh.
 2021-05-17 10:34:13 -07:00
Dustin Carlino
0f06d4d52f Make canvas scroll speed configurable, just like GUI panel scroll speed. 2021-05-17 10:16:44 -07:00
Dustin Carlino
d4e2b25689 Avoid crashing when trying to draw really short turns. Fixes #649 2021-05-17 09:19:00 -07:00
Dustin Carlino
457a50d5ba fix web build 2021-05-16 17:16:55 -07:00
Dustin Carlino
03afb22429 new release -- except for web, fixing that separately... 2021-05-16 17:10:29 -07:00
Dustin Carlino
d6539f7449 Refactor file picker 2021-05-16 10:51:03 -07:00
Dustin Carlino
4f05d818b9 Same FnOnce fix for PromptInput. No effects, but future-proofing I guess 2021-05-16 08:45:22 -07:00
Dustin Carlino
72d0e53fdc Make ChooseSomething take a FnOnce callback, so we can avoid cloning at a few call-sites 2021-05-16 08:41:37 -07:00
Vinzent Steinberg
9d17faa878 Prefer slices over reference to owned type 2021-05-15 14:24:08 -07:00
Vinzent Steinberg
446a21696d
Fix most clippy warnings (#646) 
* More conventional spelling of acronym identifiers

* `new` -> `new_state`

* Remove redundant field name

* Remove needless `collect`

* `to_controls` -> `make_controls`

* Simplify long if statement

* Fix module inception

* Simplify chained if let

* Return directly instead of creating a binding

* Disable clippy warning about `borrow` method

Implementing the `Borrow` trait instead would result in excessive type
annotations.

* Fix most remaining clippy warnings

* Allow clippy::type_complexity

* Fix bad merge from web editor

* Run cargo fmt

* Suppress large_enum_variant warnings

* Rename FYI state to ShowMessage

* Fix upper_case_acronyms warnings

Co-authored-by: Dustin Carlino <dabreegster@gmail.com>
 2021-05-14 17:31:32 -07:00
Dustin Carlino
29c881ffc3 Switch from cargo +nighty fmt to the stable cargo fmt. Whatever edge-case formatting was happening with stable has been fixed 2021-05-14 08:39:51 -07:00
Vinzent Steinberg
fd3b0e2a14
Fix compilation failures and most clippy warnings (#642) 
* abstutil: Fix compilation failure

* map_gui: Fix compilation

* traffic_signal_data: Fix compilation failure

* map_model: Fix compilation failure

* abstutil: Fix doctests

* abstio: Fix most clippy warnings

* abstutil: Fix most clippy warnings

* collisions: Fix clippy warning

* convert_osm: Fix clippy warnings

* sim: Fix most clippy warnings

* geom: Fix clippy warnings

* kml: Fix clippy warnings

* map_model: Fix most clippy warnings

* fifteen_min: Fix clippy warnings

* game: Fix many clippy warnings

* Disable some noisy clippy warnings

* headless: Fix clippy warnings

* importer: Fix clippy warnings

* map_editor: Fix clippy warnings

* map_gui: Fix clippy warnings

* osm_viewer: Fix clippy warnings

* parking_mapper: Fix most clippy warnings

* popdat: Fix clippy warnings

* santa: Fix clippy warnings

* sumo: Fix clippy warnings

* traffic_seitan: Fix clippy warning

* updater: Fix clippy warnings

* widgetry: Fix clippy warnings

* tests: Fix some clippy warnings

* Fix compilation on stable Rust

* Simplify unwrapping

* Make use of `Entry` more readable

* Fix formatting

* Fix code that was broken in the refactoring

* Apply cargo +stable fmt

* Fix code that was broken in the refactoring, second try

* Remove `Default` impls that are equivalent to `new`

* Remove obsolete clippy wrapper

* Avoid turbofish

* Prefer `unwrap_or_else` over allowing `clippy::or_fun_call`

* Remove redundant `into_iter`

* Fix typo

* Prefer `&& false` over commenting code out

* Fix some clippy warnings

Co-authored-by: Dustin Carlino <dabreegster@gmail.com>
 2021-05-14 08:32:56 -07:00
Dustin Carlino
4192f74050 Import Auckland... even though the coastline is a bit missing 2021-05-11 11:55:54 -07:00
Dustin Carlino
5a86a7cef1 Import part of Maryland for a demo 2021-05-10 14:40:53 -07:00
Dustin Carlino
218fa67a69 Use a 0s read timeout for subprocess, now that a fix for Windows is in. 2021-05-06 17:38:16 -07:00
Dustin Carlino
8826af31cb Make the CSV extra shapes parser handle WKT linestrings, so we can 
visualize the GMNS signal timing data easily. #626

And fiddle with the KML viewer UI a bit to make it easier to inspect the
movement polylines.
 2021-05-05 13:40:53 -07:00
Dustin Carlino
93e721c88f new release 2021-05-02 11:41:59 -07:00
Dustin Carlino
d3c035ffb3 Remember the last map loaded, and start the game with that, unless using --dev or some other override 2021-04-30 12:36:24 -07:00
Dustin Carlino
eea136d2ca Import Frýdek-Místek 2021-04-30 12:03:09 -07:00
Dustin Carlino
5186957ce4
Store a generic type in the Spinner widget. (#631) 2021-04-29 11:35:22 -07:00
Dustin Carlino
b235c0d0bb Organize the per-country city picker UI by alphabetical rows. Quick idea from today's UX session. 2021-04-28 17:19:09 -07:00
Dustin Carlino
71e559b6d5 Compress all of the road edits when we confirm, same as the signal editor. And add a cancel button. #597 2021-04-27 17:54:36 -07:00
Dustin Carlino
f495444c42 Consolidate the actdev import script into one step, and import 8 new 
sites
 2021-04-27 13:13:14 -07:00
Trevor Nederlof
024ea50b72
Add Milwaukee (#625) 2021-04-26 18:54:42 -07:00
Dustin Carlino
8ab2d38a97 Don't let the UI map downloader get out of sync with the updater's config 2021-04-26 14:17:19 -07:00
Dustin Carlino
d558518518 new release 2021-04-25 10:04:06 -07:00
Dustin Carlino
050cdacdda Fix running subprocesses on Windows by adjusting the timeout. Closes #623 
Thanks to Kobata on Discord!
 2021-04-24 17:51:28 -07:00
Dustin Carlino
bc591c1b5f Plumb back the widget name in Outcome::Changed 2021-04-22 13:09:32 -07:00
Dustin Carlino
babdc9e384 Let TextBox know its own name, and clean up the API for creating them 2021-04-22 13:09:32 -07:00
Dustin Carlino
ff039f017a Let Spinner know its own name 2021-04-22 13:09:32 -07:00
Michael Kirk
fa40e7c968 make stop signs more red at night 2021-04-22 12:59:37 -07:00
Dustin Carlino
38f5da4f80 Make the native download progress screen show how many files are left. 2021-04-21 17:01:51 -07:00
Dustin Carlino
3b9a7cfa1f Add a basic per-file progress bar for native downloads! 2021-04-21 17:01:51 -07:00
Dustin Carlino
d644bf3b5f Debug tool to change color schemes without recompiling 2021-04-20 17:03:55 -07:00
Dustin Carlino
4212b200d1 Download city.bin if needed 2021-04-20 16:18:21 -07:00
Dustin Carlino
a2f08dcc52 Fix huge_seattle data pack issue introduced a few commits ago 2021-04-20 16:10:17 -07:00
Dustin Carlino
ee78644089 Download files before starting a challenge mode or Santa level, if needed 2021-04-20 16:10:17 -07:00
Dustin Carlino
8f70f9f9e9 In the city picker, list all cities from data/MANIFEST, whether or not they exist locally. Prompt to download when needed. 2021-04-20 16:10:17 -07:00
Dustin Carlino
1b5f0f14a8 Just rewrite some color scheme entries in hex to copy/paste easier 2021-04-20 16:01:18 -07:00
Dustin Carlino
21bfb801d3 Import Hiroshima 2021-04-20 07:58:38 -07:00
Dustin Carlino
faaa4162fa Async map downloader for native, using the existing FutureLoader. Can 
only print progress to the console, not the loading screen.
 2021-04-19 17:55:42 -07:00
Dustin Carlino
da13b8b683 Download only the cities specified in the UI map updater. 2021-04-19 17:55:42 -07:00
Dustin Carlino
7176994a87 Refactor CarID to be a struct, not a tuple 
And regenerate prebaked data from a few commits ago
 2021-04-19 15:16:48 -07:00
Dustin Carlino
bc2a21ca89 Refactor some methods in Traversable 2021-04-19 14:50:51 -07:00
Dustin Carlino
6380bd74ec Refactor a concept of per-trip Problem. #600, #170 
The simulation analytics tracks problems per trip. The previous
measurements for delay at intersections is one case, and the new
cyclist-crossing-large-interection event is another. I removed the lane
speed measurement, since it's kind of redundant with the delay.

Consolidated the reporting in the trip info panel / drawn on the route.
 2021-04-19 11:40:39 -07:00
Dustin Carlino
4e1822be59 new release 2021-04-18 09:25:35 -07:00
Dustin Carlino
33d1cbee47 Prep for [release] [rebuild] 2021-04-18 08:37:55 -07:00
Michael Kirk
0697e1f649 make minimap fixed size 
On very large windows, the minimap felt a little weird.

Plus, looked weird on very short windows, since we were only considering
width, not height,

Now that layout is all in logical pixels, we're more likely to get
reasonable layout using "fixed-size" components, and only judicious use
of components that scale with the window.
 2021-04-15 19:22:37 -07:00
Michael Kirk
bc3a121cd6 introduce --minimal_controls option for screen recordings 2021-04-15 19:22:37 -07:00
Dustin Carlino
d41482febd Fix running external tools on Windows [rebuild] [release] 2021-04-15 11:29:29 -07:00
Dustin Carlino
79fdf01690 Remove the fade overlay from the tutorial. It makes some of the arrows pointing at stuff hard to see. If we just use it on message screens without an arrow, it looks odd to appear/disappear. 
Also prep a mid-week [rebuild] [release]...
 2021-04-14 13:05:54 -07:00
Dustin Carlino
ae6414abd5 Rename building path->driveway, since path is such an overloaded term. 2021-04-13 15:13:36 -07:00
Dustin Carlino
9923c1270a Repair parking lot connections after road widening. #597 2021-04-13 15:13:36 -07:00
Dustin Carlino
b9a9e8e5c5 Redraw building paths when needed 2021-04-13 15:13:36 -07:00
Dustin Carlino
a649e0be77 Repair building connections after road widening. #597 
Don't redraw the paths yet, or try to deal with failures to snap.
 2021-04-13 15:13:36 -07:00
Dustin Carlino
7852e1d2b8 Import scenarios from grid2demand's input_agents.csv directly from the UI! #603 [rebuild] 
For reference, the input_agents.csv -> abst input is ported from
https://github.com/asu-trans-ai-lab/grid2demand/blob/main/src/demand_to_abst_scenario.py
 2021-04-13 13:39:50 -07:00
Dustin Carlino
d5dfce6267 The docker output wasn't getting plumbed through the UI logging. #82 2021-04-13 10:38:34 -07:00
Dustin Carlino
096acd1fea Properly interleave stdout and stderr when running the importer from the UI, for #602 and #82. 
This makes the logs understandable and should fix the issue where the
last line of one_step_import's output is sometimes a warning instead of
the map name.
 2021-04-13 10:07:56 -07:00
Dustin Carlino
462baddf17 Robustify running the importer from the UI, for #602 and #82: 
- Echo process output to the main UI's stdout, for easier debugging
- Remove the timing breakdown from elevation import, since it breaks
  when the function bails out early
 2021-04-13 09:45:48 -07:00
Dustin Carlino
a5f56e6011 new release 2021-04-11 10:14:27 -07:00
Dustin Carlino
417850cbed Import a part of Singapore 2021-04-11 08:44:49 -07:00
Dustin Carlino
6b30bffc43 Recreate the road in the quadtree when modifying width. #597 2021-04-10 11:56:05 -07:00
Dustin Carlino
4a0635fa5a Refactor: Just remember ID -> quadtree ID 2021-04-10 11:56:05 -07:00
Dustin Carlino
10255c2835 Recalculate intersection geometry when road width changes. #579 
No effect on the road geometry yet, though...
 2021-04-10 11:56:05 -07:00
Dustin Carlino
169d3765dd Fix a crash where you edit one lane normally, then add/delete lanes of the same road. #597 2021-04-09 14:39:30 -07:00
Dustin Carlino
e8b7019ef7 Use LaneSpec in map edits, letting width of each lane be modified too. #597 2021-04-09 14:35:49 -07:00
Dustin Carlino
14609ab157 Fix lane geometry after changing the number of lanes. #597 2021-04-09 14:35:49 -07:00
Dustin Carlino
584c1be9e0 A humble start to deleting lanes. #597 2021-04-09 14:35:49 -07:00
Dustin Carlino
c6906f6153 Change Vec<Lane> to BTreeMap<LaneID, Lane> to prepare for 
adding/deleting lanes. #597

Not regenerating all maps yet. Haven't evaluated performance impact yet.
 2021-04-09 14:35:49 -07:00
Dustin Carlino
2a89b68121 Create a temporary dev-only UI for modifying the number of lanes in a road. #597 
It crashes when actually trying to change the number of lanes, as
expected.
 2021-04-09 14:35:49 -07:00
Dustin Carlino
196af2a1f4 Refactor: store Direction for a Lane, simplifying Lane->DirectedRoadID. #555 2021-04-06 17:03:24 -07:00
Dustin Carlino
1e3708f9b4 Remove UberTurnGroup and the prototype of editing a cluster of traffic 
signals using uber turn groups. #555

This was an old half-baked experiment for handling a cluster of traffic
signals.  Since then, merging intersections (by manually tagging them in
OSM for now, maybe automatically in the future) has proven better.

Removing this old code in preparation for pathfinding v2.
 2021-04-05 10:05:27 -07:00
Dustin Carlino
ae66457a5e new release 2021-04-04 16:59:01 -07:00
Dustin Carlino
437d3eb064 Throttle rendering when running the one_step_importer from the UI. We spend more time drawing the progress than downloading, otherwise. #523 2021-04-04 09:39:03 -07:00
Dustin Carlino
df7d1080d9 Update trip start/end icons 2021-04-03 11:26:01 -07:00
Michael Kirk
4f81f186af
embed mode and reworked web build system (#592) 
* root element id from Settings, respect element size

* Plumb assets root via settings

* adapt crates to new wasm api

* more FileLoader cleanup

* use tsc bin from node_modules

* avoid spurious unlink errors

GNU Make considers the src/*/wasm_pkg targets as intermediate build
files and attempted to `rm` them. We can stop that my marking them as
`.PRECIOUS`

https://www.gnu.org/software/make/manual/html_node/Special-Targets.html

* `open` doesn't work on Linux

We could do something with xdg-open, but meh, not worth having platform
dependent logic for this.

* fix typo, clarify instructions

* make server compatible with older python install on linux

* revert change - we dont want to include music on web

the leading "-" means exclude a subdir of an included dir.

* better wrap of comments

* fix misfire in copy/pasted comment

* update docs
 2021-04-01 19:31:02 -07:00
Dustin Carlino
7f4f83d4e0 Refactor all of the places drawing start/goal markers on the map, and actually line up the tip of the icon with the position. 2021-03-31 14:23:16 -07:00
Dustin Carlino
371d459c8b new release 2021-03-27 16:09:36 -07:00
Dustin Carlino
fac9f8159d
Change the color scheme of the steep streets layer. #82 (#588) 2021-03-25 16:44:32 -07:00
Dustin Carlino
c1ac3cf39d Make Polygon::from_geojson preserve rings. This fixes the WIP elevation contours. #82 2021-03-25 15:15:53 -07:00
Dustin Carlino
ce473928fa Use u64 to describe number of bytes in the Manifest, now that we have a massive GeoTIFF in there that breaks wasm's 2^32 usize limit. #586 2021-03-24 21:23:38 -07:00
Michael Kirk
e672256828
Import screen UI fixups (#584) 
* Import screen UI fixups

- even out the spacing a bit
- use underline style for "Alternate Instructions" web link
- left/right switch is more intuitive than right/left
- disambiguate label from toggle id
 2021-03-23 15:11:14 -07:00
Dustin Carlino
162f09a887 Import Tripoli for WeCode Libya, also adding an Arabic font 2021-03-23 06:51:47 -07:00
Dustin Carlino
c68d0fdc6b new release 2021-03-21 11:47:54 -07:00
Dustin Carlino
0572a5118b Add a map covering the north end of Cambridge. Also grab fresh OSM for the Great Kneighton map, at least fixing the crazy geometry at Portugal Place. cyipt/actdev#151 [rebuild] [release] 2021-03-21 11:24:33 -07:00
Michael Kirk
af079c24e6 rename txt.add -> txt.add_line 2021-03-19 17:48:30 -07:00
Dustin Carlino
58ee3175ac Add a new Seattle map focused on the Arboretum, for #574, along with 
prebaked data for the baseline (because it doesn't gridlock, without any
interventions needed!) and a proposal for opening up Broadmoor.
 2021-03-19 17:24:11 -07:00
Michael Kirk
affd582093 more concise Text / tooltip() 2021-03-19 16:48:54 -07:00
Dustin Carlino
d7b7c2d7cd Import a slice of London along the A5, including scenario data. It 
gridlocks, of course.  #577
 2021-03-19 15:51:43 -07:00
Dustin Carlino
edfb745bb2 Change the default color scheme to day mode. Behaviorally, this rolls out the change for the OSM viewer, 15m app, parking mapper, and map_editor. 2021-03-19 15:26:35 -07:00
Michael Kirk
bf52a84956 Fix crash when viewing settings in osm_viewer 
Longer term I think we should default to day_theme for all widgetry apps.
That will be easier if we can get rid of pregame theme all together, but
that requires re-styling the pre-game screens (which we want to do, but
that will take time).
 2021-03-19 11:03:40 -07:00
Michael Kirk
546599e4f9 Replace ButtonImage with Image 2021-03-17 19:06:43 -07:00
Dustin Carlino
24a60b0b29 Import Tempe, AZ for collaboration with ASU 2021-03-17 10:55:04 -07:00
Michael Kirk
264f1f939f minimap controls: agent toggles and meters into one row 
Some ancillary changes:

Made the GeomBatchStack public and extracted the ImageSource
functionality from ButtonBuilder to Image.
 2021-03-16 18:28:50 -07:00
Dustin Carlino
2e7d6eeb34 Fix the progress bar in the UI; now the line-rewriting more or less 
works! #523
 2021-03-16 18:08:58 -07:00
Dustin Carlino
77709a24d6 Refactor a method to asynchronously download a file on native, with a simple progress bar. #523 
Use it in the updater and all the importer tools. Only place it's not
used yet is parking_mapper and the in-game updater.  [rebuild]

Also make the RunCommand state understand the control code for erasing
the current line. It... sort of works.
 2021-03-15 19:51:45 -07:00
Dustin Carlino
359960c1db Prepare the new map importer to work in the release. [rebuild] 2021-03-15 14:16:18 -07:00
Dustin Carlino
c0e49f815f Make the UI load the newly imported map, scraping its name from the other tool. #523 
For this to work, RunCommand has to be much more careful about getting
all output when the command is done.
 2021-03-15 13:54:14 -07:00
Dustin Carlino
f87c1c3b1b Manage the temporary files in the importer better, and don't re-download 
pbf. #523

But now we don't know which map to switch to in the UI!
 2021-03-15 11:43:06 -07:00
Dustin Carlino
04e0e2aa02 Cache the geofabrik index file in data/input/shared. #523 2021-03-15 10:58:11 -07:00
Dustin Carlino
a8b72691dc new release 2021-03-14 20:39:56 -07:00
Dustin Carlino
edf3914e4d Disable the new map importer for this week's release; it's not ready yet. [rebuild] [release] 2021-03-14 17:43:18 -07:00
Dustin Carlino
be4935a316 If the map was imported successfully, switch to it. #525 2021-03-13 15:43:10 -08:00
Dustin Carlino
014d3184cc Use the subprocess crate to nonblockingly read output from a command. #523 2021-03-13 14:49:01 -08:00
Dustin Carlino
1477262f69 Just split out RunCommand. #523 2021-03-13 14:04:21 -08:00
Dustin Carlino
42a3852784 Actually, we can show command output just fine. The problem was trying 
to render text with embedded newlines. #523
 2021-03-13 13:49:33 -08:00
Dustin Carlino
944b2c337a Get the importer UI working finally! #523 
Improved the target dir finding, and hacking around some of the command
output not rendering.
 2021-03-13 13:41:34 -08:00
Dustin Carlino
4e665b6214 Run the one-step importer from the UI. Don't attempt a proper loading 
screen yet. #523

Not working yet; one_step assumes paths to binaries, and it's now wrong.
 2021-03-13 13:33:27 -08:00
Dustin Carlino
c252e4a82d Grab GeoJSON from the system clipboard on native. #523 2021-03-13 12:54:14 -08:00
Dustin Carlino
607ccd0e78 Start a native-only UI to run the one-step importer. #523 2021-03-13 12:41:44 -08:00
Dustin Carlino
7920d7d496 Recalculate the minimap panels as sim time changes, now that agent counters live there. #558 2021-03-12 17:48:35 -08:00
Dustin Carlino
59e9735318 Force actdev top panels to have the same height. #551 2021-03-12 17:48:35 -08:00
Dustin Carlino
69b248cd66 Move agent counters to the minimap, removing the top-right agent panel entirely. #551 
Adjust the tutorial for these changes.
 2021-03-12 17:48:35 -08:00
Dustin Carlino
8ac62fed47 Trying out some UI changes suggested by Martin: 
- Increase day mode panel opacity to 95% to help text legibility
- Combine the time/speed panels, and remove the sunrise/sunset icons
- 4 mode colors matching actdev, also changing night mode residential
  buildings
 2021-03-12 17:48:35 -08:00
Dustin Carlino
72418ee6b6 Change the loading screen sidebar to list things the player ought to go try. Previously it was meant to be recent changes, but it's way too much work to also update that every few weeks. 2021-03-11 12:33:17 -08:00
Dustin Carlino
8be24bf007 Use AsRef<str> in more widgetry methods, getting rid of &format at many 
call-sites. #253

To make some of these work, changed Label to store a String. Ultimately
it gets transformed into Text, so we need to allocate eventually.
 2021-03-11 11:29:18 -08:00
Dustin Carlino
9c2c8bbd8f Change some uses of Into<String> to AsRef<str>, to avoid allocations. #253 
I manually audited all uses. I kept Into<String> when we really do wind
up storing a String.
 2021-03-11 11:29:18 -08:00
Dustin Carlino
f0b522f89a Figure out which files are in the us/huge_seattle DataPack more consistently. This'll now work from the proposals screen. 2021-03-10 12:40:55 -08:00
Dustin Carlino
fdc6601520 Prompt the user to download missing cities from the Proposals screen, too. 2021-03-10 12:10:16 -08:00
Dustin Carlino
65d7bc5c8e Rename {Text,TextSpan}::draw to into_widget, for consistency. #253 2021-03-09 09:59:30 -08:00
Dustin Carlino
a4a20ce1e5 draw_text renamed to text_widget, for consistency. #253 2021-03-09 09:56:41 -08:00
Dustin Carlino
b0bcdb2115
Replace Widget::draw_batch with batch.into_widget, for consistency. #253 (#554) 2021-03-09 08:55:12 -08:00
Dustin Carlino
ead636549c new release 2021-03-07 17:07:25 -08:00
Dustin Carlino
42bd63e79b Lift URL and viewport code from game to map_gui. Also use it for OSM viewer and the 15min tool. 2021-03-04 13:22:09 -08:00
Dustin Carlino
dd42acdc28 Refactor a CityName::seattle() 2021-03-03 18:08:06 -08:00
Dustin Carlino
006ae01216 Move 4 Seattle maps into the us/huge_seattle category to reduce the size 
of the binary releases. [rebuild]

Handle this special case in the city picker UI, prompting the player to
do the extra download. NOT yet handling the same for the community
proposal screen -- player will just see a missing file error.
 2021-03-03 18:03:15 -08:00
Dustin Carlino
0c12948c86 Also grey out unhighlighted people when zoomed in. #539 2021-03-02 12:03:26 -08:00
Dustin Carlino
17e2f485b4 Add support for highlighting certain people in the simulation. For now, 
mark random people as highlighted when background traffic is active for
actdev. #539

This changes the unzoomed rendering to "fade out" unhighlighted people.
Next up, similar change for zoomed, info panels, and trip tables.
 2021-03-02 10:46:21 -08:00
Dustin Carlino
51386d19db new release 2021-02-28 10:43:06 -08:00
Dustin Carlino
4d048d83bd A few misc fixes after the grand button/color refactor: 
- Always draw traffic signal stage numbers as white, even in day mode
- Always draw loading screen text as white, in any theme
- Double the scrollbar thickness from 4px to 8px (still way thinner than
  the original design)

[rebuild] [release]
 2021-02-28 10:31:00 -08:00
Michael Kirk
86799e2832 Remove StyledButtons - instead implement everything on the individual 
ButtonStyle
 2021-02-27 21:08:26 -08:00
Michael Kirk
cee0e5dbbd Use btn_primary.* methods instead of btn_primary_* 2021-02-27 21:08:26 -08:00
Michael Kirk
87a1a3f027 fix outline for spinner (without crashing!) and cache drawable 2021-02-27 15:29:03 -08:00
Dustin Carlino
bce3318605 Import halsnead for actdev. It needed a fix to not treat access=private 
as a no-through-traffic zone for light rail tracks!
 2021-02-27 14:35:26 -08:00
Michael Kirk
1e75352ce0 Theme section bg 
`Widget::outline` takes OutlineStyle
 2021-02-27 13:13:41 -08:00
Michael Kirk
bcba72cddf enable new day theme, but retain legacy theme for pregame 2021-02-26 16:30:14 -08:00
Michael Kirk
4b2f3888ed replace btn_solid w/ primary/outline as appropriate 2021-02-26 14:05:19 -08:00
Michael Kirk
f5b52073fc shade dropdown/text-fields in night mode 
Consistent with other themes, fields in night mode should be distinct
from the panel color, a shade darker.
 2021-02-26 14:05:19 -08:00
Dustin Carlino
fb78ec19cd Use Noto font, not ZCOOL, because it has a full set of Chinese glyphs 2021-02-25 18:06:34 -08:00
Michael Kirk
3019a6fff1
Introduce Image component to handle themed icons (#537) 2021-02-25 18:06:19 -08:00
Michael Kirk
46593b01ed theme text field (and fixup layout) 2021-02-25 17:42:04 -08:00
Michael Kirk
abf9a9ade1 STOP sign should always be white text 2021-02-25 17:42:04 -08:00
Dustin Carlino
357ba15afe Add back the zcool font so the Taipei map renders names. But this time, asynchronously load the font instead of bundling it in system assets and increasing the .wasm size. #535 
Temporarily take on some technical debt with the new RawFileLoader...
 2021-02-25 15:25:47 -08:00
Dustin Carlino
e0fd8dd369 Import Taipei! 2021-02-25 09:21:45 -08:00
Dustin Carlino
6bfa569923
Support changing fonts in the middle of a line. Use this to draw numeric (#533) 
IDs in the status bar as bold, not red.
 2021-02-25 08:57:42 -08:00
Michael Kirk
a085db301b theme minimap controls 
Easier to style as a normal image button
 2021-02-24 20:17:18 -08:00
Michael Kirk
ac30774b06 theme dropdowns and menus 2021-02-24 18:10:06 -08:00
Michael Kirk
c6d361c4b0 remove take_menu 2021-02-24 18:10:06 -08:00
Dustin Carlino
fa515054fb lcid was missing a friendly map name 
and adjust the elevation query format
 2021-02-24 17:26:23 -08:00
Michael Kirk
d774aeae44 rename toggle/checkbox 2021-02-24 14:59:47 -08:00
Michael Kirk
3ab7fc4361
Fix tooltips and hotkey for day-theme (#528) 2021-02-24 10:52:57 -08:00
Michael Kirk
1387a8c11f
Text gets default color from Style (#526) 2021-02-23 19:30:50 -08:00
Dustin Carlino
9eea3c9247 Draw corners where shoulders and sidewalks meet more carefully. 2021-02-23 14:20:59 -08:00
Dustin Carlino
0344e51170
Merge pull request #525 from a-b-street/prefetch 
Make a web loader that can 'prefetch' abst in the background. cyipt/a…
 2021-02-23 13:34:55 -08:00
Dustin Carlino
4c97687a5b Make a web loader that can 'prefetch' abst in the background. cyipt/actdev-ui#15 2021-02-23 11:45:39 -08:00
Michael Kirk
a3ecffbb44 Temporary fix for day-theme inner panels legibility 
Apparently we had two different ways of styling inner panels - compare
the info panels with the settings panel.

I intentionally consolidated to a single style, since that's where we
want to be but it made the info panel contrast to low. For now I'm
preferring to use the legacy "info-panel" style for inner panels
everywhere, meaning we'll temporarily lose the cute section backgrounds
in the day-theme settings panel, but retain legibility everywhere.
 2021-02-23 11:39:58 -08:00
Michael Kirk
62a433ed8d btn_solid_panel is the same as btn_solid 2021-02-23 10:17:49 -08:00
Michael Kirk
dde3ca9f67 rethink rename... keep Style.ButtonStyle, rename button::ButtonStyle->ButtonStateStyle 2021-02-23 09:56:58 -08:00
Michael Kirk
e6ed2e67de Collapse button styles to be theme specified (no visible changes). 
Button colors are now determined by the color scheme, but for now all
schemes are hardcoded to use the same "night" button colors. Read on for
rationale...

Previously, which button colors to use (dark/light) was specified inline
while building the UI.

Eventually we want to live in a world where color scheme determines:
- panel colors
- button colors
- text colors

The theme could already choose panel colors easily enough, but because
the buttons and text were not determined by theme, choosing anything
other than a black or dark grey panel color makes the buttons and text
unreadable.

This PR tackled the themeable "button colors" portion, but all themes
continue to use the "night" colors for now, because using the actual
"day" colors would still make the text unreadable.

next up: themeable text!

The one intentional regression is within the pregame tutorial,
which has always been styled differently from the rest of the app. An
expeditious hack has caused the prev/next/continue buttons to lose their
visible hover state. I'll restore this upon completing the day theme
work.
 2021-02-23 09:52:33 -08:00
Dustin Carlino
81dd5740e6 Import Mt Vernon 2021-02-22 09:41:10 -08:00
Dustin Carlino
c5056fd135 new release 2021-02-21 10:38:19 -08:00
Dustin Carlino
5139a88a66 Also sort city districts by zorder when creating them from many maps. Noticed this issue in Leeds. 2021-02-19 10:26:51 -08:00
Dustin Carlino
9e83823620 When a city is missing a city.bin, just list files to discover districts. Better experience after importing a oneshot map. 2021-02-18 15:07:08 -08:00
Dustin Carlino
aefefedee9 Don't crash when we're missing a country flag. Discovered for oneshot 
imports (which wind up in the dummy zz country code)
 2021-02-18 14:55:15 -08:00
Dustin Carlino
6673521ee9 Import Wynyard, now that the pathfinding bug is fixed. 2021-02-17 15:45:36 -08:00
Dustin Carlino
c87940a858 Fix an issue with a6dfc95aa9: districts in a city are ordered in a z-order friendly way 2021-02-16 14:52:47 -08:00
Dustin Carlino
1fa57a1e17 Import Charleville-Mézières. So many new places from Twitter! 
Few workarounds based on importing crashes found.
 2021-02-15 16:35:24 -08:00
Dustin Carlino
f55a40e3df Import Rostock 2021-02-15 14:33:17 -08:00
Dustin Carlino
a6dfc95aa9 Improve city picker UI: 
- stop color-coding the buttons
- highlight the district when hovering on a button (broken recently)
- sort the districts
 2021-02-15 13:02:29 -08:00
Dustin Carlino
6d2cfa5750 Don't list a country in the city picker if there's nowhere different to navigate to there. 2021-02-15 12:03:06 -08:00
Dustin Carlino
7c3ced6401 Import 10 more actdev sites. Start a script for importing Robin's 
scenario JSON, but don't run it yet.
 2021-02-15 11:06:28 -08:00
Dustin Carlino
e8d1a4bb0d Import Anchorage 2021-02-14 17:21:02 -08:00
Dustin Carlino
9b1b9f467e new release 2021-02-14 14:31:04 -08:00
Dustin Carlino
48bf0e504d Fix a rendering crash that's hard to reproduce. #514 [rebuild] [release] 2021-02-14 14:12:34 -08:00
Dustin Carlino
4a231ac298 Fix crash in minimap with clamp() 2021-02-14 14:05:17 -08:00
Dustin Carlino
e2c648b597 Show each country's flag in the picker UI! #326 2021-02-14 11:49:34 -08:00
Dustin Carlino
482c3e8600 Use country names in the UI, not the codes. #326 2021-02-14 11:12:01 -08:00
Dustin Carlino
864bfacb30 Break down cities by country in the city picker UI. #326 2021-02-14 11:08:14 -08:00
Dustin Carlino
dbd62b5ea6 Fix the in-game map downloader, and "region"->"district" in the city 
picker UI. #326
 2021-02-14 10:30:04 -08:00
Dustin Carlino
39f5d50fcd The grand country split. #326 
City names are now disambiguated by a two-letter country code. This
commit handles almost everything needed to make this transition. Main
next steps are fixing up map edits automatically and making the city
picker UI understand the extra level of hierarchy.

A little bit of fallout: lakeslice gridlocks again; this regression is
actually from the recent traffic signal changes, but I'm just now
regenerating everything. Will fix soon.
 2021-02-13 15:45:59 -08:00
Dustin Carlino
2f0029daef Import 7 more actdev sites, since cyipt/actdev#77 is fixed 
poundbury is missing files, and halsnead had some issue with the
boundary, will look into it later.
 2021-02-12 13:30:59 -08:00
Dustin Carlino
48430f5979 Import more actdev sites, using better automation. cyipt/actdev#65 2021-02-11 16:32:27 -08:00
Dustin Carlino
e28b66cb5c Use a larger hitbox for selecting pedestrians and bicycles. 2021-02-11 15:09:58 -08:00
Dustin Carlino
21573e09f1 Delete all of the actdev maps. I'm going to do this over again and just 
use the site name as the city, instead of picking the "closest" major
city. This is introducing too much friction in automation.
cyipt/actdev#65

There will be a few awkward results -- cambridge gets renamed, and lcid
gets disassociated from leeds. Worth it for now.
 2021-02-11 14:27:28 -08:00
Dustin Carlino
6e7a91ada1 Upgrade to Rust 1.50. Use the new f64 clamp instead of our own. [rebuild] 2021-02-11 10:32:13 -08:00