Mechanical rename of TripEndpoint::Bldg to ::Building, mostly to kick off a [rebuild] [release]

dabreegster · dabreegster · commit 0058f99da27b · 2022-01-30T18:27:36.000Z
diff --git a/cli/src/augment_scenario.rs b/cli/src/augment_scenario.rs
@@ -80,7 +80,7 @@ fn add_lunch_trips(scenario: &mut Scenario, map: &Map, rng: &mut XorShiftRng, ti
         }
 
         let work = match person.trips[num_trips - 2].destination {
-            TripEndpoint::Bldg(b) => b,
+            TripEndpoint::Building(b) => b,
             _ => continue,
         };
         let has_bike = person.trips[num_trips - 2].mode == TripMode::Bike;
@@ -99,15 +99,15 @@ fn add_lunch_trips(scenario: &mut Scenario, map: &Map, rng: &mut XorShiftRng, ti
         person.trips.push(IndividTrip::new(
             depart,
             TripPurpose::Meal,
-            TripEndpoint::Bldg(work),
-            TripEndpoint::Bldg(restaurant),
+            TripEndpoint::Building(work),
+            TripEndpoint::Building(restaurant),
             mode,
         ));
         person.trips.push(IndividTrip::new(
             depart + Duration::minutes(30),
             TripPurpose::Work,
-            TripEndpoint::Bldg(restaurant),
-            TripEndpoint::Bldg(work),
+            TripEndpoint::Building(restaurant),
+            TripEndpoint::Building(work),
             mode,
         ));
         person.trips.push(return_home);
diff --git a/game/src/debug/mod.rs b/game/src/debug/mod.rs
@@ -844,7 +844,7 @@ impl ContextualActions for Actions {
                 ))
             }
             (ID::Building(b), "route from here") => Transition::Push(
-                routes::RouteExplorer::new_state(ctx, app, TripEndpoint::Bldg(b)),
+                routes::RouteExplorer::new_state(ctx, app, TripEndpoint::Building(b)),
             ),
             _ => unreachable!(),
         }
