From b7f09fb300827f324de5ea3b1f2e29572711e65d Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:34:32 +0800
Subject: [PATCH 01/24] feat: add actions and transitions

---
 apps/game/src/sandbox/mod.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/game/src/sandbox/mod.rs b/apps/game/src/sandbox/mod.rs
index fa0fb788cb..81c64be292 100644
--- a/apps/game/src/sandbox/mod.rs
+++ b/apps/game/src/sandbox/mod.rs
@@ -338,6 +338,7 @@ impl ContextualActions for Actions {
                     } else {
                         actions.push((Key::F, "add this building to favorites".to_string()));
                     }
+                    actions.push((Key::E, "edit the parking of this building".to_string()))
                 }
                 _ => {}
             }
@@ -396,6 +397,12 @@ impl ContextualActions for Actions {
                 app.primary.layer = Some(Box::new(ShowFavorites::new(ctx, app)));
                 Transition::Keep
             }
+            (ID::Building(b), "edit the parking of this building") => {
+                Transition::Multi(vec![
+                    Transition::Push(EditMode::new_state(ctx, app, self.gameplay.clone())),
+                    // TODO Building editor
+                ])
+            }
             (_, "follow (run the simulation)") => {
                 *close_panel = false;
                 Transition::ModifyState(Box::new(|state, ctx, app| {

From b50b9f8cb0bf9fbbdffff2d1a8b65a607c363396 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 09:45:28 +0800
Subject: [PATCH 02/24] feat: boilerplate for building editor

---
 apps/game/src/edit/buildings.rs | 32 ++++++++++++++++++++++++++++++++
 apps/game/src/edit/mod.rs       |  2 ++
 apps/game/src/sandbox/mod.rs    | 13 ++++++-------
 3 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 apps/game/src/edit/buildings.rs

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
new file mode 100644
index 0000000000..b5bf749279
--- /dev/null
+++ b/apps/game/src/edit/buildings.rs
@@ -0,0 +1,32 @@
+use map_model::BuildingID;
+use widgetry::{EventCtx, State};
+
+use crate::app::{App, Transition};
+
+pub struct BuildingEditor {
+
+}
+
+impl BuildingEditor {
+    pub fn new_state(ctx: &mut EventCtx, app: &mut App, b: BuildingID) -> Box<dyn State<App>> {
+        BuildingEditor::create(ctx, app, b)
+    }
+
+    fn create(
+        ctx: &mut EventCtx,
+        app: &mut App,
+        b: BuildingID,
+    ) -> Box<dyn State<App>> {
+		todo!()
+	}
+}
+
+impl State<App> for BuildingEditor {
+    fn event(&mut self, ctx: &mut EventCtx, shared_app_state: &mut App) -> Transition {
+        todo!()
+    }
+
+    fn draw(&self, g: &mut widgetry::GfxCtx, shared_app_state: &App) {
+        todo!()
+    }
+}
\ No newline at end of file
diff --git a/apps/game/src/edit/mod.rs b/apps/game/src/edit/mod.rs
index 33b1824cfc..692b932fde 100644
--- a/apps/game/src/edit/mod.rs
+++ b/apps/game/src/edit/mod.rs
@@ -15,6 +15,7 @@ use widgetry::{
 };
 
 pub use self::roads::RoadEditor;
+pub use self::buildings::BuildingEditor;
 pub use self::routes::RouteEditor;
 pub use self::stop_signs::StopSignEditor;
 pub use self::traffic_signals::TrafficSignalEditor;
@@ -27,6 +28,7 @@ use crate::sandbox::{GameplayMode, SandboxMode, TimeWarpScreen};
 mod crosswalks;
 mod multiple_roads;
 mod roads;
+mod buildings;
 mod routes;
 mod stop_signs;
 mod traffic_signals;
diff --git a/apps/game/src/sandbox/mod.rs b/apps/game/src/sandbox/mod.rs
index 81c64be292..c26f50c178 100644
--- a/apps/game/src/sandbox/mod.rs
+++ b/apps/game/src/sandbox/mod.rs
@@ -21,7 +21,8 @@ use crate::app::{App, Transition};
 use crate::common::{tool_panel, CommonState};
 use crate::debug::DebugMode;
 use crate::edit::{
-    can_edit_lane, EditMode, RoadEditor, SaveEdits, StopSignEditor, TrafficSignalEditor,
+    can_edit_lane, BuildingEditor, EditMode, RoadEditor, SaveEdits, StopSignEditor,
+    TrafficSignalEditor,
 };
 use crate::info::ContextualActions;
 use crate::layer::favorites::{Favorites, ShowFavorites};
@@ -397,12 +398,10 @@ impl ContextualActions for Actions {
                 app.primary.layer = Some(Box::new(ShowFavorites::new(ctx, app)));
                 Transition::Keep
             }
-            (ID::Building(b), "edit the parking of this building") => {
-                Transition::Multi(vec![
-                    Transition::Push(EditMode::new_state(ctx, app, self.gameplay.clone())),
-                    // TODO Building editor
-                ])
-            }
+            (ID::Building(b), "edit the parking of this building") => Transition::Multi(vec![
+                Transition::Push(EditMode::new_state(ctx, app, self.gameplay.clone())),
+                Transition::Push(BuildingEditor::new_state(ctx, app, b)),
+            ]),
             (_, "follow (run the simulation)") => {
                 *close_panel = false;
                 Transition::ModifyState(Box::new(|state, ctx, app| {

From 1462e26f91cf053e900c67bee6ac221172e8c9e0 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:35:10 +0800
Subject: [PATCH 03/24] feat: add building editor

---
 apps/game/src/edit/buildings.rs | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index b5bf749279..bb1655f7b0 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,10 +1,15 @@
-use map_model::BuildingID;
+use map_model::{BuildingID, EditCmd};
 use widgetry::{EventCtx, State};
 
 use crate::app::{App, Transition};
 
 pub struct BuildingEditor {
+    b: BuildingID,
 
+    // Undo/redo management
+    num_edit_cmds_originally: usize,
+    redo_stack: Vec<EditCmd>,
+    orig_building_state: EditBuilding,
 }
 
 impl BuildingEditor {
@@ -12,13 +17,19 @@ impl BuildingEditor {
         BuildingEditor::create(ctx, app, b)
     }
 
-    fn create(
-        ctx: &mut EventCtx,
-        app: &mut App,
-        b: BuildingID,
-    ) -> Box<dyn State<App>> {
-		todo!()
-	}
+    fn create(ctx: &mut EventCtx, app: &mut App, b: BuildingID) -> Box<dyn State<App>> {
+        app.primary.current_selection = None;
+
+        let mut editor = BuildingEditor {
+            b,
+
+            num_edit_cmds_originally: app.primary.map.get_edits().commands.len(),
+            redo_stack: Vec::new(),
+            orig_building_state: app.primary.map.get_b_edit(b), // TODO
+        };
+        // TODO recalc panels?
+        Box::new(editor)
+    }
 }
 
 impl State<App> for BuildingEditor {
@@ -29,4 +40,4 @@ impl State<App> for BuildingEditor {
     fn draw(&self, g: &mut widgetry::GfxCtx, shared_app_state: &App) {
         todo!()
     }
-}
\ No newline at end of file
+}

From 28c7da7357ed6f69933401f9e323d030ce62cf37 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:35:37 +0800
Subject: [PATCH 04/24] feat: cmd_to_id

---
 apps/game/src/edit/mod.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/game/src/edit/mod.rs b/apps/game/src/edit/mod.rs
index 692b932fde..5ef6c8b2d7 100644
--- a/apps/game/src/edit/mod.rs
+++ b/apps/game/src/edit/mod.rs
@@ -14,8 +14,8 @@ use widgetry::{
     Menu, Outcome, Panel, State, Text, TextBox, TextExt, VerticalAlignment, Widget,
 };
 
-pub use self::roads::RoadEditor;
 pub use self::buildings::BuildingEditor;
+pub use self::roads::RoadEditor;
 pub use self::routes::RouteEditor;
 pub use self::stop_signs::StopSignEditor;
 pub use self::traffic_signals::TrafficSignalEditor;
@@ -25,10 +25,10 @@ use crate::common::{tool_panel, CommonState, Warping};
 use crate::debug::DebugMode;
 use crate::sandbox::{GameplayMode, SandboxMode, TimeWarpScreen};
 
+mod buildings;
 mod crosswalks;
 mod multiple_roads;
 mod roads;
-mod buildings;
 mod routes;
 mod stop_signs;
 mod traffic_signals;
@@ -942,6 +942,7 @@ fn cmd_to_id(cmd: &EditCmd) -> Option<ID> {
         EditCmd::ChangeRoad { r, .. } => Some(ID::Road(*r)),
         EditCmd::ChangeIntersection { i, .. } => Some(ID::Intersection(*i)),
         EditCmd::ChangeRouteSchedule { .. } => None,
+        EditCmd::ChangeBuilding { b, .. } => Some(ID::Building(*b)),
     }
 }
 

From 55f1714dd21bfa0735e741c50968e4a12685a6ee Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:38:19 +0800
Subject: [PATCH 05/24] feat: edit building

---
 map_model/src/edits/mod.rs | 52 +++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/map_model/src/edits/mod.rs b/map_model/src/edits/mod.rs
index 1c0b04a337..592bf1434e 100644
--- a/map_model/src/edits/mod.rs
+++ b/map_model/src/edits/mod.rs
@@ -13,9 +13,9 @@ use osm2streets::{get_lane_specs_ltr, RestrictionType};
 
 pub use self::perma::PermanentMapEdits;
 use crate::{
-    AccessRestrictions, ControlStopSign, ControlTrafficSignal, Crossing, DiagonalFilter,
-    IntersectionControl, IntersectionID, LaneID, LaneSpec, Map, MapConfig, ParkingLotID, Road,
-    RoadFilter, RoadID, TransitRouteID, TurnID, TurnType,
+    AccessRestrictions, BuildingID, ControlStopSign, ControlTrafficSignal, Crossing,
+    DiagonalFilter, IntersectionControl, IntersectionID, LaneID, LaneSpec, Map, MapConfig,
+    OffstreetParking, ParkingLotID, Road, RoadFilter, RoadID, TransitRouteID, TurnID, TurnType,
 };
 
 mod apply;
@@ -36,6 +36,7 @@ pub struct MapEdits {
     pub original_roads: BTreeMap<RoadID, EditRoad>,
     pub original_intersections: BTreeMap<IntersectionID, EditIntersection>,
     pub changed_routes: BTreeSet<TransitRouteID>,
+    pub original_buildings: BTreeMap<BuildingID, EditBuilding>,
 
     /// Some edits are included in the game by default, in data/system/proposals, as "community
     /// proposals." They require a description and may have a link to a write-up.
@@ -60,6 +61,11 @@ pub enum EditCmd {
         old: Vec<Time>,
         new: Vec<Time>,
     },
+    ChangeBuilding {
+        b: BuildingID,
+        old: EditBuilding,
+        new: EditBuilding,
+    },
 }
 
 pub struct EditEffects {
@@ -93,6 +99,11 @@ pub struct EditIntersection {
     pub crosswalks: BTreeMap<TurnID, TurnType>,
 }
 
+#[derive(Debug, Clone, PartialEq)]
+pub struct EditBuilding {
+    pub parking: OffstreetParking,
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub enum EditIntersectionControl {
     StopSign(ControlStopSign),
@@ -187,6 +198,16 @@ impl EditIntersection {
     }
 }
 
+impl EditBuilding {
+    fn diff(&self, other: &EditBuilding) -> Vec<String> {
+        let mut changes = Vec::new();
+        if self.parking != other.parking {
+            changes.push("parking".to_string());
+        }
+        changes
+    }
+}
+
 impl MapEdits {
     pub(crate) fn new() -> MapEdits {
         MapEdits {
@@ -198,6 +219,7 @@ impl MapEdits {
             original_roads: BTreeMap::new(),
             original_intersections: BTreeMap::new(),
             changed_routes: BTreeSet::new(),
+            original_buildings: BTreeMap::new(),
         }
     }
 
@@ -269,6 +291,7 @@ impl MapEdits {
         self.original_roads.clear();
         self.original_intersections.clear();
         self.changed_routes.clear();
+        self.original_buildings.clear();
 
         for cmd in &self.commands {
             match cmd {
@@ -285,6 +308,11 @@ impl MapEdits {
                 EditCmd::ChangeRouteSchedule { id, .. } => {
                     self.changed_routes.insert(*id);
                 }
+                EditCmd::ChangeBuilding { b, old, new } => {
+                    if !self.original_buildings.contains_key(b) {
+                        self.original_buildings.insert(*b, old.clone());
+                    }
+                }
             }
         }
 
@@ -296,6 +324,8 @@ impl MapEdits {
             let r = map.get_tr(*br);
             r.spawn_times != r.orig_spawn_times
         });
+        self.original_buildings
+            .retain(|b, orig| map.get_b_edit(*b) != orig.clone());
     }
 
     /// Assumes update_derived has been called.
@@ -322,6 +352,13 @@ impl MapEdits {
                 old: r.orig_spawn_times.clone(),
             });
         }
+        for (b, old) in &self.original_buildings {
+            self.commands.push(EditCmd::ChangeBuilding {
+                b: *b,
+                old: old.clone(),
+                new: map.get_b_edit(*b),
+            });
+        }
     }
 
     /// Pick apart changed_roads and figure out if an entire road was edited, or just a few lanes.
@@ -416,6 +453,10 @@ impl EditCmd {
             EditCmd::ChangeRouteSchedule { id, .. } => {
                 format!("reschedule route {}", map.get_tr(*id).short_name)
             }
+            EditCmd::ChangeBuilding { b, old, new } => {
+                details = new.diff(old);
+                format!("building #{}", b.0)
+            }
         };
         (summary, details)
     }
@@ -458,6 +499,11 @@ impl Map {
         }
     }
 
+    pub fn get_b_edit(&self, b: BuildingID) -> EditBuilding {
+        let b = self.get_b(b);
+        EditBuilding { parking: b.parking }
+    }
+
     pub fn edit_road_cmd<F: FnOnce(&mut EditRoad)>(&self, r: RoadID, f: F) -> EditCmd {
         let old = self.get_r_edit(r);
         let mut new = old.clone();

From bb2ef4c7880f36924059e684f4ee91866edc6b3b Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 11:17:13 +0800
Subject: [PATCH 06/24] feat: permanent edit cmd

---
 map_model/src/edits/mod.rs   |  2 +-
 map_model/src/edits/perma.rs | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/map_model/src/edits/mod.rs b/map_model/src/edits/mod.rs
index 592bf1434e..bb5131a00c 100644
--- a/map_model/src/edits/mod.rs
+++ b/map_model/src/edits/mod.rs
@@ -99,7 +99,7 @@ pub struct EditIntersection {
     pub crosswalks: BTreeMap<TurnID, TurnType>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct EditBuilding {
     pub parking: OffstreetParking,
 }
diff --git a/map_model/src/edits/perma.rs b/map_model/src/edits/perma.rs
index 1aea4e1276..3ec72aef9d 100644
--- a/map_model/src/edits/perma.rs
+++ b/map_model/src/edits/perma.rs
@@ -8,7 +8,9 @@ use abstutil::{deserialize_btreemap, serialize_btreemap};
 use geom::Time;
 
 use super::perma_traffic_signal;
-use crate::edits::{EditCmd, EditIntersection, EditIntersectionControl, EditRoad, MapEdits};
+use crate::edits::{
+    EditBuilding, EditCmd, EditIntersection, EditIntersectionControl, EditRoad, MapEdits,
+};
 use crate::{
     osm, ControlStopSign, DiagonalFilter, IntersectionID, Map, MovementID, OriginalRoad, TurnType,
 };
@@ -74,6 +76,11 @@ pub enum PermanentEditCmd {
         old: Vec<Time>,
         new: Vec<Time>,
     },
+    ChangeBuilding {
+        b: osm::OsmID,
+        new: EditBuilding,
+        old: EditBuilding,
+    },
 }
 
 impl EditCmd {
@@ -96,6 +103,11 @@ impl EditCmd {
                     new: new.clone(),
                 }
             }
+            EditCmd::ChangeBuilding { b, old, new } => PermanentEditCmd::ChangeBuilding {
+                b: map.get_b(*b).orig_id,
+                new: new.clone(),
+                old: old.clone(),
+            },
         }
     }
 }
@@ -146,6 +158,7 @@ impl PermanentEditCmd {
                     .ok_or_else(|| anyhow!("can't find {}", gtfs_id))?;
                 Ok(EditCmd::ChangeRouteSchedule { id, old, new })
             }
+            PermanentEditCmd::ChangeBuilding { b, new, old } => todo!(),
         }
     }
 }
@@ -182,6 +195,7 @@ impl PermanentMapEdits {
             original_roads: BTreeMap::new(),
             original_intersections: BTreeMap::new(),
             changed_routes: BTreeSet::new(),
+            original_buildings: BTreeMap::new(),
         };
         edits.update_derived(map);
         Ok(edits)
@@ -209,6 +223,7 @@ impl PermanentMapEdits {
             original_roads: BTreeMap::new(),
             original_intersections: BTreeMap::new(),
             changed_routes: BTreeSet::new(),
+            original_buildings: BTreeMap::new(),
         };
         edits.update_derived(map);
         edits

From 2f3047f1b0301de13a0100087b103b2445c85dc1 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 11:23:07 +0800
Subject: [PATCH 07/24] chore: fill exhaustive cases

---
 apps/game/src/edit/buildings.rs       | 2 +-
 apps/game/src/sandbox/gameplay/mod.rs | 1 +
 map_model/src/edits/apply.rs          | 6 ++++++
 map_model/src/edits/mod.rs            | 4 +++-
 map_model/src/lib.rs                  | 4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index bb1655f7b0..4a99b12b7c 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,4 +1,4 @@
-use map_model::{BuildingID, EditCmd};
+use map_model::{BuildingID, EditBuilding, EditCmd};
 use widgetry::{EventCtx, State};
 
 use crate::app::{App, Transition};
diff --git a/apps/game/src/sandbox/gameplay/mod.rs b/apps/game/src/sandbox/gameplay/mod.rs
index 8c909c793a..f0c9f11134 100644
--- a/apps/game/src/sandbox/gameplay/mod.rs
+++ b/apps/game/src/sandbox/gameplay/mod.rs
@@ -200,6 +200,7 @@ impl GameplayMode {
                     }
                 }
                 EditCmd::ChangeRouteSchedule { .. } => {}
