From a2d36274a23cdea0c0fc438cd55ca27e4bff2758 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Sat, 10 Oct 2020 13:11:11 -0700 Subject: [PATCH] Prep for release [rebuild] --- book/src/project/CHANGELOG.md | 12 +++++++++++- game/src/helpers.rs | 4 +++- sim/src/analytics.rs | 12 ++++++------ sim/src/mechanics/driving.rs | 5 ++--- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/book/src/project/CHANGELOG.md b/book/src/project/CHANGELOG.md index f934a60415..23df541818 100644 --- a/book/src/project/CHANGELOG.md +++ b/book/src/project/CHANGELOG.md @@ -611,5 +611,15 @@ changes here. - improve turn generation, with goldenfile tests - UI adjustments: unzoomed routes, better delay layer, include reasons for cancelled trips, throughput layer counts -- small map importing fixes: multipolygon parking lots, +- small map importing fixes: multipolygon parking lots - fix infinite parking and blackholed buildings + +0.2.15 + +- large internal change allowing asynchronously loading extra files over HTTP for web +- the release of the first web version! +- cars looking for parking now have a "thought bubble" showing this, by Michael +- slow sections of a trip are now shown in the info panel, by Sam +- fix by Michael for handling window resizing in panels +- fix original routes on edited maps +- internal code organization and documentation diff --git a/game/src/helpers.rs b/game/src/helpers.rs index ee59d62085..7b093f753c 100644 --- a/game/src/helpers.rs +++ b/game/src/helpers.rs @@ -289,8 +289,10 @@ pub fn open_browser(url: String) { pub fn loading_tips() -> Text { Text::from_multiline(vec![ - Line("Recent changes (September 27)"), + Line("Recent changes (October 11)"), Line(""), + Line("- A web version has launched!"), + Line("- Slow segments of a trip shown in the info panel"), Line("- Alleyways are now included in the map"), Line("- Check out the trip tables and summary changes (press 'q')"), Line("- Try out the new traffic signal editor!"), diff --git a/sim/src/analytics.rs b/sim/src/analytics.rs index b52234e0a5..cfeaf32e4a 100644 --- a/sim/src/analytics.rs +++ b/sim/src/analytics.rs @@ -45,13 +45,13 @@ pub struct Analytics { /// Finish time, ID, mode, trip duration pub finished_trips: Vec<(Time, TripID, Option, Duration)>, - // Records how long was spent waiting at each turn (Intersection) for a given trip - // Over a certain threshold - // TripID, [(TurnID, Time Waiting In Seconds)] + /// Records how long was spent waiting at each turn (Intersection) for a given trip + /// Over a certain threshold + /// TripID, [(TurnID, Time Waiting In Seconds)] pub trip_intersection_delays: BTreeMap>, - // Records the average speed/maximum speed for each lane - // If it is over a certain threshold (<95% of max speed) - // TripID, [(LaneID, Percent of maximum speed as an integer (0-100)] + /// Records the average speed/maximum speed for each lane + /// If it is over a certain threshold (<95% of max speed) + /// TripID, [(LaneID, Percent of maximum speed as an integer (0-100)] pub lane_speed_percentage: BTreeMap>, // TODO This subsumes finished_trips diff --git a/sim/src/mechanics/driving.rs b/sim/src/mechanics/driving.rs index aec88b3344..4fb0150ada 100644 --- a/sim/src/mechanics/driving.rs +++ b/sim/src/mechanics/driving.rs @@ -208,7 +208,7 @@ impl DrivingSimState { // checker, temporarily move one of them out of the BTreeMap. let mut car = self.cars.remove(&id).unwrap(); // Responsibility of update_car to manage scheduling stuff! - need_distances = self.update_car_without_distances(&mut car, id, now, ctx, transit); + need_distances = self.update_car_without_distances(&mut car, now, ctx, transit); self.cars.insert(id, car); } @@ -241,7 +241,6 @@ impl DrivingSimState { fn update_car_without_distances( &mut self, car: &mut Car, - id: CarID, now: Time, ctx: &mut Ctx, transit: &mut TransitSimState, @@ -379,7 +378,7 @@ impl DrivingSimState { self.events.push(Event::TripIntersectionDelay( trip, t, - AgentID::Car(id), + AgentID::Car(car.vehicle.id), now - blocked_since, )); }