a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-28 08:53:26 +03:00
Code Issues Projects Releases Wiki Activity
6,124 Commits 85 Branches 166 Tags 395 MiB
65d7bc5c8e
Commit Graph

6124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dustin Carlino
f9ad3b2808 Add a script to bundle together all assets for actdev. https://github.com/cyipt/actdev/issues/28 2021-02-08 11:45:07 -08:00
Dustin Carlino
de1084648c new release 2021-02-07 14:49:05 -08:00
Dustin Carlino
4235d9f994 When importing maps, optionally add in extra buildings from a GeoJSON 
source to augment the ones in OSM. For
https://github.com/cyipt/actdev/issues/53 -- sometimes the buildings
just haven't been mapped in OSM yet, other times the buildings are part
of a future development site. In either case, we can procedurally
generate some houses, so this is a way to include them in the map.

Start doing this for Chapelford. But first, adjust the generated house
sizes -- they were WAY too tiny.

Also prep for [rebuild] [release]
 2021-02-07 13:56:26 -08:00
Dustin Carlino
06ab55da00 Prune auto-placed buildings that overlap each other. https://github.com/cyipt/actdev/issues/53 
And write the result as geojson. This process could become a map
importer phase, but I like checking the intermediate results, and it's
not clear yet how often we'd be using this.
 2021-02-07 11:50:30 -08:00
Dustin Carlino
c847207bb8 Prune auto-placed buildings that wind up on top of existing parts of the 
map. https://github.com/cyipt/actdev/issues/53
 2021-02-07 11:29:02 -08:00
Dustin Carlino
29fb271afc Automatically generate houses along empty residential roads, for https://github.com/cyipt/actdev/issues/53. Still need to prune out houses that hit existing map features, and save the output. 2021-02-07 10:55:16 -08:00
Michael Kirk
3449d49b6d
WebGL 1.0 support, with automatic fallback for Safari/iOS (#504) 
#506
 2021-02-06 19:04:43 -08:00
Dustin Carlino
744c49dfb4 Fix importer after last commit 2021-02-06 15:17:59 -08:00
Dustin Carlino
fc213d1d38 Optionally skip importing external trips that don't match an endpoint, for the Grid2Demand integration. 2021-02-06 14:59:45 -08:00
Bruce
1704d93050
When a turn completes, wake up intersections in a cluster (#505) 
#497
 2021-02-06 13:33:17 -08:00
Dustin Carlino
d62b5e9e0c
Slightly randomize where people decide to look for parking. #498 (#501) 2021-02-04 18:42:32 -08:00
Dustin Carlino
3a7f39a6da Downsample points on a line-series plot for drawing. Otherwise, the arrivals plot on a border intersection in downtown winds up with more than 2^16 points. 2021-02-04 11:27:57 -08:00