Merge pull request 'Borschevskaya A.A. Lab Work 5' (#5 ) from lab5 into lab4

Reviewed-on: http://student.git.athene.tech/pgirl1/PIbd-23_Borschevskaya_A.A._ArmoredCar_Base/pulls/5
2022-11-07 10:36:01 +04:00
14 changed files with 36 additions and 473 deletions
--- a/ArmoredCar/ArmoredCar/ArmoredCar.csproj
+++ b/ArmoredCar/ArmoredCar/ArmoredCar.csproj
@@ -6,29 +6,6 @@
    <UseWindowsForms>true</UseWindowsForms>
  </PropertyGroup>

-  <ItemGroup>
-    <None Remove="appsettings.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-	  <EmbeddedResource Include="appsettings.json">
-	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-	  </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-  </ItemGroup>
-
  <ItemGroup>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
--- a/ArmoredCar/ArmoredCar/ArmoredCarNotFoundException.cs
+++ b/ArmoredCar/ArmoredCar/ArmoredCarNotFoundException.cs
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ArmoredCar
-{
-    [Serializable]
-    internal class ArmoredCarNotFoundException : ApplicationException
-    {
-        public ArmoredCarNotFoundException(int i) : base($"Не найден объект по позиции{i}") { }
-        public ArmoredCarNotFoundException() : base() { }
-        public ArmoredCarNotFoundException(string message) : base(message) { }
-        public ArmoredCarNotFoundException(string message, Exception exception) :
-       base(message, exception)
-        { }
-        protected ArmoredCarNotFoundException(SerializationInfo info, StreamingContext
-       contex) : base(info, contex) { }
-    }
-}
--- a/ArmoredCar/ArmoredCar/DrawningObjectArmCar.cs
+++ b/ArmoredCar/ArmoredCar/DrawningObjectArmCar.cs
@@ -33,8 +33,5 @@ namespace ArmoredCar
            if (_armCar != null)
                _armCar.DrawTransport(g);
        }
-        public string GetInfo() => _armCar?.GetDataForSave();
-        public static IDrawningObject Create(string data) => new
-       DrawningObjectArmCar(data.CreateDrawningArmoredCar());
    }
 }
