5 files changed, 113 insertions, 1 deletions

diff --git a/src/cli/cmd/edit.rs b/src/cli/cmd/edit.rs
new file mode 100644
index 0000000..797edc6
--- /dev/null
+++ b/src/cli/cmd/edit.rs
@@ -0,0 +1,35 @@
+//! Replace the contents of the currently edited map with contents from a file.
+
+use super::Command;
+use super::{CmdParseError, FromArgs};
+use crate::map::MapData;
+use crate::Editor;
+use std::path::PathBuf;
+
+pub struct Edit {
+    file: PathBuf,
+}
+
+impl FromArgs for Edit {
+    fn from_args(args: &[&str]) -> Result<Self, CmdParseError> {
+        if args.len() != 1 {
+            return Err(CmdParseError::WrongNumberOfArgs(args.len(), 1..=1));
+        }
+
+        Ok(Self {
+            file: PathBuf::from(args[0]),
+        })
+    }
+}
+
+impl Command for Edit {
+    fn process(&self, editor: &mut Editor) -> Result<String, String> {
+        let data = match MapData::load_from_file(&self.file) {
+            Ok(data) => data,
+            Err(err) => return Err(format!("Unable to read file: {:?}", &self.file)),
+        };
+
+        editor.map_mut().set_data(data);
+        Ok(format!("Map data from {:?} loaded.", &self.file))
+    }
+}
diff --git a/src/cli/cmd/mod.rs b/src/cli/cmd/mod.rs
index 29063e8..42e865a 100644
--- a/src/cli/cmd/mod.rs
+++ b/src/cli/cmd/mod.rs
@@ -1,7 +1,11 @@
 //! The commands that can be performed in the CLI
 
+pub mod edit;
+pub mod read;
 pub mod save;
 
+pub use edit::*;
+pub use read::*;
 pub use save::*;
 
 use crate::Editor;
@@ -32,6 +36,8 @@ pub fn parse_command(string: &str) -> Result<Box<dyn Command>, CmdParseError> {
     let parts: Vec<&str> = string.split_whitespace().collect();
     match parts[0] {
         "w" => Ok(Box::new(Save::from_args(&parts[1..])?)),
+        "e" => Ok(Box::new(Edit::from_args(&parts[1..])?)),
+        "r" => Ok(Box::new(Read::from_args(&parts[1..])?)),
         other => Err(CmdParseError::NoSuchCmd(other.to_owned())),
     }
 }
diff --git a/src/cli/cmd/read.rs b/src/cli/cmd/read.rs
new file mode 100644
index 0000000..4ac671c
--- /dev/null
+++ b/src/cli/cmd/read.rs
@@ -0,0 +1,38 @@
+//! Read the contents of a file and add it to the currently edited map.
+
+use super::Command;
+use super::{CmdParseError, FromArgs};
+use crate::map::MapData;
+use crate::Editor;
+use std::path::PathBuf;
+
+pub struct Read {
+    file: PathBuf,
+}
+
+impl FromArgs for Read {
+    fn from_args(args: &[&str]) -> Result<Self, CmdParseError> {
+        if args.len() != 1 {
+            return Err(CmdParseError::WrongNumberOfArgs(args.len(), 1..=1));
+        }
+
+        Ok(Self {
+            file: PathBuf::from(args[0]),
+        })
+    }
+}
+
+impl Command for Read {
+    fn process(&self, editor: &mut Editor) -> Result<String, String> {
+        let data = match MapData::load_from_file(&self.file) {
+            Ok(data) => data,
+            Err(err) => return Err(format!("Unable to read file: {:?}", &self.file)),
+        };
+
+        editor.map_mut().add_data(data);
+        Ok(format!(
+            "Map data from {:?} read and added to the current buffer.",
+            &self.file
+        ))
+    }
+}
diff --git a/src/map/data.rs b/src/map/data.rs
index b7719cd..f7ec484 100644
--- a/src/map/data.rs
+++ b/src/map/data.rs
@@ -65,7 +65,7 @@ impl MapData {
     }
 
     /// Load the map data from a file. Fails if the file does not exist or cannot be correctly parsed.
-    pub fn load_from_file<P: AsRef<Path>>(&mut self, path: P) -> io::Result<Self> {
+    pub fn load_from_file<P: AsRef<Path>>(path: P) -> io::Result<Self> {
         let file = File::open(&path)?;
         let data: Self = match from_reader(file) {
             Ok(data) => data,
diff --git a/src/map/mod.rs b/src/map/mod.rs
index 28025ad..70f65b3 100644
--- a/src/map/mod.rs
+++ b/src/map/mod.rs
@@ -147,19 +147,52 @@ impl Map {
             .chain(self.icons.iter_mut().map(|i| i as &mut dyn Mappable))
     }
 
+    /// Get the rectangular rooms of this map.
     pub fn rect_rooms(&self) -> &Vec<RectRoom> {
         &self.rect_rooms
     }
 
+    /// Get the polygon rooms of this map.
     pub fn polygon_rooms(&self) -> &Vec<PolygonRoom> {
         &self.polygon_rooms
     }
 
+    /// Get the walls of this map.
     pub fn walls(&self) -> &Vec<Wall> {
         &self.walls
     }
 
+    /// Get the icons of this map.
     pub fn icons(&self) -> &Vec<Icon> {
         &self.icons
     }
+
+    /// Replace the internal map data with the data provided. (Load and replace)
+    pub fn set_data(&mut self, data: MapData) {
+        // Remove all data.
+        self.icons.clear();
+        self.polygon_rooms.clear();
+        self.rect_rooms.clear();
+        self.walls.clear();
+
+        // Add all data from the map data.
+        self.add_data(data);
+    }
+
+    /// Add the data provided to the current data on the map. All elements will remain, with the
+    /// additional elements being pushed also.
+    pub fn add_data(&mut self, data: MapData) {
+        for i in data.icons {
+            self.push_icon(Icon::from_data(i, self.icon_renderer.clone()))
+        }
+        for p in data.polygon_rooms {
+            self.push_polygon_room(p);
+        }
+        for r in data.rect_rooms {
+            self.push_rect_room(r);
+        }
+        for w in data.walls {
+            self.push_wall(w);
+        }
+    }
 }