+                EditCmd::ChangeBuilding { b, old, new } => todo!(),
             }
         }
         true
diff --git a/map_model/src/edits/apply.rs b/map_model/src/edits/apply.rs
index 2ff1dab566..a6987fafa3 100644
--- a/map_model/src/edits/apply.rs
+++ b/map_model/src/edits/apply.rs
@@ -273,6 +273,7 @@ impl EditCmd {
             EditCmd::ChangeRouteSchedule { id, new, .. } => {
                 map.transit_routes[id.0].spawn_times = new.clone();
             }
+            EditCmd::ChangeBuilding { b, old, new } => todo!(),
         }
     }
 
@@ -293,6 +294,11 @@ impl EditCmd {
                 old: new,
                 new: old,
             },
+            EditCmd::ChangeBuilding { b, old, new } => EditCmd::ChangeBuilding {
+                b,
+                old: new,
+                new: old,
+            },
         }
     }
 }
diff --git a/map_model/src/edits/mod.rs b/map_model/src/edits/mod.rs
index bb5131a00c..7459970618 100644
--- a/map_model/src/edits/mod.rs
+++ b/map_model/src/edits/mod.rs
@@ -501,7 +501,9 @@ impl Map {
 
     pub fn get_b_edit(&self, b: BuildingID) -> EditBuilding {
         let b = self.get_b(b);
-        EditBuilding { parking: b.parking }
+        EditBuilding {
+            parking: b.parking.clone(),
+        }
     }
 
     pub fn edit_road_cmd<F: FnOnce(&mut EditRoad)>(&self, r: RoadID, f: F) -> EditCmd {
diff --git a/map_model/src/lib.rs b/map_model/src/lib.rs
index dbefe00334..6f07644164 100644
--- a/map_model/src/lib.rs
+++ b/map_model/src/lib.rs
@@ -48,8 +48,8 @@ pub use raw_map::{Amenity, AmenityType, AreaType, CrossingType, ExtraPOI, ExtraP
 
 pub use crate::city::City;
 pub use crate::edits::{
-    EditCmd, EditEffects, EditIntersection, EditIntersectionControl, EditRoad, MapEdits,
-    PermanentMapEdits,
+    EditBuilding, EditCmd, EditEffects, EditIntersection, EditIntersectionControl, EditRoad,
+    MapEdits, PermanentMapEdits,
 };
 
 pub use crate::make::RawToMapOptions;

From cd657a771fe6b8c47b1e27899575df7b92f2d99e Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 11:56:16 +0800
Subject: [PATCH 08/24] feat: allow buildings to always be edited

---
 apps/game/src/sandbox/gameplay/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/game/src/sandbox/gameplay/mod.rs b/apps/game/src/sandbox/gameplay/mod.rs
index f0c9f11134..a32d93d469 100644
--- a/apps/game/src/sandbox/gameplay/mod.rs
+++ b/apps/game/src/sandbox/gameplay/mod.rs
@@ -200,7 +200,7 @@ impl GameplayMode {
                     }
                 }
                 EditCmd::ChangeRouteSchedule { .. } => {}
-                EditCmd::ChangeBuilding { b, old, new } => todo!(),
+                EditCmd::ChangeBuilding { .. } => {}
             }
         }
         true