--- a/ArmoredCar/ArmoredCar/ExtensionArmoredCar.cs
+++ b/ArmoredCar/ArmoredCar/ExtensionArmoredCar.cs
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ArmoredCar
-{
-    internal static class ExtensionArmoredCar
-    {
-        /// <summary>
-        /// Разделитель для записи информации по объекту в файл
-        /// </summary>
-        private static readonly char _separatorForObject = ':';
-        /// <summary>
-        /// Создание объекта из строки
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        public static DrawningArmoredCar CreateDrawningArmoredCar(this string info)
-        {
-            string[] strs = info.Split(_separatorForObject);
-            if (strs.Length == 3)
-            {
-                return new DrawningArmoredCar(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
-            }
-            if (strs.Length == 6)
-            {
-                return new DrawningTank(Convert.ToInt32(strs[0]),
-                Convert.ToInt32(strs[1]), Color.FromName(strs[2]),
-                Color.FromName(strs[3]), Convert.ToBoolean(strs[4]),
-               Convert.ToBoolean(strs[5]));
-            }
-            return null;
-        }
-        /// <summary>
-        /// Получение данных для сохранения в файл
-        /// </summary>
-        /// <param name="drawningArmoredCar"></param>
-        /// <returns></returns>
-        public static string GetDataForSave(this DrawningArmoredCar drawningArmoredCar)
-        {
-            var armoredCar = drawningArmoredCar.ArmoredCar;
-            var str =
-           $"{armoredCar.Speed}{_separatorForObject}{armoredCar.Weight}{_separatorForObject}{armoredCar.BodyColor.Name}";
-            if (armoredCar is not EntityTank tank)
-            {
-                return str;
-            }
-            return
-           $"{str}{_separatorForObject}{tank.DopColor.Name}{_separatorForObject}{tank.TowerWeapon}{_separatorForObject}{tank.AMachineGun}";
-        }
-    }
-}
-
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.Designer.cs
@@ -47,16 +47,9 @@ namespace ArmoredCar
            this.buttonShowOnMap = new System.Windows.Forms.Button();
            this.buttonAddCar = new System.Windows.Forms.Button();
            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
            this.groupBoxTools.SuspendLayout();
            this.groupBoxMaps.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.menuStrip1.SuspendLayout();
            this.SuspendLayout();
            // 
            // groupBoxTools
@@ -72,9 +65,9 @@ namespace ArmoredCar
            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
            this.groupBoxTools.Controls.Add(this.buttonAddCar);
            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(802, 24);
+            this.groupBoxTools.Location = new System.Drawing.Point(811, 0);
            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(204, 637);
+            this.groupBoxTools.Size = new System.Drawing.Size(204, 632);
            this.groupBoxTools.TabIndex = 0;
            this.groupBoxTools.TabStop = false;
            this.groupBoxTools.Text = "Инструменты";
@@ -175,7 +168,7 @@ namespace ArmoredCar
            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonDown.BackgroundImage = global::ArmoredCar.Properties.Resources.Down;
            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(91, 587);
+            this.buttonDown.Location = new System.Drawing.Point(91, 582);
            this.buttonDown.Name = "buttonDown";
            this.buttonDown.Size = new System.Drawing.Size(30, 30);
            this.buttonDown.TabIndex = 10;
@@ -187,7 +180,7 @@ namespace ArmoredCar
            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonRight.BackgroundImage = global::ArmoredCar.Properties.Resources.Right;
            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(127, 587);
+            this.buttonRight.Location = new System.Drawing.Point(127, 582);
            this.buttonRight.Name = "buttonRight";
            this.buttonRight.Size = new System.Drawing.Size(30, 30);
            this.buttonRight.TabIndex = 9;
@@ -199,7 +192,7 @@ namespace ArmoredCar
            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonLeft.BackgroundImage = global::ArmoredCar.Properties.Resources.Left;
            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(55, 587);
+            this.buttonLeft.Location = new System.Drawing.Point(55, 582);
            this.buttonLeft.Name = "buttonLeft";
            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
            this.buttonLeft.TabIndex = 8;
@@ -211,7 +204,7 @@ namespace ArmoredCar
            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
            this.buttonUp.BackgroundImage = global::ArmoredCar.Properties.Resources.Up;
            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(91, 551);
+            this.buttonUp.Location = new System.Drawing.Point(91, 546);
            this.buttonUp.Name = "buttonUp";
            this.buttonUp.Size = new System.Drawing.Size(30, 30);
            this.buttonUp.TabIndex = 7;
@@ -241,62 +234,19 @@ namespace ArmoredCar
            // pictureBox
            // 
            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 24);
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(802, 637);
+            this.pictureBox.Size = new System.Drawing.Size(811, 632);
            this.pictureBox.TabIndex = 1;
            this.pictureBox.TabStop = false;
            // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.FileToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(1006, 24);
-            this.menuStrip1.TabIndex = 2;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // FileToolStripMenuItem
-            // 
-            this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.SaveToolStripMenuItem,
-            this.LoadToolStripMenuItem});
-            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
-            this.FileToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
-            this.FileToolStripMenuItem.Text = "Файл";
-            // 
-            // SaveToolStripMenuItem
-            // 
-            this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
-            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
-            this.SaveToolStripMenuItem.Text = "Сохранение";
-            this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
-            // 
-            // LoadToolStripMenuItem
-            // 
-            this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
-            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
-            this.LoadToolStripMenuItem.Text = "Загрузка";
-            this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
-            // 
-            // openFileDialog
-            // 
-            this.openFileDialog.Filter = "txt file | *.txt";
-            // 
-            // saveFileDialog
-            // 
-            this.saveFileDialog.Filter = "txt file | *.txt";
-            // 
            // FormMapWithSetArmoredCars
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1006, 661);
+            this.ClientSize = new System.Drawing.Size(1015, 632);
            this.Controls.Add(this.pictureBox);
            this.Controls.Add(this.groupBoxTools);
