Make the inner bundle of Parented transparent

Signed-off-by: Michael X. Grey <[email protected]>

Author: mxgrey

rmf_site_format/src/misc.rs

@@ -476,6 +476,7 @@ pub struct SiteID(pub u32);
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Parented<P: RefTrait, T> {
     pub parent: P,
+    #[serde(flatten)]
     pub bundle: T,
 }
 

rmf_site_format/src/sdf.rs

@@ -870,6 +870,6 @@ mod tests {
             ..Default::default()
         };
         let s = yaserde::ser::to_string_with_config(&sdf, &config).unwrap();
-        std::fs::write("test.sdf", s);
+        std::fs::write("test.sdf", s).unwrap();
     }
 }

rmf_site_format/src/site.rs

@@ -202,6 +202,18 @@ impl Site {
         serde_json::to_vec_pretty(self)
     }
 
+    pub fn to_bytes_json_pretty(&self) -> serde_json::Result<Vec<u8>> {
+        serde_json::to_vec(self)
+    }
+
+    pub fn to_string_json(&self) -> serde_json::Result<String> {
+        serde_json::to_string(self)
+    }
+
+    pub fn to_string_json_pretty(&self) -> serde_json::Result<String> {
+        serde_json::to_string_pretty(self)
+    }
+
     pub fn from_bytes_ron<'a>(s: &'a [u8]) -> ron::error::SpannedResult<Self> {
         ron::de::from_bytes(s)
     }
@@ -258,4 +270,12 @@ mod tests {
         let site_string = map.to_site().unwrap().to_bytes_json().unwrap();
         Site::from_bytes_json(&site_string).unwrap();
     }
+
+    #[test]
+    fn produce_json_string() {
+        let data = std::fs::read("../assets/demo_maps/office.building.yaml").unwrap();
+        let map = BuildingMap::from_bytes(&data).unwrap();
+        let text = map.to_site().unwrap().to_string_json_pretty().unwrap();
+        println!("{text}");
+    }
 }