fix(map): fix Map::from_actions

src/map.rs

@@ -46,6 +46,16 @@ impl Map {
             player_position += &action.direction().into();
             min_position = min_position.zip_map(&player_position, |a, b| a.min(b));
             max_position = max_position.zip_map(&player_position, |a, b| a.max(b));
+            if action.is_push() {
+                min_position = min_position
+                    .zip_map(&(player_position + &action.direction().into()), |a, b| {
+                        a.min(b)
+                    });
+                max_position = max_position
+                    .zip_map(&(player_position + &action.direction().into()), |a, b| {
+                        a.max(b)
+                    });
+            }
         }
 
         // Reserve space for walls
@@ -69,6 +79,7 @@ impl Map {
             instance[current_player_position] = Tiles::Floor;
             current_player_position += &action.direction().into();
             if action.is_push() {
+                instance[current_player_position + &action.direction().into()] = Tiles::Floor;
                 // The player pushed the box when moving, which means there is a box at the
                 // player's current position
                 if !current_box_positions.contains(&current_player_position) {
@@ -96,6 +107,9 @@ impl Map {
         for goal_position in &goal_positions {
             instance[*goal_position].insert(Tiles::Goal);
         }
+        if box_positions.contains(&player_position) {
+            return Err(ParseMapError::InvalidActions);
+        }
 
         instance.add_walls_around_floors();
 
@@ -110,6 +124,9 @@ impl Map {
                 .do_action(action.direction())
                 .map_err(|_| ParseMapError::InvalidActions)?;
         }
+        if !level.map().is_solved() {
+            return Err(ParseMapError::InvalidActions);
+        }
 
         Ok(instance)
     }

tests/map.rs

@@ -8,7 +8,7 @@ mod utils;
 use utils::*;
 
 #[test]
-fn parse_map_error() {
+fn map_from_str() {
     let no_player_map = r#"
         #####
         # $.#
@@ -63,6 +63,12 @@ fn parse_map_error() {
         Map::from_str(invalid_character_map).unwrap_err(),
         ParseMapError::InvalidCharacter('!')
     );
+}
+
+#[test]
+fn map_from_actions() {
+    assert!(Map::from_actions(&Actions::from_str("R").unwrap()).is_ok());
+    assert!(Map::from_actions(&Actions::from_str("DuLLrUUdrR").unwrap()).is_ok());
 
     assert_eq!(
         Map::from_actions(&Actions::from_str("RddrU").unwrap()).unwrap_err(),