-            this.Controls.Add(this.menuStrip1);
-            this.MainMenuStrip = this.menuStrip1;
            this.Name = "FormMapWithSetArmoredCars";
            this.Text = "Карта с набором объектов";
            this.groupBoxTools.ResumeLayout(false);
@@ -304,10 +254,7 @@ namespace ArmoredCar
            this.groupBoxMaps.ResumeLayout(false);
            this.groupBoxMaps.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
            this.ResumeLayout(false);
-            this.PerformLayout();

        }

@@ -330,11 +277,5 @@ namespace ArmoredCar
        private ListBox listBoxMaps;
        private TextBox textBoxNewMapName;
        private Button buttonAddMap;
-        private MenuStrip menuStrip1;
-        private ToolStripMenuItem FileToolStripMenuItem;
-        private ToolStripMenuItem SaveToolStripMenuItem;
-        private ToolStripMenuItem LoadToolStripMenuItem;
-        private OpenFileDialog openFileDialog;
-        private SaveFileDialog saveFileDialog;
    }
 }
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using System;
-using Microsoft.Extensions.Logging;

 namespace ArmoredCar
 {
@@ -21,16 +20,11 @@ namespace ArmoredCar
        /// </summary>
        private readonly MapsCollection _mapsCollection;
        /// <summary>
-        /// Логер
-        /// </summary>
-        private readonly ILogger _logger;
-        /// <summary>
        /// Конструктор
        /// </summary>
-        public FormMapWithSetArmoredCars(ILogger<FormMapWithSetArmoredCars> logger)
+        public FormMapWithSetArmoredCars()
        {
            InitializeComponent();
-            _logger = logger;
            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
            comboBoxSelectorMap.Items.Clear();
            foreach (var elem in _mapsDict)
@@ -70,18 +64,15 @@ namespace ArmoredCar
            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
            {
                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogWarning("При добавлении карты были заполнены не все данные");
                return;
            }
            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
            {
                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                _logger.LogWarning($"Нет такой карты: {comboBoxSelectorMap.Text}");
                return;
            }
            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
            ReloadMaps();
-            _logger.LogInformation($"Добавлена карта {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
        }
        /// <summary>
        /// Выбор карты
@@ -92,7 +83,6 @@ namespace ArmoredCar
        {   
           
            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-            _logger.LogInformation($"Переход на карту {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
        }
        /// <summary>
        /// Удаление карты
@@ -110,7 +100,6 @@ namespace ArmoredCar
            {
                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
                ReloadMaps();
-                _logger.LogInformation($"Удалена карта {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
            }
        }
        /// <summary>
@@ -120,9 +109,9 @@ namespace ArmoredCar
        /// <param name="e"></param>
        private void ButtonAddarmoredCar_Click(object sender, EventArgs e)
        {  
-            var form = new FormArmoredCarConfig();
+            var form = new FormArmoredCarConfig(); 
            form.AddEvent(AddArmoredCar);
-            form.Show();                               
+            form.Show();
        }

        private void AddArmoredCar(DrawningArmoredCar drawningArmoredCar)
@@ -133,30 +122,16 @@ namespace ArmoredCar
            }

            DrawningObjectArmCar armoredCar = new(drawningArmoredCar);
-            try
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + armoredCar > -1)
            {
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + armoredCar > -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-                    _logger.LogInformation($"Добавлен объект: {armoredCar.GetInfo()}");
-                }
-                else
-                {
-                    _logger.LogWarning("Не удалось добавить объект");
-                    MessageBox.Show("Не удалось добавить объект");
-                }
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
            }
