Bus/Bus/DrawingBus.cs

@@ -1,4 +1,4 @@
-using Bus;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Bus/Bus/FormMapWithSetDoubleDeckerBus.cs

@@ -80,7 +80,7 @@ namespace Bus
 
         private void ButtonAddBus_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
+            if (_mapBusCollectionGeneric == null)
             {
                 return;
             }
@@ -94,10 +94,11 @@ namespace Bus
                 }
 
                 DrawingObjectBus bus = new(form.SelectedBus);
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1)
+
+                if (_mapBusCollectionGeneric + bus != -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                    pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
                 }
                 else
                 {
@@ -108,27 +109,20 @@ namespace Bus
 
         private void ButtonRemoveBus_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-
             if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
             }
-
             if (MessageBox.Show("Удалить объект?", "Удаление",
             MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
             {
                 return;
             }
-
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+            if (_mapBusCollectionGeneric - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
             }
             else
             {