From 2d43fde23526c909777ab54cd1851b4ad1251cc0 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 12:03:25 +0800
Subject: [PATCH 09/24] feat: apply cmd

---
 map_model/src/edits/apply.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/map_model/src/edits/apply.rs b/map_model/src/edits/apply.rs
index a6987fafa3..aa9e0302cb 100644
--- a/map_model/src/edits/apply.rs
+++ b/map_model/src/edits/apply.rs
@@ -273,7 +273,13 @@ impl EditCmd {
             EditCmd::ChangeRouteSchedule { id, new, .. } => {
                 map.transit_routes[id.0].spawn_times = new.clone();
             }
-            EditCmd::ChangeBuilding { b, old, new } => todo!(),
+            EditCmd::ChangeBuilding { b, ref new, .. } => {
+                let old_state = map.get_b_edit(*b);
+                if old_state == new.clone() {
+                    return;
+                }
+                map.buildings[b.0].parking = new.parking.clone()
+            }
         }
     }
 

From bc2a149126f5bd42c521fb3ca685eadb96555462 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Wed, 20 Sep 2023 12:45:41 +0800
Subject: [PATCH 10/24] feat: perma validator

---
 map_model/src/edits/perma.rs | 55 ++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/map_model/src/edits/perma.rs b/map_model/src/edits/perma.rs
index 3ec72aef9d..61e6dd1082 100644
--- a/map_model/src/edits/perma.rs
+++ b/map_model/src/edits/perma.rs
@@ -12,7 +12,8 @@ use crate::edits::{
     EditBuilding, EditCmd, EditIntersection, EditIntersectionControl, EditRoad, MapEdits,
 };
 use crate::{
-    osm, ControlStopSign, DiagonalFilter, IntersectionID, Map, MovementID, OriginalRoad, TurnType,
+    osm, ControlStopSign, DiagonalFilter, IntersectionID, Map, MovementID, OffstreetParking,
+    OriginalRoad, TurnType,
 };
 
 // Manually change this to attempt to preserve edits after major OSM updates.
@@ -158,7 +159,57 @@ impl PermanentEditCmd {
                     .ok_or_else(|| anyhow!("can't find {}", gtfs_id))?;
                 Ok(EditCmd::ChangeRouteSchedule { id, old, new })
             }
-            PermanentEditCmd::ChangeBuilding { b, new, old } => todo!(),
+            PermanentEditCmd::ChangeBuilding { b, new, old } => {
+                let id = map
+                    .find_b_by_osm_id(b)
+                    .ok_or_else(|| anyhow!("can't find {}", b))?;
+                let current_parking = &map.get_b(id).parking;
+                let old_parking = &old.parking;
+
+                match (old_parking, current_parking) {
+                    (
+                        OffstreetParking::Private(old_size, old_garage),
+                        OffstreetParking::Private(current_size, current_garage),
+                    ) => {
+                        if current_size != old_size {
+                            bail!(
+                                "building {} has {} parking lots now, but {} in the edits",
+                                id,
+                                current_size,
+                                old_size
+                            )
+                        }
+                        if current_garage != old_garage {
+                            bail!(
+                                "building {} has a garage {} now, but {} in the edits",
+                                id,
+                                current_garage,
+                                old_garage
+                            )
+                        }
+                    }
+                    (
+                        OffstreetParking::PublicGarage(_, old_size),
+                        OffstreetParking::PublicGarage(_, current_size),
+                    ) => {
+                        if current_size != old_size {
+                            bail!(
+                                "building {} has {} parking lots now, but {} in the edits",
+                                id,
+                                current_size,
+                                old_size
+                            )
+                        }
+                    }
+                    _ => bail!(
+                        "building {} has {:?} parking now, but {:?} in the edits",
+                        id,
+                        current_parking,
+                        old_parking
+                    ),
+                }
+                Ok(EditCmd::ChangeBuilding { b: id, old, new })
+            }
         }
     }
 }

From 86f195bd01138f08d459d34a35a27c15181fdbcd Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 13:30:31 +0800
Subject: [PATCH 11/24] feat: calc panels

---
 apps/game/src/edit/buildings.rs | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 4a99b12b7c..34ddb7dc3b 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,11 +1,15 @@
-use map_model::{BuildingID, EditBuilding, EditCmd};
-use widgetry::{EventCtx, State};
+use map_model::{Building, BuildingID, EditBuilding, EditCmd};
+use widgetry::{Drawable, EventCtx, GeomBatch, Panel, State, HorizontalAlignment, VerticalAlignment};
 
 use crate::app::{App, Transition};
 
 pub struct BuildingEditor {
     b: BuildingID,
 
+    top_panel: Panel,
+    main_panel: Panel,
+    fade_irrelevant: Drawable,
+
     // Undo/redo management
     num_edit_cmds_originally: usize,
     redo_stack: Vec<EditCmd>,
@@ -22,14 +26,23 @@ impl BuildingEditor {
 
         let mut editor = BuildingEditor {
             b,
+            top_panel: Panel::empty(ctx),
+            main_panel: Panel::empty(ctx),
+            fade_irrelevant: Drawable::empty(ctx),
 
             num_edit_cmds_originally: app.primary.map.get_edits().commands.len(),
             redo_stack: Vec::new(),
             orig_building_state: app.primary.map.get_b_edit(b), // TODO
         };
-        // TODO recalc panels?
+        editor.recalc_all_panels(ctx, app);
         Box::new(editor)
     }
+
+    fn recalc_all_panels(&mut self, ctx: &mut EventCtx, app: &App) {
+        self.main_panel = make_main_panel(ctx, app, self.b);
+
+        self.fade_irrelevant = fade_irrelevant(app, self.b).upload(ctx);
+    }
 }
 
 impl State<App> for BuildingEditor {
@@ -41,3 +54,14 @@ impl State<App> for BuildingEditor {
         todo!()
     }
 }