-            catch (StorageOverflowException ex)
+            else
            {
-                _logger.LogWarning($"Ошибка добавления: {ex.Message}");
-                MessageBox.Show($"Ошибка добавления: {ex.Message}");
+                MessageBox.Show("Не удалось добавить объект");
            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"Неизвестная ошибка:{ex.Message}");
-                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
-            }      
+            
        }
        /// <summary>
        /// Удаление объекта
@@ -178,32 +153,15 @@ namespace ArmoredCar
                return;
            }
            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            try
+            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
            {
-                var armoredCar = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
-                if (armoredCar != null)
-                {
-                    MessageBox.Show("Объект удален");
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-                    _logger.LogInformation($"Удален объект: {armoredCar.GetInfo()}");
-                }
-                else
-                {
-                    _logger.LogWarning("Не удалось удалить объект");
-                    MessageBox.Show("Не удалось удалить объект");
-                }
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
            }
-            catch (ArmoredCarNotFoundException ex)
+            else
            {
-                _logger.LogWarning($"Ошибка удаления: {ex.Message}");
-                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+                MessageBox.Show("Не удалось удалить объект");
            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning($"Неизвестная ошибка: {ex.Message}");
-                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
-            }
-            
        }
        /// <summary>
        /// Вывод набора
@@ -262,56 +220,5 @@ namespace ArmoredCar
            }
            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
        }
-        /// <summary>
-        /// Обработка нажатия "Сохранение"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _mapsCollection.SaveData(saveFileDialog.FileName);
-                    _logger.LogInformation($"Сохранение карт в файл {saveFileDialog.FileName}");
-                    MessageBox.Show("Сохранение прошло успешно", "Результат",
-                    MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning($"Не сохранилось: {ex.Message}");
-                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-        /// <summary>
-        /// Обработка нажатия "Загрузка"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _mapsCollection.LoadData(openFileDialog.FileName);
-                    _logger.LogInformation($"Загрузка карты из файла {openFileDialog.FileName}");
-                    MessageBox.Show("Загрузка прошла успешно", "Результат", 
-                        MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    ReloadMaps();
-                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning($"Не загрузилось: {ex.Message}");
-                    MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат",
-                   MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
    }
 }
--- a/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.resx
+++ b/ArmoredCar/ArmoredCar/FormMapWithSetArmoredCars.resx
@@ -57,16 +57,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>279, 17</value>
-  </metadata>
-  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>150, 17</value>
-  </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
-  </metadata>
 </root>
--- a/ArmoredCar/ArmoredCar/IDrawningObject.cs
+++ b/ArmoredCar/ArmoredCar/IDrawningObject.cs
@@ -36,10 +36,5 @@ namespace ArmoredCar
        /// </summary>
        /// <returns></returns>
        (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
-        /// <summary>
-        /// Получение информации по объекту
-        /// </summary>
-        /// <returns></returns>
-        string GetInfo();
    }
 }
--- a/ArmoredCar/ArmoredCar/MapWithSetArmoredCarsGeneric.cs
+++ b/ArmoredCar/ArmoredCar/MapWithSetArmoredCarsGeneric.cs
@@ -181,30 +181,5 @@ namespace ArmoredCar
                k++;
            }          
        }
-        /// <summary>
-        /// Получение данных в виде строки
-        /// </summary>
-        /// <param name="sep"></param>
-        /// <returns></returns>
-        public string GetData(char separatorType, char separatorData)
-        {
-            string data = $"{_map.GetType().Name}{separatorType}";
-            foreach (var armoredCar in _setCars.GetCars())
-            {
-                data += $"{armoredCar.GetInfo()}{separatorData}";
-            }
-            return data;
-        }
-        /// <summary>
-        /// Загрузка списка из массива строк
-        /// </summary>
-        /// <param name="records"></param>
-        public void LoadData(string[] records)
-        {
-            foreach (var rec in records)
-            {
-                _setCars.Insert(DrawningObjectArmCar.Create(rec) as T);
-            }
-        }
    }
 }
