From 8d381d488fd61c759e253bb9e4aca43e023bc93a Mon Sep 17 00:00:00 2001
From: "Michael X. Grey" <grey@openrobotics.org>
Date: Thu, 17 Aug 2023 13:20:16 +0800
Subject: [PATCH] Reduce calls to .unwrap()

Signed-off-by: Michael X. Grey <grey@openrobotics.org>
---
 rmf_site_format/src/legacy/building_map.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rmf_site_format/src/legacy/building_map.rs b/rmf_site_format/src/legacy/building_map.rs
index a3ca4460..31ed1030 100644
--- a/rmf_site_format/src/legacy/building_map.rs
+++ b/rmf_site_format/src/legacy/building_map.rs
@@ -204,7 +204,8 @@ impl BuildingMap {
             let mut feature_info = HashMap::new();
             let mut primary_drawing_id = None;
             if !level.drawing.filename.is_empty() {
-                primary_drawing_id = Some(site_id.next().unwrap());
+                let drawing_id = site_id.next().unwrap();
+                primary_drawing_id = Some(drawing_id);
                 let drawing_name = Path::new(&level.drawing.filename)
                     .file_stem()
                     .unwrap_or_default()
@@ -299,7 +300,7 @@ impl BuildingMap {
                         FeatureInfo {
                             fiducial_id,
                             on_anchor: anchor_id,
-                            in_drawing: primary_drawing_id.unwrap(),
+                            in_drawing: drawing_id,
                             name: (!feature.name.is_empty()).then(|| feature.name.clone()),
                         },
                     );
@@ -326,7 +327,7 @@ impl BuildingMap {
                 }
 
                 drawings.insert(
-                    primary_drawing_id.unwrap(),
+                    drawing_id,
                     SiteDrawing {
                         properties: DrawingProperties {
                             name: NameInSite(drawing_name),
@@ -340,7 +341,7 @@ impl BuildingMap {
                         measurements,
                     },
                 );
-                rankings.drawings.push(primary_drawing_id.unwrap());
+                rankings.drawings.push(drawing_id);
             }
 
             for (name, layer) in &level.layers {