From 748584bfde574c5c77f9aac873a55f32862b4c83 Mon Sep 17 00:00:00 2001
From: 111 <0@yandex.ru>
Date: Tue, 22 Nov 2022 16:24:33 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/FormMapWithArmoredCars.java       | 2 +-
 src/main/java/MapWithSetArmoredCarsGeneric.java | 4 ++++
 src/main/java/MapsCollection.java               | 3 +++
 src/main/java/SetArmoredCarsGeneric.java        | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/FormMapWithArmoredCars.java b/src/main/java/FormMapWithArmoredCars.java
index 8a573ae..9fcf89a 100644
--- a/src/main/java/FormMapWithArmoredCars.java
+++ b/src/main/java/FormMapWithArmoredCars.java
@@ -38,7 +38,7 @@ public class FormMapWithArmoredCars extends JFrame{
 
     public FormMapWithArmoredCars() {
         super("Карта с набором объектов");
-        setBounds(100, 100, 1000, 700);
+        setBounds(100, 100, 1000, 725);
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         JMenuBar jMenuBar = new JMenuBar();
diff --git a/src/main/java/MapWithSetArmoredCarsGeneric.java b/src/main/java/MapWithSetArmoredCarsGeneric.java
index 295ee64..2967eed 100644
--- a/src/main/java/MapWithSetArmoredCarsGeneric.java
+++ b/src/main/java/MapWithSetArmoredCarsGeneric.java
@@ -146,6 +146,10 @@ public class MapWithSetArmoredCarsGeneric<T extends IDrawingObject, U extends Ab
             return _setCars;
         }
 
+        public void removeAllCars() {
+            _setCars.Clear();
+        }
+
         public String GetData(char separatorType, char separatorData)
         {
             String data = String.format("%s%s", _map.getClass().getName(), separatorType);
diff --git a/src/main/java/MapsCollection.java b/src/main/java/MapsCollection.java
index f7bee8b..c3dfb0f 100644
--- a/src/main/java/MapsCollection.java
+++ b/src/main/java/MapsCollection.java
@@ -150,6 +150,9 @@ public class MapsCollection {
                     map = new MyMapWooden();
                     break;
             }
+            if (_mapStorages.containsKey(elem[0])) {
+                _mapStorages.get(elem[0]).removeAllCars();
+            }
             _mapStorages.put(elem[0], new MapWithSetArmoredCarsGeneric<>(_pictureWidth, _pictureHeight, map));
             _mapStorages.get(elem[0]).LoadData(elem[2].split(String.valueOf(separatorData)));
         } catch (IOException e) {
diff --git a/src/main/java/SetArmoredCarsGeneric.java b/src/main/java/SetArmoredCarsGeneric.java
index aca2008..62df917 100644
--- a/src/main/java/SetArmoredCarsGeneric.java
+++ b/src/main/java/SetArmoredCarsGeneric.java
@@ -48,4 +48,8 @@ public class SetArmoredCarsGeneric<T> {
     {
         return () -> _places.stream().filter(Objects::nonNull).iterator();
     }
+
+    public void Clear() {
+        _places.clear();
+    }
 }