--- a/ArmoredCar/ArmoredCar/MapsCollection.cs
+++ b/ArmoredCar/ArmoredCar/MapsCollection.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -11,7 +10,7 @@ namespace ArmoredCar
    {
        /// Словарь (хранилище) с картами
        /// </summary>
-        readonly Dictionary<string, MapWithSetArmoredCarsGeneric<IDrawningObject, AbstractMap>> _mapStorages;
+        readonly Dictionary<string, MapWithSetArmoredCarsGeneric<DrawningObjectArmCar, AbstractMap>> _mapStorages;
        /// <summary>
        /// Возвращение списка названий карт
        /// </summary>
@@ -25,21 +24,13 @@ namespace ArmoredCar
        /// </summary>
        private readonly int _pictureHeight;
        /// <summary>
-        /// Разделитель для записи информации по элементу словаря в файл
-        /// </summary>
-        private readonly char separatorDict = '|';
-        /// <summary>
-        /// Разделитель для записей коллекции данных в файл
-        /// </summary>
-        private readonly char separatorData = ';';
-        /// <summary>
        /// Конструктор
        /// </summary>
        /// <param name="pictureWidth"></param>
        /// <param name="pictureHeight"></param>
        public MapsCollection(int pictureWidth, int pictureHeight)
        {
-            _mapStorages = new Dictionary<string, MapWithSetArmoredCarsGeneric<IDrawningObject, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetArmoredCarsGeneric<DrawningObjectArmCar, AbstractMap>>();
            _pictureWidth = pictureWidth;
            _pictureHeight = pictureHeight;
        }
@@ -51,7 +42,7 @@ namespace ArmoredCar
        public void AddMap(string name, AbstractMap map)
        {
            if (!Keys.Contains(name))
-                _mapStorages.Add(name, new MapWithSetArmoredCarsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages.Add(name, new MapWithSetArmoredCarsGeneric<DrawningObjectArmCar, AbstractMap>(_pictureWidth, _pictureHeight, map));
        }
        /// <summary>
        /// Удаление карты
@@ -67,7 +58,7 @@ namespace ArmoredCar
        /// </summary>
        /// <param name="ind"></param>
        /// <returns></returns>
-        public MapWithSetArmoredCarsGeneric<IDrawningObject, AbstractMap> this[string
+        public MapWithSetArmoredCarsGeneric<DrawningObjectArmCar, AbstractMap> this[string
       ind]
        {
            get
@@ -77,68 +68,5 @@ namespace ArmoredCar
                return null;
            }
        }
-
-        /// <summary>
-        /// Сохранение информации по автомобилям в хранилище в файл
-        /// </summary>
-        /// <param name="filename">Путь и имя файла</param>
-        /// <returns></returns>
-        public void SaveData(string filename)
-        {
-            if (File.Exists(filename))
-            {
-                File.Delete(filename);
-            }
-            using (FileStream f = new FileStream(filename, FileMode.Create))
-            using (StreamWriter sw = new StreamWriter(f, Encoding.UTF8))
-            {
-                sw.WriteLine("MapsCollection");
-                foreach (var storage in _mapStorages)
-                {
-
-                    sw.WriteLine($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}");
-                }
-            }
-        }
-        /// <summary>
-        /// Загрузка нформации по автомобилям на парковках из файла
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <returns></returns>
-        public void LoadData(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                throw new FileNotFoundException("Файл не найден");
-            }
-            using (FileStream f = new(filename, FileMode.Open))
-            using (StreamReader sw = new(f, Encoding.UTF8))
-            {
-
-                if (!sw.ReadLine().Contains("MapsCollection"))                
-                    throw new FileFormatException("Формат данных в файле не правильный");
-                string? line;
-                _mapStorages.Clear();
-                while ((line = sw.ReadLine()) != null)
-                {                   
-                    var elem = line.Split(separatorDict);
-                    AbstractMap map = null;
-                    switch (elem[1])
-                    {
-                        case "SimpleMap":
-                            map = new SimpleMap();
-                            break;
-                        case "MyMapLabirinth":
-                            map = new MyMapLabirinth();
-                            break;
-                        case "MyMapWooden":
-                            map = new MyMapWooden();
-                            break;
-                    }
-                    _mapStorages.Add(elem[0], new MapWithSetArmoredCarsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
-                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
-                }               
-            }
-        }
    }
 }