diff --git a/game/src/debug/routes.rs b/game/src/debug/routes.rs
@@ -130,7 +130,7 @@ impl State<App> for RouteExplorer {
         }
         if let Some(hovering) = match app.primary.current_selection {
             Some(ID::Intersection(i)) => Some(TripEndpoint::Border(i)),
-            Some(ID::Building(b)) => Some(TripEndpoint::Bldg(b)),
+            Some(ID::Building(b)) => Some(TripEndpoint::Building(b)),
             None => None,
             _ => unreachable!(),
         } {
@@ -169,7 +169,7 @@ impl State<App> for RouteExplorer {
             Color::BLUE.alpha(0.8),
             match self.start {
                 TripEndpoint::Border(i) => app.primary.map.get_i(i).polygon.clone(),
-                TripEndpoint::Bldg(b) => app.primary.map.get_b(b).polygon.clone(),
+                TripEndpoint::Building(b) => app.primary.map.get_b(b).polygon.clone(),
                 TripEndpoint::SuddenlyAppear(_) => unreachable!(),
             },
         );
@@ -178,7 +178,7 @@ impl State<App> for RouteExplorer {
                 Color::GREEN.alpha(0.8),
                 match endpt {
                     TripEndpoint::Border(i) => app.primary.map.get_i(*i).polygon.clone(),
-                    TripEndpoint::Bldg(b) => app.primary.map.get_b(*b).polygon.clone(),
+                    TripEndpoint::Building(b) => app.primary.map.get_b(*b).polygon.clone(),
                     TripEndpoint::SuddenlyAppear(_) => unreachable!(),
                 },
             );
diff --git a/game/src/devtools/destinations.rs b/game/src/devtools/destinations.rs
@@ -21,7 +21,7 @@ impl PopularDestinations {
         let mut per_bldg = Counter::new();
         for p in &scenario.people {
             for trip in &p.trips {
-                if let TripEndpoint::Bldg(b) = trip.destination {
+                if let TripEndpoint::Building(b) = trip.destination {
                     per_bldg.inc(b);
                 }
             }
diff --git a/game/src/info/person.rs b/game/src/info/person.rs
@@ -408,7 +408,7 @@ fn schedule_body(ctx: &mut EventCtx, app: &App, id: PersonID) -> Widget {
     for t in &person.trips {
         let trip = app.primary.sim.trip_info(*t);
         let at = match trip.start {
-            TripEndpoint::Bldg(b) => {
+            TripEndpoint::Building(b) => {
                 let b = app.primary.map.get_b(b);
                 if b.amenities.is_empty() {
                     b.address.clone()
@@ -433,7 +433,7 @@ fn schedule_body(ctx: &mut EventCtx, app: &App, id: PersonID) -> Widget {
     // Where do they spend the night?
     let last_trip = app.primary.sim.trip_info(*person.trips.last().unwrap());
     let at = match last_trip.end {
-        TripEndpoint::Bldg(b) => {
+        TripEndpoint::Building(b) => {
             let b = app.primary.map.get_b(b);
             if b.amenities.is_empty() {
                 b.address.clone()
diff --git a/game/src/info/trip.rs b/game/src/info/trip.rs
@@ -933,7 +933,7 @@ fn make_elevation(
 // (ID, center, name)
 fn endpoint(endpt: &TripEndpoint, app: &App) -> (ID, Pt2D, String) {
     match endpt {
-        TripEndpoint::Bldg(b) => {
+        TripEndpoint::Building(b) => {
             let bldg = app.primary.map.get_b(*b);
             (ID::Building(*b), bldg.label_center, bldg.address.clone())
         }
diff --git a/game/src/sandbox/dashboards/commuter.rs b/game/src/sandbox/dashboards/commuter.rs
@@ -83,12 +83,12 @@ impl CommuterPatterns {
         let mut trips_to_block: Vec<Vec<TripInfo>> = trips_from_block.clone();
         for (_, trip) in app.primary.sim.all_trip_info() {
             let block1 = match trip.start {
-                TripEndpoint::Bldg(b) => bldg_to_block[&b],
+                TripEndpoint::Building(b) => bldg_to_block[&b],
                 TripEndpoint::Border(i) => border_to_block[&i],
                 TripEndpoint::SuddenlyAppear(_) => continue,
             };
             let block2 = match trip.end {
-                TripEndpoint::Bldg(b) => bldg_to_block[&b],
+                TripEndpoint::Building(b) => bldg_to_block[&b],
                 TripEndpoint::Border(i) => border_to_block[&i],
                 TripEndpoint::SuddenlyAppear(_) => continue,
             };
@@ -147,7 +147,7 @@ impl CommuterPatterns {
             }
             if self.filter.from_block {
                 match trip.end {
-                    TripEndpoint::Bldg(b) => {
+                    TripEndpoint::Building(b) => {
                         count.inc(self.bldg_to_block[&b]);
                     }
                     TripEndpoint::Border(i) => {
@@ -159,7 +159,7 @@ impl CommuterPatterns {
                 }
             } else {
                 match trip.start {
-                    TripEndpoint::Bldg(b) => {
+                    TripEndpoint::Building(b) => {
                         count.inc(self.bldg_to_block[&b]);
                     }
                     TripEndpoint::Border(i) => {
diff --git a/game/src/sandbox/dashboards/generic_trip_table.rs b/game/src/sandbox/dashboards/generic_trip_table.rs
@@ -89,7 +89,7 @@ fn preview_route(g: &mut GfxCtx, app: &App, id: TripID, batch: &mut GeomBatch) {
     batch.append(map_gui::tools::start_marker(
         g,
         match trip.start {
-            TripEndpoint::Bldg(b) => app.primary.map.get_b(b).label_center,
+            TripEndpoint::Building(b) => app.primary.map.get_b(b).label_center,
             TripEndpoint::Border(i) => app.primary.map.get_i(i).polygon.center(),
             TripEndpoint::SuddenlyAppear(pos) => pos.pt(&app.primary.map),
         },
@@ -98,7 +98,7 @@ fn preview_route(g: &mut GfxCtx, app: &App, id: TripID, batch: &mut GeomBatch) {
     batch.append(map_gui::tools::goal_marker(
         g,
         match trip.end {
-            TripEndpoint::Bldg(b) => app.primary.map.get_b(b).label_center,
+            TripEndpoint::Building(b) => app.primary.map.get_b(b).label_center,
             TripEndpoint::Border(i) => app.primary.map.get_i(i).polygon.center(),
             TripEndpoint::SuddenlyAppear(pos) => pos.pt(&app.primary.map),
         },
diff --git a/game/src/sandbox/dashboards/mode_shift.rs b/game/src/sandbox/dashboards/mode_shift.rs
@@ -130,8 +130,8 @@ fn produce_raw_data(ctx: &mut EventCtx, app: &App) -> Vec<Entry> {
                 .into_iter()
                 .filter_map(|(id, info)| {
                     if info.mode == TripMode::Drive
-                        && matches!(info.start, TripEndpoint::Bldg(_))
-                        && matches!(info.end, TripEndpoint::Bldg(_))
+                        && matches!(info.start, TripEndpoint::Building(_))
+                        && matches!(info.end, TripEndpoint::Building(_))
                     {
                         Some((id, info))
                     } else {
diff --git a/game/src/sandbox/gameplay/actdev.rs b/game/src/sandbox/gameplay/actdev.rs
@@ -69,7 +69,8 @@ impl GameplayState for Actdev {
                     .polygon;
 
                 for person in app.primary.sim.get_all_people() {
-                    if let TripEndpoint::Bldg(b) = app.primary.sim.trip_info(person.trips[0]).start
+                    if let TripEndpoint::Building(b) =
+                        app.primary.sim.trip_info(person.trips[0]).start
                     {
                         if study_area.contains_pt(app.primary.map.get_b(b).polygon.center()) {
                             highlight.insert(person.id);
diff --git a/game/src/sandbox/gameplay/freeform/mod.rs b/game/src/sandbox/gameplay/freeform/mod.rs
@@ -376,7 +376,7 @@ pub fn spawn_agents_around(i: IntersectionID, app: &mut App) {
                             lane.id,
                             rand_dist(&mut rng, Distance::ZERO, lane.length()),
                         )),
-                        TripEndpoint::Bldg(map.all_buildings().choose(&mut rng).unwrap().id),
+                        TripEndpoint::Building(map.all_buildings().choose(&mut rng).unwrap().id),
                         mode,
                     )],
                 });
@@ -392,7 +392,7 @@ pub fn spawn_agents_around(i: IntersectionID, app: &mut App) {
                             lane.id,
                             rand_dist(&mut rng, 0.1 * lane.length(), 0.9 * lane.length()),
                         )),
-                        TripEndpoint::Bldg(map.all_buildings().choose(&mut rng).unwrap().id),
+                        TripEndpoint::Building(map.all_buildings().choose(&mut rng).unwrap().id),
                         TripMode::Walk,
                     )],
                 });
diff --git a/game/src/sandbox/gameplay/freeform/spawner.rs b/game/src/sandbox/gameplay/freeform/spawner.rs
@@ -74,7 +74,7 @@ impl AgentSpawner {
             .build(ctx),
         };
         if let Some(b) = start {
-            let endpt = TripEndpoint::Bldg(b);
+            let endpt = TripEndpoint::Building(b);
             let pt = endpt.pt(&app.primary.map);
             spawner.start = Some((endpt, pt));
             spawner.panel.replace(
@@ -220,7 +220,7 @@ impl State<App> for AgentSpawner {
         }
         if let Some(hovering) = match app.primary.current_selection {
             Some(ID::Intersection(i)) => Some(TripEndpoint::Border(i)),
-            Some(ID::Building(b)) => Some(TripEndpoint::Bldg(b)),
+            Some(ID::Building(b)) => Some(TripEndpoint::Building(b)),
             None => None,
             _ => unreachable!(),
         } {
diff --git a/game/src/sandbox/gameplay/tutorial.rs b/game/src/sandbox/gameplay/tutorial.rs
@@ -678,7 +678,7 @@ fn make_bike_lane_scenario(map: &Map) -> ScenarioGenerator {
         start_time: Time::START_OF_DAY,
         stop_time: Time::START_OF_DAY + Duration::seconds(10.0),
         start_from_border: map.find_i_by_osm_id(osm::NodeID(3005680098)).unwrap(),
-        goal: Some(TripEndpoint::Bldg(
+        goal: Some(TripEndpoint::Building(
             map.find_b_by_osm_id(bldg(217699501)).unwrap(),
         )),
     });
@@ -1078,7 +1078,7 @@ impl TutorialState {
                                 start_lane,
                                 map.get_l(start_lane).length() * 0.8,
                             )),
-                            TripEndpoint::Bldg(goal_bldg),
+                            TripEndpoint::Building(goal_bldg),
                             TripMode::Drive,
                         )],
                     });
@@ -1093,7 +1093,7 @@ impl TutorialState {
                                     lane_near_bldg,
                                     map.get_l(lane_near_bldg).length() / 2.0,
                                 )),
-                                TripEndpoint::Bldg(goal_bldg),
+                                TripEndpoint::Building(goal_bldg),
                                 TripMode::Drive,
                             )],
                         });
diff --git a/game/src/ungap/predict.rs b/game/src/ungap/predict.rs
@@ -358,8 +358,8 @@ impl ModeShiftData {
                     .all_trips()
                     .filter(|trip| {
                         trip.mode == TripMode::Drive
-                            && matches!(trip.origin, TripEndpoint::Bldg(_))
-                            && matches!(trip.destination, TripEndpoint::Bldg(_))
+                            && matches!(trip.origin, TripEndpoint::Building(_))
+                            && matches!(trip.destination, TripEndpoint::Building(_))
                     })
                     .collect(),
                 |trip| {
diff --git a/importer/src/soundcast/trips.rs b/importer/src/soundcast/trips.rs
@@ -41,11 +41,11 @@ fn endpoints(
     let from_bldg = from
         .osm_building
         .and_then(|id| osm_id_to_bldg.get(&id))
-        .map(|b| TripEndpoint::Bldg(*b));
+        .map(|b| TripEndpoint::Building(*b));
     let to_bldg = to
         .osm_building
         .and_then(|id| osm_id_to_bldg.get(&id))
-        .map(|b| TripEndpoint::Bldg(*b));
+        .map(|b| TripEndpoint::Building(*b));
 
     if only_passthrough_trips {
         if from_bldg.is_some() || to_bldg.is_some() {
diff --git a/importer/src/uk.rs b/importer/src/uk.rs
@@ -99,7 +99,7 @@ pub async fn generate_scenario(
             // data imported using importer/actdev_scenarios.sh already covers them.
             let before = scenario.people.len();
             scenario.people.retain(|p| match p.trips[0].origin {
-                TripEndpoint::Bldg(b) => !study_area.contains_pt(map.get_b(b).polygon.center()),
+                TripEndpoint::Building(b) => !study_area.contains_pt(map.get_b(b).polygon.center()),
                 _ => true,
             });
             info!(
diff --git a/map_gui/src/tools/waypoints.rs b/map_gui/src/tools/waypoints.rs
@@ -35,7 +35,7 @@ impl InputWaypoints {
             }
         }
         for b in map.all_buildings() {
-            snap_to_endpts.add(TripEndpoint::Bldg(b.id), b.polygon.points());
+            snap_to_endpts.add(TripEndpoint::Building(b.id), b.polygon.points());
         }
 
         InputWaypoints {
@@ -242,7 +242,7 @@ impl Waypoint {
     fn new(app: &dyn AppLike, at: TripEndpoint) -> Waypoint {
         let map = app.map();
         let (center, label) = match at {
-            TripEndpoint::Bldg(b) => {
+            TripEndpoint::Building(b) => {
                 let b = map.get_b(b);
                 (b.polygon.center(), b.address.clone())
             }
diff --git a/popdat/src/make_person.rs b/popdat/src/make_person.rs
@@ -186,7 +186,7 @@ impl PersonFactory {
             trips: Vec::new(),
         };
 
-        let mut current_location = TripEndpoint::Bldg(person.home);
+        let mut current_location = TripEndpoint::Building(person.home);
         for (departure_time, activity) in schedule.activities {
             // TODO This field isn't that important; later we could map Activity to a TripPurpose
             // better.
@@ -195,7 +195,7 @@ impl PersonFactory {
             let goto = if let Some(destination) =
                 self.find_building_for_activity(activity, current_location, map, rng)
             {
-                TripEndpoint::Bldg(destination)
+                TripEndpoint::Building(destination)
             } else if let Some(i) = commuter_borders.choose(rng) {
                 // No buildings satisfy the activity. Just go somewhere off-map.
                 TripEndpoint::Border(*i)
@@ -228,7 +228,7 @@ fn pick_mode(
     config: &Config,
 ) -> TripMode {
     let (b1, b2) = match (from, to) {
-        (TripEndpoint::Bldg(b1), TripEndpoint::Bldg(b2)) => (b1, b2),
+        (TripEndpoint::Building(b1), TripEndpoint::Building(b2)) => (b1, b2),
         // TODO Always drive when going on or off-map?
         _ => {
             return TripMode::Drive;
diff --git a/popdat/src/od.rs b/popdat/src/od.rs
@@ -217,7 +217,7 @@ impl Zone {
     ) -> Option<(TripEndpoint, TripEndpoint)> {
         if rng.gen_bool(self.pct_overlap) && !self.homes.is_empty() {
             let b = self.homes.choose_weighted(rng, |(_, n)| *n).unwrap().0;
-            return Some((TripEndpoint::Bldg(b), TripEndpoint::Bldg(b)));
+            return Some((TripEndpoint::Building(b), TripEndpoint::Building(b)));
         }
         self.pick_borders(mode, map, rng)
     }
@@ -232,7 +232,7 @@ impl Zone {
     ) -> Option<(TripEndpoint, TripEndpoint)> {
         if rng.gen_bool(self.pct_overlap) && !self.workplaces.is_empty() {
             let b = self.workplaces.choose_weighted(rng, |(_, n)| *n).unwrap().0;
-            return Some((TripEndpoint::Bldg(b), TripEndpoint::Bldg(b)));
+            return Some((TripEndpoint::Building(b), TripEndpoint::Building(b)));
         }
         self.pick_borders(mode, map, rng)
     }
diff --git a/sim/src/make/activity_model.rs b/sim/src/make/activity_model.rs
@@ -126,7 +126,7 @@ impl ScenarioGenerator {
                 );
                 let home = if is_local_resident {
                     if let Some(residence) = residents.pop() {
-                        TripEndpoint::Bldg(residence)
+                        TripEndpoint::Building(residence)
                     } else {
                         *commuter_borders.choose(rng)?
                     }
@@ -136,7 +136,7 @@ impl ScenarioGenerator {
 
                 let work = if is_local_worker {
                     if let Some(workplace) = workers.pop() {
-                        TripEndpoint::Bldg(workplace)
+                        TripEndpoint::Building(workplace)
                     } else {
                         *commuter_borders.choose(rng)?
                     }
@@ -145,13 +145,13 @@ impl ScenarioGenerator {
                 };
 
                 match (&home, &work) {
-                    (TripEndpoint::Bldg(_), TripEndpoint::Bldg(_)) => {
+                    (TripEndpoint::Building(_), TripEndpoint::Building(_)) => {
                         num_trips_local += 1;
                     }
-                    (TripEndpoint::Bldg(_), TripEndpoint::Border(_)) => {
+                    (TripEndpoint::Building(_), TripEndpoint::Border(_)) => {
                         num_trips_commuting_out += 1;
                     }
-                    (TripEndpoint::Border(_), TripEndpoint::Bldg(_)) => {
+                    (TripEndpoint::Border(_), TripEndpoint::Building(_)) => {
                         num_trips_commuting_in += 1;
                     }
                     (TripEndpoint::Border(_), TripEndpoint::Border(_)) => {
@@ -214,7 +214,7 @@ fn create_prole(
 
     let mode = match (&home, &work) {
         // commuting entirely within map
-        (TripEndpoint::Bldg(home_bldg), TripEndpoint::Bldg(work_bldg)) => {
+        (TripEndpoint::Building(home_bldg), TripEndpoint::Building(work_bldg)) => {
             // Decide mode based on walking distance. If the buildings aren't connected,
             // probably a bug in importing; just skip this person.
             let dist = if let Some(path) = PathRequest::between_buildings(
diff --git a/sim/src/make/generator.rs b/sim/src/make/generator.rs
@@ -165,9 +165,9 @@ impl SpawnOverTime {
             trips: vec![IndividTrip::new(
                 depart,
                 TripPurpose::Shopping,
-                TripEndpoint::Bldg(from_bldg),
+                TripEndpoint::Building(from_bldg),
                 self.goal.unwrap_or_else(|| {
-                    TripEndpoint::Bldg(map.all_buildings().choose(rng).unwrap().id)
+                    TripEndpoint::Building(map.all_buildings().choose(rng).unwrap().id)
                 }),
                 mode,
             )],
@@ -185,7 +185,7 @@ impl BorderSpawnOverTime {
                 TripPurpose::Shopping,
                 TripEndpoint::Border(self.start_from_border),
                 self.goal.unwrap_or_else(|| {
-                    TripEndpoint::Bldg(map.all_buildings().choose(rng).unwrap().id)
+                    TripEndpoint::Building(map.all_buildings().choose(rng).unwrap().id)
                 }),
                 mode,
             )],
diff --git a/sim/src/make/spawner.rs b/sim/src/make/spawner.rs
diff --git a/sim/src/sim/scenario.rs b/sim/src/sim/scenario.rs
diff --git a/sim/src/trips.rs b/sim/src/trips.rs
diff --git a/synthpop/src/endpoint.rs b/synthpop/src/endpoint.rs
diff --git a/synthpop/src/external.rs b/synthpop/src/external.rs

Original file line number	Diff line number	Diff line change
`@@ -844,7 +844,7 @@ impl ContextualActions for Actions {`
`844`	`844`	`))`
`845`	`845`	`}`
`846`	`846`	`(ID::Building(b), "route from here") => Transition::Push(`
`847`		`- routes::RouteExplorer::new_state(ctx, app, TripEndpoint::Bldg(b)),`
	`847`	`+ routes::RouteExplorer::new_state(ctx, app, TripEndpoint::Building(b)),`
`848`	`848`	`),`
`849`	`849`	`_ => unreachable!(),`
`850`	`850`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ impl PopularDestinations {`
`21`	`21`	`let mut per_bldg = Counter::new();`
`22`	`22`	`for p in &scenario.people {`
`23`	`23`	`for trip in &p.trips {`
`24`		`- if let TripEndpoint::Bldg(b) = trip.destination {`
	`24`	`+ if let TripEndpoint::Building(b) = trip.destination {`
`25`	`25`	`per_bldg.inc(b);`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -933,7 +933,7 @@ fn make_elevation(`
`933`	`933`	`// (ID, center, name)`
`934`	`934`	`fn endpoint(endpt: &TripEndpoint, app: &App) -> (ID, Pt2D, String) {`
`935`	`935`	`match endpt {`
`936`		`- TripEndpoint::Bldg(b) => {`
	`936`	`+ TripEndpoint::Building(b) => {`
`937`	`937`	`let bldg = app.primary.map.get_b(*b);`
`938`	`938`	`(ID::Building(*b), bldg.label_center, bldg.address.clone())`
`939`	`939`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ impl GameplayState for Actdev {`
`69`	`69`	`.polygon;`
`70`	`70`
`71`	`71`	`for person in app.primary.sim.get_all_people() {`
`72`		`- if let TripEndpoint::Bldg(b) = app.primary.sim.trip_info(person.trips[0]).start`
	`72`	`+ if let TripEndpoint::Building(b) =`
	`73`	`+ app.primary.sim.trip_info(person.trips[0]).start`
`73`	`74`	`{`
`74`	`75`	`if study_area.contains_pt(app.primary.map.get_b(b).polygon.center()) {`
`75`	`76`	`highlight.insert(person.id);`