+
+fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
+    let map = &app.primary.map;
+    let current_state = map.get_b_edit(b);
+    
+    Panel::new_builder().aligned(HorizontalAlignment::Center, VerticalAlignment::TopInset).build(ctx)
+}
+
+fn fade_irrelevant(app: &App, b: BuildingID) -> GeomBatch {
+    todo!()
+}

From 4eab684ba70816bce72338077853e528043936ae Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 14:29:22 +0800
Subject: [PATCH 12/24] feat: make top panel

---
 apps/game/src/edit/buildings.rs | 84 +++++++++++++++++++++++++++++++--
 map_model/src/edits/mod.rs      |  7 ++-
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 34ddb7dc3b..6b07b69da1 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,5 +1,10 @@
-use map_model::{Building, BuildingID, EditBuilding, EditCmd};
-use widgetry::{Drawable, EventCtx, GeomBatch, Panel, State, HorizontalAlignment, VerticalAlignment};
+use std::vec;
+
+use map_model::{BuildingID, EditBuilding, EditCmd};
+use widgetry::{
+    lctrl, Drawable, EventCtx, GeomBatch, HorizontalAlignment, Key, Line, Panel, State,
+    VerticalAlignment, Widget,
+};
 
 use crate::app::{App, Transition};
 
@@ -41,12 +46,21 @@ impl BuildingEditor {
     fn recalc_all_panels(&mut self, ctx: &mut EventCtx, app: &App) {
         self.main_panel = make_main_panel(ctx, app, self.b);
 
+        self.top_panel = make_top_panel(
+            ctx,
+            app,
+            self.num_edit_cmds_originally,
+            self.redo_stack.is_empty(),
+            self.b,
+        );
+
         self.fade_irrelevant = fade_irrelevant(app, self.b).upload(ctx);
     }
 }
 
 impl State<App> for BuildingEditor {
     fn event(&mut self, ctx: &mut EventCtx, shared_app_state: &mut App) -> Transition {
+        // TODO: jump to building action
         todo!()
     }
 
@@ -55,11 +69,73 @@ impl State<App> for BuildingEditor {
     }
 }
 
+fn make_top_panel(
+    ctx: &mut EventCtx,
+    app: &App,
+    num_edit_cmds_originally: usize,
+    no_redo_cmds: bool,
+    b: BuildingID,
+) -> Panel {
+    let map = &app.primary.map;
+    let current_state = map.get_b_edit(b);
+
+    Panel::new_builder(Widget::col(vec![
+        Widget::row(vec![
+            Line(format!("Edit {}", b)).small_heading().into_widget(ctx),
+            ctx.style()
+                .btn_plain
+                .icon("system/assets/tools/location.svg")
+                .build_widget(ctx, "jump to building"),
+        ]),
+        Widget::row(vec![
+            ctx.style()
+                .btn_solid_primary
+                .text("Finish")
+                .hotkey(Key::Enter)
+                .build_def(ctx),
+            ctx.style()
+                .btn_plain
+                .icon("system/assets/tools/undo.svg")
+                .disabled(map.get_edits().commands.len() == num_edit_cmds_originally)
+                .hotkey(lctrl(Key::Z))
+                .build_widget(ctx, "undo"),
+            ctx.style()
+                .btn_plain
+                .icon("system/assets/tools/redo.svg")
+                .disabled(no_redo_cmds)
+                // TODO ctrl+shift+Z!
+                .hotkey(lctrl(Key::Y))
+                .build_widget(ctx, "redo"),
+            ctx.style()
+                .btn_plain_destructive
+                .text("Revert")
+                .disabled(
+                    current_state
+                        == EditBuilding::get_orig_from_osm(map.get_b(b), map.get_config()),
+                )
+                .build_def(ctx),
+            ctx.style()
+                .btn_plain
+                .text("Cancel")
+                .hotkey(Key::Escape)
+                .build_def(ctx),
+        ]),
+    ]))
+    .aligned(HorizontalAlignment::Center, VerticalAlignment::Top)
+    .build(ctx)
+}
+
 fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
     let map = &app.primary.map;
     let current_state = map.get_b_edit(b);
