From 9bee85d77bab4b8eac117900b7b4a74e30f86c49 Mon Sep 17 00:00:00 2001
From: Zyzf <vladkalihev8@gmail.com>
Date: Mon, 10 Oct 2022 08:51:30 +0400
Subject: [PATCH] fixed checks

---
 .../FormMapWithSetBoats.cs                           |  2 +-
 .../MapsCollection.cs                                | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs
index c0a410f..f4239bb 100644
--- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs
+++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs
@@ -75,7 +75,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
         /// <param name="e"></param>
         private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
         {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
         /// <summary>
         /// Удаление карты
diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs
index c94f3cc..8ddce4a 100644
--- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs
+++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs
@@ -45,6 +45,18 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
         /// <param name="map">Карта</param>
         public void AddMap(string name, AbstractMap map)
         {
+            if (name == null)
+            {
+                return;
+            }
+            foreach (var key in _mapStorages.Keys)
+            {
+                if (key.Equals(name))
+                {
+                    MessageBox.Show("Объект с таким именем существует!");
+                    return;
+                }
+            }
             _mapStorages.Add(name, new MapWithSetBoatsGeneric<DrawningObjectBoat, AbstractMap>(_pictureWidth, _pictureHeight, map));
         }
         /// <summary>