a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-26 16:02:23 +03:00
Code Issues Projects Releases Wiki Activity
6,186 Commits 85 Branches 166 Tags 395 MiB
463c48411a
Commit Graph

6186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fe8971977b Delete the script used to help migrate city naming. #326 2021-02-13 18:39:05 -08:00
Dustin Carlino
1d9c29bce8 Refactor the collision importing for leeds and london. #326 2021-02-13 18:36:51 -08:00
Dustin Carlino
bc2767b89e Refactor lots of places that construct paths to the data/input dir, which is always organized by city. This would've made the previous change way easier. #326 2021-02-13 18:30:01 -08:00
Dustin Carlino
52ca5f5ede Fix lakeslice gridlock with a manual signal policy at 23rd/Rainier. 2021-02-13 17:44:34 -08:00
Dustin Carlino
0f1c30a889 Exclude collisions.bin from KML viewer; it's not KML anymore. 
And fix a crash on the challenges screen by not considering the actions
of inactive buttons to count as duplicates.
 2021-02-13 17:06:06 -08:00
Dustin Carlino
65b1f24d5d Automatically patch edits using the old MapName. And fix the 3 
built-in proposals. #326
 2021-02-13 17:01:24 -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
3685f7b18a
Cache the list of nearby intersections to wake up for uber-turns. #497 (#513) 
This shouldn't have any behavioral change.
 2021-02-12 22:12:46 -08:00