--- a/ArmoredCar/ArmoredCar/Program.cs
+++ b/ArmoredCar/ArmoredCar/Program.cs
@@ -1,10 +1,8 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Configuration;
-using Serilog;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.IO;

 namespace ArmoredCar
 {
@@ -18,33 +16,8 @@ namespace ArmoredCar
        {
            Application.SetHighDpiMode(HighDpiMode.SystemAware);
            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
-            ConfigureServices(services);
-            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
-            {
-                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetArmoredCars>());
-            }
-        }
-
-        private static void ConfigureServices(ServiceCollection services)
-        {
-            services.AddSingleton<FormMapWithSetArmoredCars>()
-            .AddLogging(option =>
-                    {
-                        var configuration = new ConfigurationBuilder()
-                        .SetBasePath(Directory.GetCurrentDirectory())
-                        .AddJsonFile(path: "appsettings.json", optional: false, reloadOnChange: true)
-                        .Build();
-
-                        var logger = new LoggerConfiguration()
-                         .ReadFrom.Configuration(configuration)
-                         .CreateLogger();
-
-                        option.SetMinimumLevel(LogLevel.Information);
-                        option.AddSerilog(logger);
-                    });
+            Application.SetCompatibleTextRenderingDefault(false);         
+            Application.Run(new FormMapWithSetArmoredCars());
        }
    }
 }
--- a/ArmoredCar/ArmoredCar/SetArmoredCarsGeneric.cs
+++ b/ArmoredCar/ArmoredCar/SetArmoredCarsGeneric.cs
@@ -33,8 +33,10 @@ namespace ArmoredCar
        /// <param name="armoredCar">Добавляемый автомобиль</param>
        /// <returns></returns>
        public int Insert(T armoredCar)
-        {         
-            return Insert(armoredCar, 0);         
+        {   
+            if (Count < _maxCount)
+                return Insert(armoredCar, 0);
+            return -1;
        }
        /// <summary>
        /// Добавление объекта в набор на конкретную позицию
@@ -44,9 +46,6 @@ namespace ArmoredCar
        /// <returns></returns>
        public int Insert(T armoredCar, int position)
        {
-            if (Count >= _maxCount)
-                throw new StorageOverflowException(Count);
-
            if (position < 0 || position >= _maxCount)
                return -1;

@@ -63,8 +62,6 @@ namespace ArmoredCar
            if (position < 0 ||  position >= Count)
                return null;
            T armoredCar = _places[position];
-            if (armoredCar == null)
-                throw new ArmoredCarNotFoundException(position);
            _places.RemoveAt(position);
            return armoredCar;
        }
--- a/ArmoredCar/ArmoredCar/StorageOverflowException.cs
+++ b/ArmoredCar/ArmoredCar/StorageOverflowException.cs
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ArmoredCar
-{
-
-    [Serializable]
-    internal class StorageOverflowException : ApplicationException
-    {
-        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
-        public StorageOverflowException() : base() { }
-        public StorageOverflowException(string message) : base(message) { }
-        public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
-        protected StorageOverflowException(SerializationInfo info,StreamingContext contex) : base(info, contex) { }
-    }
-}
--- a/ArmoredCar/ArmoredCar/appsettings.json
+++ b/ArmoredCar/ArmoredCar/appsettings.json
@@ -1,16 +0,0 @@
-{
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.File" ],
-    "MinimumLevel": "Information",
-    "WriteTo": [
-      {
-        "Name": "File",
-        "Args": {
-          "path": "armoredCar_log-.log",
-          "rollingInterval": "Day"
-        }
-      }
-    ],
-    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]
-  }
-}