-    
-    Panel::new_builder().aligned(HorizontalAlignment::Center, VerticalAlignment::TopInset).build(ctx)
+
+    Panel::new_builder(Widget::col(vec![Widget::row(vec![
+        Line("Parking").secondary().into_widget(ctx).centered_vert(),
+        Widget::dropdown(ctx, "type", current_state.parking, todo!()).centered_vert(),
+        // TODO: edit capacity
+    ])]))
+    .aligned(HorizontalAlignment::Left, VerticalAlignment::Center)
+    .build(ctx)
 }
 
 fn fade_irrelevant(app: &App, b: BuildingID) -> GeomBatch {
diff --git a/map_model/src/edits/mod.rs b/map_model/src/edits/mod.rs
index 7459970618..4f3ca5ed7b 100644
--- a/map_model/src/edits/mod.rs
+++ b/map_model/src/edits/mod.rs
@@ -13,7 +13,7 @@ use osm2streets::{get_lane_specs_ltr, RestrictionType};
 
 pub use self::perma::PermanentMapEdits;
 use crate::{
-    AccessRestrictions, BuildingID, ControlStopSign, ControlTrafficSignal, Crossing,
+    AccessRestrictions, Building, BuildingID, ControlStopSign, ControlTrafficSignal, Crossing,
     DiagonalFilter, IntersectionControl, IntersectionID, LaneID, LaneSpec, Map, MapConfig,
     OffstreetParking, ParkingLotID, Road, RoadFilter, RoadID, TransitRouteID, TurnID, TurnType,
 };
@@ -199,6 +199,11 @@ impl EditIntersection {
 }
 
 impl EditBuilding {
+    pub fn get_orig_from_osm(b: &Building, cfg: &MapConfig) -> EditBuilding {
+        todo!()
+        // EditBuilding { parking: b.parking }
+    }
+
     fn diff(&self, other: &EditBuilding) -> Vec<String> {
         let mut changes = Vec::new();
         if self.parking != other.parking {

From db96488363cf6056d7c051ff82c9aba063fc66b8 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 15:21:55 +0800
Subject: [PATCH 13/24] feat: app event

---
 apps/game/src/edit/buildings.rs | 61 ++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 6b07b69da1..772e052367 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -2,18 +2,22 @@ use std::vec;
 
 use map_model::{BuildingID, EditBuilding, EditCmd};
 use widgetry::{
-    lctrl, Drawable, EventCtx, GeomBatch, HorizontalAlignment, Key, Line, Panel, State,
-    VerticalAlignment, Widget,
+    lctrl, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, State, VerticalAlignment,
+    Widget,
 };
 
-use crate::app::{App, Transition};
+use crate::{
+    app::{App, Transition},
+    common::Warping,
+    id::ID,
+};
 
 pub struct BuildingEditor {
     b: BuildingID,
 
     top_panel: Panel,
     main_panel: Panel,
-    fade_irrelevant: Drawable,
+    // TODO: fade_irrelevant to make things look nicer
 
     // Undo/redo management
     num_edit_cmds_originally: usize,
@@ -33,7 +37,6 @@ impl BuildingEditor {
             b,
             top_panel: Panel::empty(ctx),
             main_panel: Panel::empty(ctx),
-            fade_irrelevant: Drawable::empty(ctx),
 
             num_edit_cmds_originally: app.primary.map.get_edits().commands.len(),
             redo_stack: Vec::new(),
@@ -53,19 +56,47 @@ impl BuildingEditor {
             self.redo_stack.is_empty(),
             self.b,
         );
-
-        self.fade_irrelevant = fade_irrelevant(app, self.b).upload(ctx);
     }
 }
 
 impl State<App> for BuildingEditor {
-    fn event(&mut self, ctx: &mut EventCtx, shared_app_state: &mut App) -> Transition {
-        // TODO: jump to building action
-        todo!()
+    fn event(&mut self, ctx: &mut EventCtx, app: &mut App) -> Transition {
+        ctx.canvas_movement();
+
+        if let Outcome::Clicked(x) = self.top_panel.event(ctx) {
+            match x.as_ref() {
+                "jump to building" => {
+                    return Transition::Push(Warping::new_state(
+                        ctx,
+                        app.primary.canonical_point(ID::Building(self.b)).unwrap(),
+                        Some(10.0),
+                        Some(ID::Building(self.b)),
+                        &mut app.primary,
+                    ))
+                }
+                _ => unreachable!(),
+            }
+        }
+
+        match self.main_panel.event(ctx) {
+            Outcome::Changed(x) => match x.as_ref() {
+                "parking type" => {
+                    unimplemented!()
+                }
+                "parking capacity" => {
+                    unimplemented!()
+                }
+                _ => unreachable!(),
+            },
+            _ => debug!("main_panel had unhandled outcome"),
+        }
+
+        Transition::Keep
     }
 
-    fn draw(&self, g: &mut widgetry::GfxCtx, shared_app_state: &App) {
-        todo!()
+    fn draw(&self, g: &mut widgetry::GfxCtx, _: &App) {
+        self.top_panel.draw(g);
+        self.main_panel.draw(g);
     }
 }
 
@@ -131,13 +162,9 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
 
     Panel::new_builder(Widget::col(vec![Widget::row(vec![
         Line("Parking").secondary().into_widget(ctx).centered_vert(),
-        Widget::dropdown(ctx, "type", current_state.parking, todo!()).centered_vert(),
+        Widget::dropdown(ctx, "parking type", current_state.parking, todo!()).centered_vert(),
         // TODO: edit capacity
     ])]))
     .aligned(HorizontalAlignment::Left, VerticalAlignment::Center)
     .build(ctx)
 }
-
-fn fade_irrelevant(app: &App, b: BuildingID) -> GeomBatch {
-    todo!()
-}

From e528745f0cccd8ecf13e375b7c28afeca92cd700 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:14:24 +0800
Subject: [PATCH 14/24] feat: edit parking

---
 apps/game/src/edit/buildings.rs | 36 ++++++++++++++++++++++++---------
 apps/game/src/edit/mod.rs       | 11 +++++++++-
 apps/game/src/sandbox/mod.rs    |  8 +++++---
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 772e052367..7bf63646f1 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,9 +1,9 @@
 use std::vec;
 
-use map_model::{BuildingID, EditBuilding, EditCmd};
+use map_model::{BuildingID, EditBuilding, EditCmd, OffstreetParking};
 use widgetry::{
-    lctrl, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, State, VerticalAlignment,
-    Widget,
+    lctrl, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, Spinner, State,
+    VerticalAlignment, Widget,
 };
 
 use crate::{
@@ -12,6 +12,8 @@ use crate::{
     id::ID,
 };
 
+use super::can_edit_building_parking;
+
 pub struct BuildingEditor {
     b: BuildingID,
 
@@ -22,7 +24,6 @@ pub struct BuildingEditor {
     // Undo/redo management
     num_edit_cmds_originally: usize,
     redo_stack: Vec<EditCmd>,
-    orig_building_state: EditBuilding,
 }
 
 impl BuildingEditor {
@@ -40,7 +41,6 @@ impl BuildingEditor {
 
             num_edit_cmds_originally: app.primary.map.get_edits().commands.len(),
             redo_stack: Vec::new(),
-            orig_building_state: app.primary.map.get_b_edit(b), // TODO
         };
         editor.recalc_all_panels(ctx, app);
         Box::new(editor)
@@ -81,6 +81,7 @@ impl State<App> for BuildingEditor {
         match self.main_panel.event(ctx) {
             Outcome::Changed(x) => match x.as_ref() {
                 "parking type" => {
+                    // TODO allow changing between public and private
                     unimplemented!()
                 }
                 "parking capacity" => {
@@ -157,13 +158,30 @@ fn make_top_panel(
 }
 
 fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
+    if !can_edit_building_parking(app, b) {
+        return Panel::empty(ctx);
+    }
     let map = &app.primary.map;
     let current_state = map.get_b_edit(b);
-
+    let current_parking_capacity = match current_state.parking {
+        OffstreetParking::PublicGarage(_, _) | OffstreetParking::Private(_, false) => {
+            // TODO support editing parking for these cases
+            unreachable!()
+        }
+        OffstreetParking::Private(count, true) => count,
+    };
     Panel::new_builder(Widget::col(vec![Widget::row(vec![
-        Line("Parking").secondary().into_widget(ctx).centered_vert(),
-        Widget::dropdown(ctx, "parking type", current_state.parking, todo!()).centered_vert(),
-        // TODO: edit capacity
+        Line("Parking capacity")
+            .secondary()
+            .into_widget(ctx)
+            .centered_vert(),
+        Spinner::widget(
+            ctx,
+            "parking capacity",
+            (0, 999_999),
+            current_parking_capacity,
+            1,
+        ),
     ])]))
     .aligned(HorizontalAlignment::Left, VerticalAlignment::Center)
     .build(ctx)
diff --git a/apps/game/src/edit/mod.rs b/apps/game/src/edit/mod.rs
index 5ef6c8b2d7..e7ba66d308 100644
--- a/apps/game/src/edit/mod.rs
+++ b/apps/game/src/edit/mod.rs
@@ -6,7 +6,7 @@ use geom::Speed;
 use map_gui::options::OptionsPanel;
 use map_gui::render::DrawMap;
 use map_gui::tools::grey_out_map;
-use map_model::{EditCmd, IntersectionID, LaneID, MapEdits};
+use map_model::{BuildingID, EditCmd, IntersectionID, LaneID, MapEdits, OffstreetParking};
 use widgetry::mapspace::ToggleZoomed;
 use widgetry::tools::{ChooseSomething, ColorLegend, PopupMsg};
 use widgetry::{
@@ -812,6 +812,15 @@ pub fn can_edit_lane(app: &App, l: LaneID) -> bool {
     true
 }
 
+pub fn can_edit_building_parking(app: &App, b: BuildingID) -> bool {
+    let map = &app.primary.map;
+    let building = map.get_b(b);
+    match building.parking {
+        OffstreetParking::PublicGarage(_, _) | OffstreetParking::Private(_, false) => false,
+        OffstreetParking::Private(_, true) => true,
+    }
+}
+
 pub fn speed_limit_choices(app: &App, preset: Option<Speed>) -> Vec<Choice<Speed>> {
     // Don't need anything higher than 70mph. Though now I kind of miss 3am drives on TX-71...
     let mut speeds = (10..=70)
diff --git a/apps/game/src/sandbox/mod.rs b/apps/game/src/sandbox/mod.rs
index c26f50c178..dea7135b8b 100644
--- a/apps/game/src/sandbox/mod.rs
+++ b/apps/game/src/sandbox/mod.rs
@@ -21,8 +21,8 @@ use crate::app::{App, Transition};
 use crate::common::{tool_panel, CommonState};
 use crate::debug::DebugMode;
 use crate::edit::{
-    can_edit_lane, BuildingEditor, EditMode, RoadEditor, SaveEdits, StopSignEditor,
-    TrafficSignalEditor,
+    can_edit_building_parking, can_edit_lane, BuildingEditor, EditMode, RoadEditor, SaveEdits,
+    StopSignEditor, TrafficSignalEditor,
 };
 use crate::info::ContextualActions;
 use crate::layer::favorites::{Favorites, ShowFavorites};
@@ -339,7 +339,9 @@ impl ContextualActions for Actions {
                     } else {
                         actions.push((Key::F, "add this building to favorites".to_string()));
                     }
-                    actions.push((Key::E, "edit the parking of this building".to_string()))
+                    if can_edit_building_parking(app, b) {
+                        actions.push((Key::E, "edit the parking of this building".to_string()));
+                    }
                 }
                 _ => {}
             }

From cae8436da2cb486a6185986328476e5e675ca807 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:27:26 +0800
Subject: [PATCH 15/24] feat: update state logic

---
 apps/game/src/edit/buildings.rs | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 7bf63646f1..598eb35eec 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -12,7 +12,7 @@ use crate::{
     id::ID,
 };
 
-use super::can_edit_building_parking;
+use super::{apply_map_edits, can_edit_building_parking};
 
 pub struct BuildingEditor {
     b: BuildingID,
@@ -63,6 +63,8 @@ impl State<App> for BuildingEditor {
     fn event(&mut self, ctx: &mut EventCtx, app: &mut App) -> Transition {
         ctx.canvas_movement();
 
+        let mut panels_need_recalc = false;
+
         if let Outcome::Clicked(x) = self.top_panel.event(ctx) {
             match x.as_ref() {
                 "jump to building" => {
@@ -85,13 +87,32 @@ impl State<App> for BuildingEditor {
                     unimplemented!()
                 }
                 "parking capacity" => {
-                    unimplemented!()
+                    let parking_capacity: usize = self.main_panel.spinner("parking_capacity");
+
+                    let mut edits = app.primary.map.get_edits().clone();
+                    let old = app.primary.map.get_b_edit(self.b);
+                    let mut new = old.clone();
+                    // TODO support editing other types of parking
+                    new.parking = OffstreetParking::Private(parking_capacity, true);
+                    edits.commands.push(EditCmd::ChangeBuilding {
+                        b: self.b,
+                        old,
+                        new,
+                    });
+                    apply_map_edits(ctx, app, edits);
+                    self.redo_stack.clear();
+
+                    panels_need_recalc = true;
                 }
                 _ => unreachable!(),
             },
             _ => debug!("main_panel had unhandled outcome"),
         }
 
+        if panels_need_recalc {
+            self.recalc_all_panels(ctx, app);
+        }
+
         Transition::Keep
     }
 
@@ -177,7 +198,7 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
             .centered_vert(),
         Spinner::widget(
             ctx,
-            "parking capacity",
+            "parking_capacity",
             (0, 999_999),
             current_parking_capacity,
             1,

From ba049f3b80bbd21a9ef7306a2b54098edbdca8f4 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:30:26 +0800
Subject: [PATCH 16/24] feat: remove revert button

---
 apps/game/src/edit/buildings.rs | 11 +----------
 map_model/src/edits/mod.rs      |  9 ++-------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 598eb35eec..23b04d2d40 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,6 +1,6 @@
 use std::vec;
 
-use map_model::{BuildingID, EditBuilding, EditCmd, OffstreetParking};
+use map_model::{BuildingID, EditCmd, OffstreetParking};
 use widgetry::{
     lctrl, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, Spinner, State,
     VerticalAlignment, Widget,
@@ -130,7 +130,6 @@ fn make_top_panel(
     b: BuildingID,
 ) -> Panel {
     let map = &app.primary.map;
-    let current_state = map.get_b_edit(b);
 
     Panel::new_builder(Widget::col(vec![
         Widget::row(vec![
@@ -159,14 +158,6 @@ fn make_top_panel(
                 // TODO ctrl+shift+Z!
                 .hotkey(lctrl(Key::Y))
                 .build_widget(ctx, "redo"),
-            ctx.style()
-                .btn_plain_destructive
-                .text("Revert")
-                .disabled(
-                    current_state
-                        == EditBuilding::get_orig_from_osm(map.get_b(b), map.get_config()),
-                )
-                .build_def(ctx),
             ctx.style()
                 .btn_plain
                 .text("Cancel")
diff --git a/map_model/src/edits/mod.rs b/map_model/src/edits/mod.rs
index 4f3ca5ed7b..9da1312761 100644
--- a/map_model/src/edits/mod.rs
+++ b/map_model/src/edits/mod.rs
@@ -13,7 +13,7 @@ use osm2streets::{get_lane_specs_ltr, RestrictionType};
 
 pub use self::perma::PermanentMapEdits;
 use crate::{
-    AccessRestrictions, Building, BuildingID, ControlStopSign, ControlTrafficSignal, Crossing,
+    AccessRestrictions, BuildingID, ControlStopSign, ControlTrafficSignal, Crossing,
     DiagonalFilter, IntersectionControl, IntersectionID, LaneID, LaneSpec, Map, MapConfig,
     OffstreetParking, ParkingLotID, Road, RoadFilter, RoadID, TransitRouteID, TurnID, TurnType,
 };
@@ -199,11 +199,6 @@ impl EditIntersection {
 }
 
 impl EditBuilding {
-    pub fn get_orig_from_osm(b: &Building, cfg: &MapConfig) -> EditBuilding {
-        todo!()
-        // EditBuilding { parking: b.parking }
-    }
-
     fn diff(&self, other: &EditBuilding) -> Vec<String> {
         let mut changes = Vec::new();
         if self.parking != other.parking {
@@ -313,7 +308,7 @@ impl MapEdits {
                 EditCmd::ChangeRouteSchedule { id, .. } => {
                     self.changed_routes.insert(*id);
                 }
-                EditCmd::ChangeBuilding { b, old, new } => {
+                EditCmd::ChangeBuilding { b, old, .. } => {
                     if !self.original_buildings.contains_key(b) {
                         self.original_buildings.insert(*b, old.clone());
                     }

From 509be56eb2d702193686e6fa488153cd71c9cf04 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:49:59 +0800
Subject: [PATCH 17/24] fix: additional state handlers

---
 apps/game/src/edit/buildings.rs | 50 ++++++++++++++++++++++++++++++++-
 apps/game/src/sandbox/mod.rs    |  6 ++--
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 23b04d2d40..c164e404a6 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -1,6 +1,6 @@
 use std::vec;
 
-use map_model::{BuildingID, EditCmd, OffstreetParking};
+use map_model::{BuildingID, EditCmd, MapEdits, OffstreetParking};
 use widgetry::{
     lctrl, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, Spinner, State,
     VerticalAlignment, Widget,
@@ -57,6 +57,26 @@ impl BuildingEditor {
             self.b,
         );
     }
+
+    fn compress_edits(&self, app: &App) -> Option<MapEdits> {
+        // Compress all of the edits, unless there were 0 or 1 changes
+        if app.primary.map.get_edits().commands.len() > self.num_edit_cmds_originally + 2 {
+            let mut edits = app.primary.map.get_edits().clone();
+            let last_edit = match edits.commands.pop().unwrap() {
+                EditCmd::ChangeBuilding { new, .. } => new,
+                _ => unreachable!(),
+            };
+            edits.commands.truncate(self.num_edit_cmds_originally + 1);
+            match edits.commands.last_mut().unwrap() {
+                EditCmd::ChangeBuilding { ref mut new, .. } => {
+                    *new = last_edit;
+                }
+                _ => unreachable!(),
+            }
+            return Some(edits);
+        }
+        None
+    }
 }
 
 impl State<App> for BuildingEditor {
@@ -67,6 +87,34 @@ impl State<App> for BuildingEditor {
 
         if let Outcome::Clicked(x) = self.top_panel.event(ctx) {
             match x.as_ref() {
+                "Finish" => {
+                    if let Some(edits) = self.compress_edits(app) {
+                        apply_map_edits(ctx, app, edits);
+                    }
+                    return Transition::Pop;
+                }
+                "Cancel" => {
+                    let mut edits = app.primary.map.get_edits().clone();
+                    if edits.commands.len() != self.num_edit_cmds_originally {
+                        edits.commands.truncate(self.num_edit_cmds_originally);
+                        apply_map_edits(ctx, app, edits);
+                    }
+                    return Transition::Pop;
+                }
+                "undo" => {
+                    let mut edits = app.primary.map.get_edits().clone();
+                    self.redo_stack.push(edits.commands.pop().unwrap());
+                    apply_map_edits(ctx, app, edits);
+
+                    panels_need_recalc = true;
+                }
+                "redo" => {
+                    let mut edits = app.primary.map.get_edits().clone();
+                    edits.commands.push(self.redo_stack.pop().unwrap());
+                    apply_map_edits(ctx, app, edits);
+
+                    panels_need_recalc = true;
+                }
                 "jump to building" => {
                     return Transition::Push(Warping::new_state(
                         ctx,
diff --git a/apps/game/src/sandbox/mod.rs b/apps/game/src/sandbox/mod.rs
index dea7135b8b..acb787acc0 100644
--- a/apps/game/src/sandbox/mod.rs
+++ b/apps/game/src/sandbox/mod.rs
@@ -339,9 +339,9 @@ impl ContextualActions for Actions {
                     } else {
                         actions.push((Key::F, "add this building to favorites".to_string()));
                     }
-                    if can_edit_building_parking(app, b) {
-                        actions.push((Key::E, "edit the parking of this building".to_string()));
-                    }
+                    // if can_edit_building_parking(app, b) {
+                    actions.push((Key::E, "edit the parking of this building".to_string()));
+                    // }
                 }
                 _ => {}
             }

From 2f0979350ca2508a31b950c59321d8b9c4ea8c61 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 16:59:05 +0800
Subject: [PATCH 18/24] fix: handle parking case

---
 apps/game/src/edit/buildings.rs | 24 +++++++++++++-----------
 apps/game/src/sandbox/mod.rs    |  6 ++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index c164e404a6..97abeac366 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -12,7 +12,7 @@ use crate::{
     id::ID,
 };
 
-use super::{apply_map_edits, can_edit_building_parking};
+use super::apply_map_edits;
 
 pub struct BuildingEditor {
     b: BuildingID,
@@ -124,7 +124,7 @@ impl State<App> for BuildingEditor {
                         &mut app.primary,
                     ))
                 }
-                _ => unreachable!(),
+                _ => unreachable!("received unknown clicked key: {}", x),
             }
         }
 
@@ -134,7 +134,7 @@ impl State<App> for BuildingEditor {
                     // TODO allow changing between public and private
                     unimplemented!()
                 }
-                "parking capacity" => {
+                "parking_capacity" => {
                     let parking_capacity: usize = self.main_panel.spinner("parking_capacity");
 
                     let mut edits = app.primary.map.get_edits().clone();
@@ -152,7 +152,7 @@ impl State<App> for BuildingEditor {
 
                     panels_need_recalc = true;
                 }
-                _ => unreachable!(),
+                _ => unreachable!("received unknown change key: {}", x),
             },
             _ => debug!("main_panel had unhandled outcome"),
         }
@@ -218,17 +218,19 @@ fn make_top_panel(
 }
 
 fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
-    if !can_edit_building_parking(app, b) {
-        return Panel::empty(ctx);
-    }
     let map = &app.primary.map;
     let current_state = map.get_b_edit(b);
     let current_parking_capacity = match current_state.parking {
-        OffstreetParking::PublicGarage(_, _) | OffstreetParking::Private(_, false) => {
-            // TODO support editing parking for these cases
-            unreachable!()
-        }
         OffstreetParking::Private(count, true) => count,
+        // TODO support editing for the following 2
+        OffstreetParking::PublicGarage(_, _) => {
+            // unreachable!("parking cannot be edited for public garages")
+            0
+        }
+        OffstreetParking::Private(_, false) => {
+            // unreachable!("parking cannot be edited for buildings with no garages")
+            0
+        }
     };
     Panel::new_builder(Widget::col(vec![Widget::row(vec![
         Line("Parking capacity")
diff --git a/apps/game/src/sandbox/mod.rs b/apps/game/src/sandbox/mod.rs
index acb787acc0..27ac7ef274 100644
--- a/apps/game/src/sandbox/mod.rs
+++ b/apps/game/src/sandbox/mod.rs
@@ -21,8 +21,8 @@ use crate::app::{App, Transition};
 use crate::common::{tool_panel, CommonState};
 use crate::debug::DebugMode;
 use crate::edit::{
-    can_edit_building_parking, can_edit_lane, BuildingEditor, EditMode, RoadEditor, SaveEdits,
-    StopSignEditor, TrafficSignalEditor,
+    can_edit_lane, BuildingEditor, EditMode, RoadEditor, SaveEdits, StopSignEditor,
+    TrafficSignalEditor,
 };
 use crate::info::ContextualActions;
 use crate::layer::favorites::{Favorites, ShowFavorites};
@@ -339,9 +339,7 @@ impl ContextualActions for Actions {
                     } else {
                         actions.push((Key::F, "add this building to favorites".to_string()));
                     }
-                    // if can_edit_building_parking(app, b) {
                     actions.push((Key::E, "edit the parking of this building".to_string()));
-                    // }
                 }
                 _ => {}
             }

From a8a84ec71fc822bceaaa02bd28302dcd7819411c Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 17:25:47 +0800
Subject: [PATCH 19/24] feat: allow parking type to be changed

---
 apps/game/src/edit/buildings.rs | 101 +++++++++++++++++++++++---------
 1 file changed, 73 insertions(+), 28 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 97abeac366..2f372bbb31 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -2,7 +2,7 @@ use std::vec;
 
 use map_model::{BuildingID, EditCmd, MapEdits, OffstreetParking};
 use widgetry::{
-    lctrl, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, Spinner, State,
+    lctrl, Choice, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, Spinner, State,
     VerticalAlignment, Widget,
 };
 
@@ -131,8 +131,33 @@ impl State<App> for BuildingEditor {
         match self.main_panel.event(ctx) {
             Outcome::Changed(x) => match x.as_ref() {
                 "parking type" => {
-                    // TODO allow changing between public and private
-                    unimplemented!()
+                    let parking_type = self.main_panel.dropdown_value("parking type");
+                    let parking_capacity: usize = self.main_panel.spinner("parking_capacity");
+
+                    let mut edits = app.primary.map.get_edits().clone();
+                    let old = app.primary.map.get_b_edit(self.b);
+                    let mut new = old.clone();
+
+                    new.parking = match parking_type {
+                        "public" => {
+                            // TODO support input public garage name
+                            OffstreetParking::PublicGarage("TODO".to_string(), parking_capacity)
+                        }
+                        "private" => {
+                            OffstreetParking::Private(parking_capacity, parking_capacity > 0)
+                        }
+                        _ => unreachable!("unknown parking type received: {}", parking_type),
+                    };
+
+                    edits.commands.push(EditCmd::ChangeBuilding {
+                        b: self.b,
+                        old,
+                        new,
+                    });
+                    apply_map_edits(ctx, app, edits);
+                    self.redo_stack.clear();
+
+                    panels_need_recalc = true;
                 }
                 "parking_capacity" => {
                     let parking_capacity: usize = self.main_panel.spinner("parking_capacity");
@@ -140,8 +165,14 @@ impl State<App> for BuildingEditor {
                     let mut edits = app.primary.map.get_edits().clone();
                     let old = app.primary.map.get_b_edit(self.b);
                     let mut new = old.clone();
-                    // TODO support editing other types of parking
-                    new.parking = OffstreetParking::Private(parking_capacity, true);
+                    new.parking = match old.parking {
+                        OffstreetParking::Private(_, has_parking) => {
+                            OffstreetParking::Private(parking_capacity, has_parking)
+                        }
+                        OffstreetParking::PublicGarage(ref name, _) => {
+                            OffstreetParking::PublicGarage(name.to_string(), parking_capacity)
+                        }
+                    };
                     edits.commands.push(EditCmd::ChangeBuilding {
                         b: self.b,
                         old,
@@ -221,30 +252,44 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
     let map = &app.primary.map;
     let current_state = map.get_b_edit(b);
     let current_parking_capacity = match current_state.parking {
-        OffstreetParking::Private(count, true) => count,
-        // TODO support editing for the following 2
-        OffstreetParking::PublicGarage(_, _) => {
-            // unreachable!("parking cannot be edited for public garages")
-            0
-        }
-        OffstreetParking::Private(_, false) => {
-            // unreachable!("parking cannot be edited for buildings with no garages")
-            0
-        }
+        OffstreetParking::Private(count, true) | OffstreetParking::PublicGarage(_, count) => count,
+        OffstreetParking::Private(_, false) => 0,
     };
-    Panel::new_builder(Widget::col(vec![Widget::row(vec![
-        Line("Parking capacity")
-            .secondary()
-            .into_widget(ctx)
-            .centered_vert(),
-        Spinner::widget(
-            ctx,
-            "parking_capacity",
-            (0, 999_999),
-            current_parking_capacity,
-            1,
-        ),
-    ])]))
+    Panel::new_builder(Widget::col(vec![
+        Widget::row(vec![
+            Line("Parking type")
+                .secondary()
+                .into_widget(ctx)
+                .centered_vert(),
+            Widget::dropdown(
+                ctx,
+                "parking type",
+                "public".to_string(),
+                parking_type_choices(),
+            ),
+        ]),
+        Widget::row(vec![
+            Line("Parking capacity")
+                .secondary()
+                .into_widget(ctx)
+                .centered_vert(),
+            Spinner::widget(
+                ctx,
+                "parking_capacity",
+                (0, 999_999),
+                current_parking_capacity,
+                1,
+            ),
+        ]),
+    ]))
     .aligned(HorizontalAlignment::Left, VerticalAlignment::Center)
     .build(ctx)
 }
+
+fn parking_type_choices() -> Vec<Choice<String>> {
+    let choices = vec!["public", "private"];
+    choices
+        .into_iter()
+        .map(|choice| Choice::new(choice.to_string(), choice.to_string()))
+        .collect()
+}

From d6d9519092990f84783252a4fa7c8d1cb1681756 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 17:31:44 +0800
Subject: [PATCH 20/24] feat: dynamically pass in parking type

---
 apps/game/src/edit/buildings.rs   | 3 ++-
 map_model/src/objects/building.rs | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 2f372bbb31..1b92db1f61 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -255,6 +255,7 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
         OffstreetParking::Private(count, true) | OffstreetParking::PublicGarage(_, count) => count,
         OffstreetParking::Private(_, false) => 0,
     };
+
     Panel::new_builder(Widget::col(vec![
         Widget::row(vec![
             Line("Parking type")
@@ -264,7 +265,7 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
             Widget::dropdown(
                 ctx,
                 "parking type",
-                "public".to_string(),
+                current_state.parking.get_variant_name(),
                 parking_type_choices(),
             ),
         ]),
diff --git a/map_model/src/objects/building.rs b/map_model/src/objects/building.rs
index 4b7ac1446a..becf6f56c9 100644
--- a/map_model/src/objects/building.rs
+++ b/map_model/src/objects/building.rs
@@ -58,6 +58,15 @@ pub enum OffstreetParking {
     Private(usize, bool),
 }
 
+impl OffstreetParking {
+    pub fn get_variant_name(&self) -> String {
+        match self {
+            OffstreetParking::Private(_, _) => "private".to_string(),
+            OffstreetParking::PublicGarage(_, _) => "public".to_string(),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub enum BuildingType {
     Residential {

From 49087bc393a92019d5b2423af4ed7b7a515438e6 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 24 Sep 2023 17:36:23 +0800
Subject: [PATCH 21/24] chore: remove unused fn

---
 apps/game/src/edit/mod.rs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/apps/game/src/edit/mod.rs b/apps/game/src/edit/mod.rs
index e7ba66d308..5ef6c8b2d7 100644
--- a/apps/game/src/edit/mod.rs
+++ b/apps/game/src/edit/mod.rs
@@ -6,7 +6,7 @@ use geom::Speed;
 use map_gui::options::OptionsPanel;
 use map_gui::render::DrawMap;
 use map_gui::tools::grey_out_map;
-use map_model::{BuildingID, EditCmd, IntersectionID, LaneID, MapEdits, OffstreetParking};
+use map_model::{EditCmd, IntersectionID, LaneID, MapEdits};
 use widgetry::mapspace::ToggleZoomed;
 use widgetry::tools::{ChooseSomething, ColorLegend, PopupMsg};
 use widgetry::{
@@ -812,15 +812,6 @@ pub fn can_edit_lane(app: &App, l: LaneID) -> bool {
     true
 }
 
-pub fn can_edit_building_parking(app: &App, b: BuildingID) -> bool {
-    let map = &app.primary.map;
-    let building = map.get_b(b);
-    match building.parking {
-        OffstreetParking::PublicGarage(_, _) | OffstreetParking::Private(_, false) => false,
-        OffstreetParking::Private(_, true) => true,
-    }
-}
-
 pub fn speed_limit_choices(app: &App, preset: Option<Speed>) -> Vec<Choice<Speed>> {
     // Don't need anything higher than 70mph. Though now I kind of miss 3am drives on TX-71...
     let mut speeds = (10..=70)

From 56a6a263539651111cbce17a4939991da5ab4ad9 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sat, 30 Sep 2023 19:29:15 +0800
Subject: [PATCH 22/24] feat: edit garage name

---
 apps/game/src/edit/buildings.rs | 43 +++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 1b92db1f61..01e59aadd8 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -3,7 +3,7 @@ use std::vec;
 use map_model::{BuildingID, EditCmd, MapEdits, OffstreetParking};
 use widgetry::{
     lctrl, Choice, EventCtx, HorizontalAlignment, Key, Line, Outcome, Panel, Spinner, State,
-    VerticalAlignment, Widget,
+    TextBox, VerticalAlignment, Widget,
 };
 
 use crate::{
@@ -183,6 +183,27 @@ impl State<App> for BuildingEditor {
 
                     panels_need_recalc = true;
                 }
+                "new_garage_name" => {
+                    let new_garage_name = self.main_panel.text_box("new_garage_name");
+
+                    let mut edits = app.primary.map.get_edits().clone();
+                    let old = app.primary.map.get_b_edit(self.b);
+                    let mut new = old.clone();
+
+                    new.parking = match old.parking {
+                        OffstreetParking::Private(_, _) => {
+                            unreachable!("Garage name can only be edited if it is public");
+                        }
+                        OffstreetParking::PublicGarage(_, size) => {
+                            OffstreetParking::PublicGarage(new_garage_name, size)
+                        }
+                    };
+                    edits.commands.push(EditCmd::ChangeBuilding {
+                        b: self.b,
+                        old,
+                        new,
+                    })
+                }
                 _ => unreachable!("received unknown change key: {}", x),
             },
             _ => debug!("main_panel had unhandled outcome"),
@@ -256,7 +277,7 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
         OffstreetParking::Private(_, false) => 0,
     };
 
-    Panel::new_builder(Widget::col(vec![
+    let mut fields = vec![
         Widget::row(vec![
             Line("Parking type")
                 .secondary()
@@ -282,9 +303,21 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
                 1,
             ),
         ]),
-    ]))
-    .aligned(HorizontalAlignment::Left, VerticalAlignment::Center)
-    .build(ctx)
+    ];
+
+    if let OffstreetParking::PublicGarage(name, _) = current_state.parking {
+        fields.push(Widget::row(vec![
+            Line("Garage Name")
+                .secondary()
+                .into_widget(ctx)
+                .centered_vert(),
+            TextBox::widget(ctx, "new_garage_name", name, false, 100),
+        ]));
+    }
+
+    Panel::new_builder(Widget::col(fields))
+        .aligned(HorizontalAlignment::Left, VerticalAlignment::Center)
+        .build(ctx)
 }
 
 fn parking_type_choices() -> Vec<Choice<String>> {

From e2316bd0f624cd4c45c9b22def2b36bb20de6db9 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 1 Oct 2023 10:30:21 +0800
Subject: [PATCH 23/24] feat: default garage name

---
 apps/game/src/edit/buildings.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index 01e59aadd8..daf2bf44c9 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -139,10 +139,10 @@ impl State<App> for BuildingEditor {
                     let mut new = old.clone();
 
                     new.parking = match parking_type {
-                        "public" => {
-                            // TODO support input public garage name
-                            OffstreetParking::PublicGarage("TODO".to_string(), parking_capacity)
-                        }
+                        "public" => OffstreetParking::PublicGarage(
+                            "untitled public garage".to_string(),
+                            parking_capacity,
+                        ),
                         "private" => {
                             OffstreetParking::Private(parking_capacity, parking_capacity > 0)
                         }

From 24ee4b4ffeeb4f5b7de6abd86fc254b9c77a10a9 Mon Sep 17 00:00:00 2001
From: Nigel Lee <ticklepoke@users.noreply.github.com>
Date: Sun, 1 Oct 2023 13:22:16 +0800
Subject: [PATCH 24/24] feat: recreate building

---
 apps/game/src/edit/buildings.rs |  6 +++---
 apps/game/src/edit/mod.rs       |  4 ++++
 map_gui/src/render/building.rs  |  7 +++++++
 map_gui/src/render/map.rs       | 12 ++++++++++++
 map_model/src/edits/apply.rs    |  1 +
 map_model/src/edits/mod.rs      |  1 +
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/apps/game/src/edit/buildings.rs b/apps/game/src/edit/buildings.rs
index daf2bf44c9..0d5756edca 100644
--- a/apps/game/src/edit/buildings.rs
+++ b/apps/game/src/edit/buildings.rs
@@ -130,8 +130,8 @@ impl State<App> for BuildingEditor {
 
         match self.main_panel.event(ctx) {
             Outcome::Changed(x) => match x.as_ref() {
-                "parking type" => {
-                    let parking_type = self.main_panel.dropdown_value("parking type");
+                "parking_type" => {
+                    let parking_type = self.main_panel.dropdown_value("parking_type");
                     let parking_capacity: usize = self.main_panel.spinner("parking_capacity");
 
                     let mut edits = app.primary.map.get_edits().clone();
@@ -285,7 +285,7 @@ fn make_main_panel(ctx: &mut EventCtx, app: &App, b: BuildingID) -> Panel {
                 .centered_vert(),
             Widget::dropdown(
                 ctx,
-                "parking type",
+                "parking_type",
                 current_state.parking.get_variant_name(),
                 parking_type_choices(),
             ),
diff --git a/apps/game/src/edit/mod.rs b/apps/game/src/edit/mod.rs
index 5ef6c8b2d7..5dcc76f7fc 100644
--- a/apps/game/src/edit/mod.rs
+++ b/apps/game/src/edit/mod.rs
@@ -786,6 +786,10 @@ pub fn apply_map_edits(ctx: &mut EventCtx, app: &mut App, edits: MapEdits) {
             app.primary.draw_map.get_pl(pl).clear_rendering();
         }
 
+        for b in effects.changed_buildings {
+            app.primary.draw_map.recreate_building(b, &app.primary.map);
+        }
+
         if app.primary.layer.as_ref().and_then(|l| l.name()) == Some("map edits") {
             app.primary.layer = Some(Box::new(crate::layer::map::Static::edits(ctx, app)));
         }
diff --git a/map_gui/src/render/building.rs b/map_gui/src/render/building.rs
index dfcd83ac99..e5418d9611 100644
--- a/map_gui/src/render/building.rs
+++ b/map_gui/src/render/building.rs
@@ -206,6 +206,13 @@ impl DrawBuilding {
         }
     }
 
+    pub fn new_empty(id: BuildingID) -> DrawBuilding {
+        DrawBuilding {
+            id,
+            label: RefCell::new(None),
+        }
+    }
+
     pub fn clear_rendering(&mut self) {
         *self.label.borrow_mut() = None;
     }
diff --git a/map_gui/src/render/map.rs b/map_gui/src/render/map.rs
index 7ba30c9fb7..ed96303a9d 100644
--- a/map_gui/src/render/map.rs
+++ b/map_gui/src/render/map.rs
@@ -514,6 +514,15 @@ impl DrawMap {
         self.roads[road.id.0] = draw;
     }
 
+    pub fn recreate_building(&mut self, b: BuildingID, map: &Map) {
+        self.quadtree.remove(ID::Building(b)).unwrap();
+
+        let draw = DrawBuilding::new_empty(b);
+        self.quadtree
+            .insert_with_box(draw.get_id(), draw.get_bounds(map));
+        self.buildings[b.0] = draw;
+    }
+
     pub fn free_memory(&mut self) {
         // Clear the lazily evaluated zoomed-in details
         for r in &mut self.roads {
@@ -528,5 +537,8 @@ impl DrawMap {
         for pl in &mut self.parking_lots {
             pl.clear_rendering();
         }
+        for b in &mut self.buildings {
+            b.clear_rendering();
+        }
     }
 }
diff --git a/map_model/src/edits/apply.rs b/map_model/src/edits/apply.rs
index aa9e0302cb..25b825d3ad 100644
--- a/map_model/src/edits/apply.rs
+++ b/map_model/src/edits/apply.rs
@@ -45,6 +45,7 @@ impl Map {
             deleted_turns: BTreeSet::new(),
             changed_parking_lots: BTreeSet::new(),
             modified_lanes: BTreeSet::new(),
+            changed_buildings: BTreeSet::new(),
         };
 
         // Short-circuit to avoid marking pathfinder_dirty
diff --git a/map_model/src/edits/mod.rs b/map_model/src/edits/mod.rs
index 9da1312761..58e28efa9e 100644
--- a/map_model/src/edits/mod.rs
+++ b/map_model/src/edits/mod.rs
@@ -72,6 +72,7 @@ pub struct EditEffects {
     pub changed_roads: BTreeSet<RoadID>,
     pub deleted_lanes: BTreeSet<LaneID>,
     pub changed_intersections: BTreeSet<IntersectionID>,
+    pub changed_buildings: BTreeSet<BuildingID>,
     // TODO Will we need modified turns?
     pub added_turns: BTreeSet<TurnID>,
     pub deleted_turns: BTreeSet<TurnID>,