Dustin Carlino
d6ba8e92af Make a script to procgen houses for all actdev sites that seem to need it. Run it for all of em! 2021-02-12 16:53:59 -08:00
Dustin Carlino
a938b9c1e2 Move building procgen to a standalone tool. 2021-02-12 16:28:15 -08:00
Dustin Carlino
c43af59004 Change the building procgen algorithm to just use the Map, now DrawMap. Preparing to move it into the import phase, where we won't be able to generate the DrawMap. 2021-02-12 16:06:49 -08:00
Dustin Carlino
9b966205c9 Delete redundant implementations of min and max for geom types. They get it for free by implementing Ord. 2021-02-12 15:22:27 -08:00
Dustin Carlino
8d0718d37d
On the web, modify the current URL as we change maps and scenarios. (#509) 2021-02-12 15:14:09 -08:00
Dustin Carlino
03538faf3f
A few traffic signal cleanups: (#512) 
- Stop alerting when slow pedestrians can't make it through the minimum
  crosswalk time
- Simpler iteration style in lagging_green.rs
- Totally delete the old brute force signal config code; it never worked
  well, and the improved heuristics eliminate the need for it anyway
- Make a Duration::max function and use it in one case
 2021-02-12 15:10:32 -08:00
Dustin Carlino
aacc0fa4d5 Fix a crash that happens when you load edits that transformed a stop 
sign into a traffic signal.

And fix a few cargo fmt issues
 2021-02-12 13:47:10 -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
Bruce
6cb4cea624
Ts refactor (#511) 
* Create module from make/traffic_signals.rs

Most things are in mod.rs, lagging_green and brute_force are moved into their own .rs files

* pull more into brute_force.rs
 2021-02-11 18:24:17 -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
c21901e744 Make the importer figure out all cities to regenerate by looking at the config directory. #326 2021-02-11 15:51:52 -08:00
Dustin Carlino
1e635d682d Generate an updater config file to opt into everything. When I import new places, I need to personally run this, or I'll erase my own imports later. 2021-02-11 15:45:42 -08:00
Dustin Carlino
46caf98779 When selecting pedestrians or bicycles, pick the one closer to the cursor. 2021-02-11 15:09:58 -08:00
Dustin Carlino
e28b66cb5c Use a larger hitbox for selecting pedestrians and bicycles. 2021-02-11 15:09:58 -08:00
Dustin Carlino
4c1d610e4f Restore screenshots for Great Kneighton 2021-02-11 15:09:06 -08:00
Dustin Carlino
e32a576237 Reimport the sites that were there before, but under the new naming. 
cyipt/actdev#65

(No procgen buildings for any of them yet)
 2021-02-11 15:00:40 -08:00
Dustin Carlino
fd73166292 Prep to import actdev again, and fix build break in game/src/lib 2021-02-11 14:35:32 -08:00
Dustin Carlino
dd9ddb6e45 Forgot the importer configs... 2021-02-11 14:30:41 -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
Bruce
121377467a
Lagging green (#510) 
Add a template for lagging green

Lagging green is variable. Crosswalks are also variable.
convert_to_ped_scramble() is refactored to allow a call that doesn't promote yield to protected; as this could unintentionally extend a variable phase.
 2021-02-11 13:21:26 -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
Dustin Carlino
e333838560 If you start with --dev and wind up on an empty map, time starts at 6am. When you load another empty map, do the same and jump to daytime. 
There is a little inconsistency still: say you're simulating a scenario
(starting at midnight). If you change the scenario to none, it'll stay
night, but if you then change maps, it'll jump to day.
 2021-02-10 14:10:42 -08:00
Dustin Carlino
a5091a4f18 Clean up unused ctx param from SandboxMode::async_new and simple_new 2021-02-10 14:03:06 -08:00
Dustin Carlino
a5bfa55c8e Create a tool to find the geofabrik osm.pbf file covering a particular region. Inspired by https://github.com/ropensci/osmextract. This will make importing more maps much easier, especially for cyipt/actdev#65. 2021-02-10 12:35:59 -08:00
Dustin Carlino
789b300963 Add an about button to the blog gameplay mode. cyipt/actdev#66 2021-02-10 10:48:52 -08:00
Dustin Carlino
b38b7da8bb Add a 'blog' gameplay mode, which disables going back to the title screen, switching maps, etc. cyipt/actdev#66 2021-02-10 09:52:26 -08:00
Dustin Carlino
7c0bac236a Bring in study areas for all actdev sites. Automatically show them when launching in actdev mode. cyipt/actdev#65 2021-02-10 08:35:08 -08:00
Dustin Carlino
3b893302ed Support fractional zoom levels in --cam, like 16.35/51.607943/-1.261117 2021-02-09 19:41:35 -08:00
Dustin Carlino
7f7b361836 And add all the new maps to the deploy_actdev script. This'll get less awful when I start namespacing cities by country too. 2021-02-09 16:29:31 -08:00
Dustin Carlino
a6fc030db4 Add a CLI flag 'router' to map actdev site name to the map name. For https://github.com/cyipt/actdev/issues/28 2021-02-09 16:14:34 -08:00
Dustin Carlino
1b1a4e99c7 Adjust procedurally generated building setback. Generate for most of the suburban actdev maps. https://github.com/cyipt/actdev/issues/65 2021-02-09 16:04:40 -08:00
Dustin Carlino
1241cea22e Update Chapelford boundary, and add LCID. https://github.com/cyipt/actdev/issues/65 2021-02-09 15:41:42 -08:00
Dustin Carlino
bbdd23dada Partly automate importing new actdev maps. Bring in 6 new sites 2021-02-09 13:53:50 -08:00
Dustin Carlino
da76c306ea
Apply an initial camera zoom when passing the --cam param. For (#503) 
https://github.com/cyipt/actdev/issues/44
 2021-02-08 18:12:58 -08:00
Dustin Carlino
68e406d26b Swap left/right turns when generating traffic signal policies in the UK. 
Verified by trying the "four-stage" template at some intersections. Now
regenerating data.
 2021-02-08 17:06:32 -08:00
Dustin Carlino
6f0751111e Derp, crosswalks on left-handed driving maps were always just outside the intersections. This made for some crazy traffic signals, since the crosswalk never conflicted with any turn. 
Don't regenerate yet, because I have one more of these...
 2021-02-08 16:50:17 -08:00
Dustin Carlino
783ce53a4e Fix geozero patch from previous commit 2021-02-08 16:40:25 -08:00
Michael Kirk
4b665c871d
update geo related deps. (#508) 
geo-types to 0.7
geo to 0.17 which removes redundant old geo used by polylabel
geojson to 0.22
 2021-02-08 16:34:56 -08:00
Michael Kirk
7cd4329866
fix census driven activity model (#507) 
It was failing because the version of flatgeobuf we were using was not
compatible with the recent tokio update. Now we point to the unreleased
flatgeobuf which is compatible.
 2021-02-08 14:15:58 -08:00
Dustin Carlino
829c321190 Get rid of the wasm_s3 build flag. Instead use the URL of the wasm app and find the data/ directory off of that, and assume only localhost has uncompressed files. https://github.com/cyipt/actdev/issues/28 2021-02-08 12:41:28 -08:00
Dustin Carlino
3cc441e1a9 The data/ files for actdev also need to be gzipped! https://github.com/cyipt/actdev/issues/28 2021-02-08 12:07:14 -08:00