Готовая 8 лабораторная работа

ElectricLocomotive/ElectricLocomotive/AbstractMap.cs

@@ -0,0 +1,146 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal abstract class AbstractMap
+    {
+        private IDrawningObject _drawningObject = null;
+        protected int[,] _map = null;
+        protected int _width;
+        protected int _height;
+        protected float _size_x;
+        protected float _size_y;
+        protected readonly Random _random = new();
+        protected readonly int _freeRoad = 0;
+        protected readonly int _barrier = 1;
+
+        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
+        {
+            _width = width;
+            _height = height;
+            _drawningObject = drawningObject;
+            GenerateMap();
+            while (!SetObjectOnMap())
+            {
+                GenerateMap();
+            }
+            return DrawMapWithObject();
+        }
+        public Bitmap MoveObject(Direction direction)
+        {
+            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+
+            float locomotiveWidth = rightX - leftX;
+            float locomotiveHeight = bottomY - topY;
+
+            for (int i = 0; i < _map.GetLength(0); i++)
+            {
+                for (int j = 0; j < _map.GetLength(1); j++)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        switch (direction)
+                        {
+                            case Direction.Up:
+                                if (_size_y * (j + 1) >= topY - _drawningObject.Step && _size_y * (j + 1) < topY && _size_x * (i + 1) > leftX
+                                    && _size_x * (i + 1) <= rightX)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                            case Direction.Down:
+                                if (_size_y * j <= bottomY + _drawningObject.Step && _size_y * j > bottomY && _size_x * (i + 1) > leftX
+                                    && _size_x * (i + 1) <= rightX)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                            case Direction.Left:
+                                if (_size_x * (i + 1) >= leftX - _drawningObject.Step && _size_x * (i + 1) < leftX && _size_y * (j + 1) < bottomY
+                                    && _size_y * (j + 1) >= topY)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                            case Direction.Right:
+                                if (_size_x * i <= rightX + _drawningObject.Step && _size_x * i > leftX && _size_y * (j + 1) < bottomY
+                                    && _size_y * (j + 1) >= topY)
+                                {
+                                    return DrawMapWithObject();
+                                }
+                                break;
+                        }
+                    }
+                }
+            }
+            if (true)
+            {
+                _drawningObject.MoveObject(direction);
+            }
+            return DrawMapWithObject();
+        }
+
+        private bool SetObjectOnMap()
+        {
+            (float leftX, float topY, float rightX, float bottomY) = _drawningObject.GetCurrentPosition();
+            if (_drawningObject == null || _map == null)
+            {
+                return false;
+            }
+
+            float locomotiveWidth = rightX - leftX;
+            float locomotiveHeight = bottomY - topY;
+
+            int x = _random.Next(0, 10);
+            int y = _random.Next(0, 10);
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    if (_map[i, j] == _barrier)
+                    {
+                        if (x + locomotiveWidth >= _size_x * i && x <= _size_x * i && y + locomotiveHeight > _size_y * j && y <= _size_y * j)
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            _drawningObject.SetObject(x, y, _width, _height);
+            return true;
+        }
+        private Bitmap DrawMapWithObject()
+        {
+            Bitmap bmp = new(_width, _height);
+            if (_drawningObject == null || _map == null)
+            {
+                return bmp;
+            }
+            Graphics gr = Graphics.FromImage(bmp);
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    if (_map[i, j] == _freeRoad)
+                    {
+                        DrawRoadPart(gr, i, j);
+                    }
+                    else if (_map[i, j] == _barrier)
+                    {
+                        DrawBarrierPart(gr, i, j);
+                    }
+                }
+            }
+            _drawningObject.DrawningObject(gr);
+            return bmp;
+        }
+
+        protected abstract void GenerateMap();
+        protected abstract void DrawRoadPart(Graphics g, int i, int j);
+        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
+    }
+}

ElectricLocomotive/ElectricLocomotive/BushesMap.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class BushesMap : AbstractMap
+    {
+
+        private readonly Pen barrierColor = new Pen(Color.DarkGreen, 3);
+        private readonly Brush roadColor = new SolidBrush(Color.Brown);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7));
+            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))), new Point(Convert.ToInt32(i * (_size_x - 1) + 7), Convert.ToInt32(j * (_size_y - 1)) + 7));
+            g.DrawLine(barrierColor, new Point(Convert.ToInt32(i * (_size_x - 1)+7), Convert.ToInt32(j * (_size_y - 1))+7), new Point(Convert.ToInt32(i * (_size_x - 1) + 14), Convert.ToInt32(j * (_size_y - 1)) ));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 20)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    
+    }
+}

ElectricLocomotive/ElectricLocomotive/Direction.cs

@@ -6,8 +6,9 @@ using System.Threading.Tasks;
 
 namespace ElectricLocomotive
 {
-    internal enum Direction
+    public enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class DrawningElectricLocomotive : DrawningLocomotive
+    {
+        public DrawningElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool sportLine) :
+           base(speed, weight, bodyColor, 110, 60)
+        {
+            Locomotive = new EntityElectricLocomotive(speed, weight, bodyColor, dopColor, bodyKit, sportLine);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Locomotive is not EntityElectricLocomotive sportCar)
+            {
+                return;
+            }
+
+            Pen pen = new(Color.Black);
+            Pen window = new(Color.Blue);
+            Brush dopBrush = new SolidBrush(sportCar.DopColor);
+
+            if (sportCar.BodyKit)
+            {
+                Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 15, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY)), new Point(Convert.ToInt32(_startPosX) + 75, Convert.ToInt32(_startPosY) + 10), new Point(Convert.ToInt32(_startPosX) + 45, Convert.ToInt32(_startPosY) + 40) };
+                g.DrawPolygon(Pens.Black, pts);
+            }
+
+            if (sportCar.SportLine)
+            {
+                Point[] pts = { new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 90), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 150, Convert.ToInt32(_startPosY) + 90) };
+                g.FillPolygon(dopBrush, pts);
+            }
+
+            base.DrawTransport(g);
+        }
+        public void SetExtraColor(Color color)
+        {
+            (Locomotive as EntityElectricLocomotive).DopColor = color;
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs

@@ -7,71 +7,35 @@ using System.Threading.Tasks;
 
 namespace ElectricLocomotive
 {
-    internal class DrawningLocomotive
+    public class DrawningLocomotive
     {
-        /// <summary>
-        /// Класс-сущность
-        /// </summary>
-        public EntityLocomotive Locomotive { get; private set; }
-        /// <summary>
-        /// Левая координата отрисовки автомобиля
-        /// </summary>
-        private float _startPosX;
-        /// <summary>
-        /// Верхняя кооридната отрисовки автомобиля
-        /// </summary>
-        private float _startPosY;
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private int? _pictureWidth = null;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private int? _pictureHeight = null;
-        /// <summary>
-        /// Ширина отрисовки автомобиля
-        /// </summary>
-        private readonly int _locomotiveWidth = 160;
-        /// <summary>
-        /// Высота отрисовки автомобиля
-        /// </summary>
-        private readonly int _locomotiveHeight = 90;
-        /// <summary>
-        /// Инициализация свойств
-        /// </summary>
-        /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        public EntityLocomotive Locomotive { get; protected set; }
+        protected float _startPosX;
+        protected float _startPosY;
+
+        protected int? _pictureWidth = null;
+        protected int? _pictureHeight = null;
+
+        protected readonly int _locomotiveWidth = 200;
+        protected readonly int _locomotiveHeight = 90;
+        public DrawningLocomotive(int speed, float weight, Color bodyColor)
         {
-            Locomotive = new EntityLocomotive();
-            Locomotive.Init(speed, weight, bodyColor);
+            Locomotive = new EntityLocomotive(speed, weight, bodyColor);
         }
-        /// <summary>
-        /// Установка позиции автомобиля
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
         public void SetPosition(int x, int y, int width, int height)
         {
-            // TODO checks
+            if (width <= _locomotiveWidth + x || height <= _locomotiveHeight + y || x < 0 || y < 0)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
 
-            _startPosX = x;
+            _startPosX = x + 10;
             _startPosY = y;
             _pictureWidth = width;
             _pictureHeight = height;
-
-            if (_startPosX + _locomotiveWidth > _pictureWidth) { _startPosX = 20; }
-            if (_startPosY - _locomotiveHeight / 2 < 0) { _startPosY = _locomotiveHeight + 10; }
-            if (_startPosY + _locomotiveHeight > _pictureHeight) { _startPosY -= _locomotiveHeight; }
         }
-        /// <summary>
-        /// Изменение направления пермещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
         public void MoveTransport(Direction direction)
         {
             if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
@@ -110,11 +74,16 @@ namespace ElectricLocomotive
                     break;
             }
         }
-        /// <summary>
-        /// Отрисовка автомобиля
-        /// </summary>
-        /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
+
+        protected DrawningLocomotive(int speed, float weight, Color bodyColor, int
+        locomotiveWidth, int locomotiveHeight) :
+        this(speed, weight, bodyColor)
+        {
+            _locomotiveWidth = locomotiveWidth;
+            _locomotiveHeight = locomotiveHeight;
+        }
+
+        public virtual void DrawTransport(Graphics g)
         {
             if (_startPosX < 0 || _startPosY < 0
                 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
@@ -122,30 +91,43 @@ namespace ElectricLocomotive
                 return;
             }
             Brush brBody = new SolidBrush(Locomotive?.BodyColor ?? Color.Black);
+            Brush blackturbo = new SolidBrush(Color.Black);
             Pen pen = new Pen(Color.Black);
-            //колёса
-            g.FillEllipse(brBody, _startPosX + 10, _startPosY + 50, 30, 30);
-            g.FillEllipse(brBody, _startPosX + 50, _startPosY + 50, 30, 30);
-            g.FillEllipse(brBody, _startPosX + 90, _startPosY + 50, 30, 30);
-            g.FillEllipse(brBody, _startPosX + 130, _startPosY + 50, 30, 30);
+            Pen window = new Pen(Color.Blue);
 
-            g.DrawEllipse(pen, _startPosX + 10, _startPosY + 50, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 50, _startPosY + 50, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 90, _startPosY + 50, 30, 30);
-            g.DrawEllipse(pen, _startPosX + 130, _startPosY + 50, 30, 30);
+            g.FillPolygon(brBody, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 90), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 90) });
+            g.FillRectangle(blackturbo, _startPosX + 5, _startPosY + 45, 5, 40);
+
+            g.FillEllipse(brBody, _startPosX + 15, _startPosY + 90, 20, 20);
+            g.FillEllipse(brBody, _startPosX + 45, _startPosY + 90, 20, 20);
+
+
+            g.FillEllipse(brBody, _startPosX + 85, _startPosY + 90, 20, 20);
+            g.FillEllipse(brBody, _startPosX + 115, _startPosY + 90, 20, 20);
+
+            // Окна
+
+            g.DrawRectangle(window, _startPosX + 20, _startPosY + 50, 20, 25);
+            g.DrawRectangle(window, _startPosX + 50, _startPosY + 50, 20, 25);
+
+            // Колёса
+
+            g.DrawEllipse(pen, _startPosX + 15, _startPosY + 90, 20, 20);
+            g.DrawEllipse(pen, _startPosX + 45, _startPosY + 90, 20, 20);
+
+
+            g.DrawEllipse(pen, _startPosX + 85, _startPosY + 90, 20, 20);
+            g.DrawEllipse(pen, _startPosX + 115, _startPosY + 90, 20, 20);
+
+            // Дверь
+
+            g.DrawRectangle(pen, _startPosX + 85, _startPosY + 45, 20, 40);
+
+            // Локомотив
+
+            g.DrawPolygon(pen, new Point[] { new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 90), new Point(Convert.ToInt32(_startPosX) + 10, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 110, Convert.ToInt32(_startPosY) + 40), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 60), new Point(Convert.ToInt32(_startPosX) + 140, Convert.ToInt32(_startPosY) + 90) });
 
-            g.FillRectangle(brBody, _startPosX + 10, _startPosY + 20, 150, 30);
-            g.FillRectangle(brBody, _startPosX + 10, _startPosY - 20, 40, 40);
-            g.FillRectangle(brBody, _startPosX + 100, _startPosY - 20, 10, 40);
-            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 150, 30);
-            g.DrawRectangle(pen, _startPosX + 10, _startPosY - 20, 40, 40);
-            g.DrawRectangle(pen, _startPosX + 100, _startPosY - 20, 10, 40);
         }
-        /// <summary>
-        /// Смена границ формы отрисовки
-        /// </summary>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
         public void ChangeBorders(int width, int height)
         {
             _pictureWidth = width;
@@ -165,6 +147,14 @@ namespace ElectricLocomotive
                 _startPosY = _pictureHeight.Value - _locomotiveHeight;
             }
         }
+        public void SetBodyColor(Color color)
+        {
+            (Locomotive as EntityLocomotive).setColor(color);
+        }
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _locomotiveWidth, _startPosY + _locomotiveHeight);
+        }
     }
 }
 

ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class DrawningObjectLocomotive : IDrawningObject
+    {
+        public DrawningLocomotive _locomotive = null;
+        public DrawningLocomotive GetLocomotive => _locomotive;
+        public DrawningObjectLocomotive(DrawningLocomotive locomotive)
+        {
+            _locomotive = locomotive;
+        }
+        public float Step => _locomotive?.Locomotive?.Step ?? 0;
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return _locomotive?.GetCurrentPosition() ?? default;
+        }
+        public void MoveObject(Direction direction)
+        {
+            _locomotive?.MoveTransport(direction);
+        }
+        public void SetObject(int x, int y, int width, int height)
+        {
+            _locomotive.SetPosition(x, y, width, height);
+        }
+        void IDrawningObject.DrawningObject(Graphics g)
+        {
+            _locomotive.DrawTransport(g);
+        }
+
+        public bool Equals(IDrawningObject? other)
+        {
+            if (other is not DrawningObjectLocomotive otherShip)
+            {
+                return false;
+            }
+            var entity = _locomotive.Locomotive;
+            var otherEntity = otherShip._locomotive.Locomotive;
+            if (entity.GetType() != otherEntity.GetType() ||
+                entity.Speed != otherEntity.Speed ||
+                entity.Weight != otherEntity.Weight ||
+                entity.BodyColor != otherEntity.BodyColor)
+            {
+                return false;
+            }
+            if (entity is EntityElectricLocomotive entityWarmlyShip &&
+                otherEntity is EntityElectricLocomotive otherEntityWarmlyShip && (
+                entityWarmlyShip.BodyKit != otherEntityWarmlyShip.BodyKit ||
+                entityWarmlyShip.DopColor != otherEntityWarmlyShip.DopColor ||
+                entityWarmlyShip.SportLine != otherEntityWarmlyShip.SportLine))
+            {
+                return false;
+            }
+            return true;
+        }
+
+        public string GetInfo() => _locomotive?.GetDataForSave();
+        public static IDrawningObject Create(string data) => new DrawningObjectLocomotive(data.CreateDrawningCar());
+    }
+}

ElectricLocomotive/ElectricLocomotive/ElectricLocomotive - Backup (1).csproj

@@ -0,0 +1,43 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" 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="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
+    <PackageReference Include="Serilog" Version="2.12.1-dev-01594" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.1-dev-10301" />
+    <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.5.0-dev-00359" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
+    <PackageReference Include="Serilog.Sinks.InfluxDBv2" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

ElectricLocomotive/ElectricLocomotive/ElectricLocomotive - Backup.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

ElectricLocomotive/ElectricLocomotive/ElectricLocomotive.csproj

@@ -8,6 +8,28 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="ElectricLocomotive.csproj" />
+    <None Include="ElectricLocomotive.csproj.user" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" 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="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.0" />
+    <PackageReference Include="Serilog" Version="2.12.1-dev-01594" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.1-dev-10301" />
+    <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.5.0-dev-00359" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
+    <PackageReference Include="Serilog.Sinks.InfluxDBv2" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

ElectricLocomotive/ElectricLocomotive/EntityElectricLocomotive.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class EntityElectricLocomotive : EntityLocomotive
+    {
+        public Color DopColor { get; set; }
+        public bool BodyKit { get; private set; }
+        public bool SportLine { get; private set; }
+        public EntityElectricLocomotive(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool sportLine) :
+            base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            BodyKit = bodyKit;
+            SportLine = sportLine;
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs

@@ -7,37 +7,23 @@ using System.Threading.Tasks;
 
 namespace ElectricLocomotive
 {
-        internal class EntityLocomotive
+        public class EntityLocomotive
         {
-            /// <summary>
-            /// Скорость
-            /// </summary>
             public int Speed { get; private set; }
-            /// <summary>
-            /// Вес
-            /// </summary>
             public float Weight { get; private set; }
-            /// <summary>
-            /// Цвет кузова
-            /// </summary>
-            public Color BodyColor { get; private set; }
-            /// <summary>
-            /// Шаг перемещения автомобиля
-            /// </summary>
+            public Color BodyColor { get; set; }
             public float Step => Speed * 100 / Weight;
-            /// <summary>
-            /// Инициализация полей объекта-класса автомобиля
-            /// </summary>
-            /// <param name="speed"></param>
-            /// <param name="weight"></param>
-            /// <param name="bodyColor"></param>
-            /// <returns></returns>
-            public void Init(int speed, float weight, Color bodyColor)
+            public EntityLocomotive(int speed, float weight, Color bodyColor)
             {
                 Random rnd = new Random();
                 Speed = speed <= 0 ? rnd.Next(40, 120) : speed;
                 Weight = weight <= 0 ? rnd.Next(150, 200) : weight;
                 BodyColor = bodyColor;
             }
+
+            public void setColor(Color color)
+            {
+                BodyColor = color;
+            }
     }
 }

ElectricLocomotive/ElectricLocomotive/ExtentionLocomotive.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal static class ExtentionLocomotive
+    {
+        private static readonly char _separatorForObject = ':';
+        public static DrawningLocomotive CreateDrawningCar(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawningLocomotive(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 6)
+            {
+                return new DrawningElectricLocomotive(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;
+        }
+        public static string GetDataForSave(this DrawningLocomotive drawningCar)
+        {
+            var car = drawningCar.Locomotive;
+            var str = $"{car.Speed}{_separatorForObject}{car.Weight}{_separatorForObject}{car.BodyColor.Name}";
+            if (car is not EntityElectricLocomotive sportCar)
+            {
+                return str;
+            }
+            return
+           $"{str}{_separatorForObject}{sportCar.DopColor.Name}{_separatorForObject}{sportCar.BodyKit}{_separatorForObject}{sportCar.SportLine}";
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/FieldMap.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class FieldMap : AbstractMap
+    {
+        private readonly Brush barrierColor = new SolidBrush(Color.Brown);
+        private readonly Brush roadColor = new SolidBrush(Color.Green);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillEllipse(barrierColor, i * (_size_x-1), j * (_size_y-1), 30, 15);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 20)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormLocomotive.Designer.cs

@@ -29,17 +29,19 @@
         private void InitializeComponent()
         {
             this.ButtonCreate = new System.Windows.Forms.Button();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
-            this.statusStrip1.SuspendLayout();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonselectlocomotive = new System.Windows.Forms.Button();
+            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
             // ButtonCreate
@@ -54,36 +56,6 @@
             this.ButtonCreate.UseVisualStyleBackColor = true;
             this.ButtonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
             // 
-            // statusStrip1
-            // 
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 428);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(800, 22);
-            this.statusStrip1.TabIndex = 1;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
-            this.toolStripStatusLabelSpeed.Text = "Скорость";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17);
-            this.toolStripStatusLabelWeight.Text = "Вес";
-            // 
-            // toolStripStatusLabelColor
-            // 
-            this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
-            this.toolStripStatusLabelColor.Size = new System.Drawing.Size(33, 17);
-            this.toolStripStatusLabelColor.Text = "Цвет";
-            // 
             // pictureBox1
             // 
             this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -94,6 +66,7 @@
             this.pictureBox1.Size = new System.Drawing.Size(800, 428);
             this.pictureBox1.TabIndex = 2;
             this.pictureBox1.TabStop = false;
+            this.pictureBox1.Click += new System.EventHandler(this.ButtonCreateModif_Click);
             // 
             // buttonLeft
             // 
@@ -147,11 +120,63 @@
             this.buttonUp.UseVisualStyleBackColor = true;
             this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Location = new System.Drawing.Point(93, 396);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(103, 23);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.ButtonCreateModif_Click);
+            // 
+            // buttonselectlocomotive
+            // 
+            this.buttonselectlocomotive.Location = new System.Drawing.Point(202, 396);
+            this.buttonselectlocomotive.Name = "buttonselectlocomotive";
+            this.buttonselectlocomotive.Size = new System.Drawing.Size(82, 23);
+            this.buttonselectlocomotive.TabIndex = 8;
+            this.buttonselectlocomotive.Text = "Выбрать";
+            this.buttonselectlocomotive.UseVisualStyleBackColor = true;
+            this.buttonselectlocomotive.Click += new System.EventHandler(this.ButtonSelectLocomotive_Click);
+            // 
+            // toolStripStatusLabelSpeed
+            // 
+            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
+            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(59, 17);
+            this.toolStripStatusLabelSpeed.Text = "Скорость";
+            // 
+            // toolStripStatusLabelWeight
+            // 
+            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
+            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(26, 17);
+            this.toolStripStatusLabelWeight.Text = "Вес";
+            // 
+            // toolStripStatusLabelColor
+            // 
+            this.toolStripStatusLabelColor.Name = "toolStripStatusLabelColor";
+            this.toolStripStatusLabelColor.Size = new System.Drawing.Size(33, 17);
+            this.toolStripStatusLabelColor.Text = "Цвет";
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusLabelSpeed,
+            this.toolStripStatusLabelWeight,
+            this.toolStripStatusLabelColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 428);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(800, 22);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
             // FormLocomotive
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.buttonselectlocomotive);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -162,9 +187,9 @@
             this.Name = "FormLocomotive";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Локомотив";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.statusStrip1.ResumeLayout(false);
             this.statusStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -173,14 +198,16 @@
         #endregion
 
         private Button ButtonCreate;
-        private StatusStrip statusStrip1;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelColor;
         private PictureBox pictureBox1;
         private Button buttonLeft;
         private Button buttonDown;
         private Button buttonRight;
         private Button buttonUp;
+        private Button buttonCreateModif;
+        private Button buttonselectlocomotive;
+        private ToolStripStatusLabel toolStripStatusLabelSpeed;
+        private ToolStripStatusLabel toolStripStatusLabelWeight;
+        private ToolStripStatusLabel toolStripStatusLabelColor;
+        private StatusStrip statusStrip1;
     }
 }

ElectricLocomotive/ElectricLocomotive/FormLocomotive.cs

@@ -13,25 +13,11 @@ namespace ElectricLocomotive
     public partial class FormLocomotive : Form
     {
         private DrawningLocomotive _locomotive;
+        public DrawningLocomotive SelectedLocomotive { get; private set; }
         public FormLocomotive()
         {
             InitializeComponent();
         }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _locomotive = new DrawningLocomotive();
-            _locomotive.Init(rnd.Next(40, 120), rnd.Next(1500, 2000),
-           Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
-           pictureBox1.Width, pictureBox1.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
-            toolStripStatusLabelColor.Text = $"Цвет:{_locomotive.Locomotive.BodyColor.Name}";
-            Draw();
-        }
-
         private void Draw()
         {
             Bitmap bmp = new(pictureBox1.Width, pictureBox1.Height);
@@ -39,16 +25,31 @@ namespace ElectricLocomotive
             _locomotive?.DrawTransport(gr);
             pictureBox1.Image = bmp;
         }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <summary>
-        /// Изменение размеров формы
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        private void SetData()
+        {
+            Random rnd = new();
+            _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100),
+            pictureBox1.Width, pictureBox1.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}";
+            toolStripStatusLabelColor.Text = $"Цвет: { _locomotive.Locomotive.BodyColor.Name} ";
+        }
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+           rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            _locomotive = new DrawningLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
+           color);
+            SetData();
+            Draw();
+        }
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
             //получаем имя кнопки
@@ -70,16 +71,42 @@ namespace ElectricLocomotive
             }
             Draw();
         }
-        /// <summary>
-        /// Изменение размеров формы
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PictureBoxCar_Resize(object sender, EventArgs e)
+
+        private void PictureBoxLocomotive_Resize(object sender, EventArgs e)
         {
             _locomotive?.ChangeBorders(pictureBox1.Width, pictureBox1.Height);
             Draw();
         }
 
+        private void ButtonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+           rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256),
+           rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+            _locomotive = new DrawningElectricLocomotive(rnd.Next(100, 300), rnd.Next(1000, 2000),
+           color, dopColor,
+            Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0,
+           2)));
+            SetData();
+            Draw();
+        }
+
+        private void ButtonSelectLocomotive_Click(object sender, EventArgs e)
+        {
+            SelectedLocomotive = _locomotive;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

ElectricLocomotive/ElectricLocomotive/FormLocomotiveConfig.Designer.cs

@@ -0,0 +1,398 @@
+namespace ElectricLocomotive
+{
+    partial class FormLocomotiveConfig
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.labelHardObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.checkBoxProvod = new System.Windows.Forms.CheckBox();
+            this.checkBoxObv = new System.Windows.Forms.CheckBox();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.panelobject = new System.Windows.Forms.Panel();
+            this.LabelDopColor = new System.Windows.Forms.Label();
+            this.LabelBaseColor = new System.Windows.Forms.Label();
+            this.buttonOk = new System.Windows.Forms.Button();
+            this.button2 = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.panelobject.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.labelHardObject);
+            this.groupBox1.Controls.Add(this.labelSimpleObject);
+            this.groupBox1.Controls.Add(this.groupBox2);
+            this.groupBox1.Controls.Add(this.checkBoxProvod);
+            this.groupBox1.Controls.Add(this.checkBoxObv);
+            this.groupBox1.Controls.Add(this.numericUpDownWeight);
+            this.groupBox1.Controls.Add(this.numericUpDownSpeed);
+            this.groupBox1.Controls.Add(this.label2);
+            this.groupBox1.Controls.Add(this.label1);
+            this.groupBox1.Location = new System.Drawing.Point(12, 12);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(470, 201);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Параметры";
+            // 
+            // labelHardObject
+            // 
+            this.labelHardObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelHardObject.Location = new System.Drawing.Point(334, 166);
+            this.labelHardObject.Name = "labelHardObject";
+            this.labelHardObject.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.labelHardObject.Size = new System.Drawing.Size(100, 23);
+            this.labelHardObject.TabIndex = 9;
+            this.labelHardObject.Text = "Продвинутый";
+            this.labelHardObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelHardObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelSimpleObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(228, 166);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(100, 23);
+            this.labelSimpleObject.TabIndex = 8;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelSimpleObject_MouseDown);
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.panelWhite);
+            this.groupBox2.Controls.Add(this.panelYellow);
+            this.groupBox2.Controls.Add(this.panelGray);
+            this.groupBox2.Controls.Add(this.panelBlue);
+            this.groupBox2.Controls.Add(this.panelGreen);
+            this.groupBox2.Controls.Add(this.panelPurple);
+            this.groupBox2.Controls.Add(this.panelRed);
+            this.groupBox2.Controls.Add(this.panelBlack);
+            this.groupBox2.Location = new System.Drawing.Point(216, 22);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.Size = new System.Drawing.Size(228, 130);
+            this.groupBox2.TabIndex = 7;
+            this.groupBox2.TabStop = false;
+            this.groupBox2.Text = "Цвета";
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.AllowDrop = true;
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(167, 78);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(43, 44);
+            this.panelWhite.TabIndex = 3;
+            this.panelWhite.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.AllowDrop = true;
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(167, 28);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(43, 44);
+            this.panelYellow.TabIndex = 1;
+            this.panelYellow.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGray
+            // 
+            this.panelGray.AllowDrop = true;
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(118, 78);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(43, 44);
+            this.panelGray.TabIndex = 4;
+            this.panelGray.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.AllowDrop = true;
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(69, 78);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(43, 44);
+            this.panelBlue.TabIndex = 5;
+            this.panelBlue.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.AllowDrop = true;
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(118, 28);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(43, 44);
+            this.panelGreen.TabIndex = 1;
+            this.panelGreen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.AllowDrop = true;
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(20, 78);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(43, 44);
+            this.panelPurple.TabIndex = 2;
+            this.panelPurple.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelRed
+            // 
+            this.panelRed.AllowDrop = true;
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(69, 28);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(43, 44);
+            this.panelRed.TabIndex = 1;
+            this.panelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.AllowDrop = true;
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(20, 28);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(43, 44);
+            this.panelBlack.TabIndex = 0;
+            this.panelBlack.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown);
+            // 
+            // checkBoxProvod
+            // 
+            this.checkBoxProvod.AutoSize = true;
+            this.checkBoxProvod.Location = new System.Drawing.Point(6, 145);
+            this.checkBoxProvod.Name = "checkBoxProvod";
+            this.checkBoxProvod.Size = new System.Drawing.Size(163, 19);
+            this.checkBoxProvod.TabIndex = 5;
+            this.checkBoxProvod.Text = "Признак наличия отвала";
+            this.checkBoxProvod.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxObv
+            // 
+            this.checkBoxObv.AutoSize = true;
+            this.checkBoxObv.Location = new System.Drawing.Point(6, 120);
+            this.checkBoxObv.Name = "checkBoxObv";
+            this.checkBoxObv.Size = new System.Drawing.Size(179, 19);
+            this.checkBoxObv.TabIndex = 4;
+            this.checkBoxObv.Text = "Признак наличия проводов";
+            this.checkBoxObv.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(74, 71);
+            this.numericUpDownWeight.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(120, 23);
+            this.numericUpDownWeight.TabIndex = 3;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(74, 42);
+            this.numericUpDownSpeed.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(120, 23);
+            this.numericUpDownSpeed.TabIndex = 2;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(6, 73);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(29, 15);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "Вес:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(6, 44);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(62, 15);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Скорость:";
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(12, 42);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(212, 122);
+            this.pictureBoxObject.TabIndex = 1;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // panelobject
+            // 
+            this.panelobject.AllowDrop = true;
+            this.panelobject.Controls.Add(this.LabelDopColor);
+            this.panelobject.Controls.Add(this.LabelBaseColor);
+            this.panelobject.Controls.Add(this.pictureBoxObject);
+            this.panelobject.Location = new System.Drawing.Point(525, 12);
+            this.panelobject.Name = "panelobject";
+            this.panelobject.Size = new System.Drawing.Size(238, 172);
+            this.panelobject.TabIndex = 10;
+            this.panelobject.DragDrop += new System.Windows.Forms.DragEventHandler(this.panelobject_DragDrop);
+            this.panelobject.DragEnter += new System.Windows.Forms.DragEventHandler(this.panelobject_DragEnter);
+            // 
+            // LabelDopColor
+            // 
+            this.LabelDopColor.AllowDrop = true;
+            this.LabelDopColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelDopColor.Location = new System.Drawing.Point(124, 9);
+            this.LabelDopColor.Name = "LabelDopColor";
+            this.LabelDopColor.Size = new System.Drawing.Size(100, 23);
+            this.LabelDopColor.TabIndex = 3;
+            this.LabelDopColor.Text = "Доп.цвет";
+            this.LabelDopColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelDopColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragDrop);
+            this.LabelDopColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelDopColor_DragEnter);
+            // 
+            // LabelBaseColor
+            // 
+            this.LabelBaseColor.AllowDrop = true;
+            this.LabelBaseColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.LabelBaseColor.Location = new System.Drawing.Point(12, 9);
+            this.LabelBaseColor.Name = "LabelBaseColor";
+            this.LabelBaseColor.Size = new System.Drawing.Size(100, 23);
+            this.LabelBaseColor.TabIndex = 2;
+            this.LabelBaseColor.Text = "Цвет";
+            this.LabelBaseColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.LabelBaseColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragDrop);
+            this.LabelBaseColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelBaseColor_DragEnter);
+            // 
+            // buttonOk
+            // 
+            this.buttonOk.Location = new System.Drawing.Point(537, 190);
+            this.buttonOk.Name = "buttonOk";
+            this.buttonOk.Size = new System.Drawing.Size(75, 23);
+            this.buttonOk.TabIndex = 11;
+            this.buttonOk.Text = "Добавить";
+            this.buttonOk.UseVisualStyleBackColor = true;
+            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(674, 190);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 12;
+            this.button2.Text = "Отмена";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // FormLocomotiveConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(783, 221);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(this.buttonOk);
+            this.Controls.Add(this.panelobject);
+            this.Controls.Add(this.groupBox1);
+            this.Name = "FormLocomotiveConfig";
+            this.Text = "FormLocomotiveConfig";
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.groupBox2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).EndInit();
+            this.panelobject.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private Label labelHardObject;
+        private Label labelSimpleObject;
+        private GroupBox groupBox2;
+        private Panel panelWhite;
+        private Panel panelYellow;
+        private Panel panelGray;
+        private Panel panelBlue;
+        private Panel panelGreen;
+        private Panel panelPurple;
+        private Panel panelRed;
+        private Panel panelBlack;
+        private CheckBox checkBoxProvod;
+        private CheckBox checkBoxObv;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private Label label2;
+        private Label label1;
+        private PictureBox pictureBoxObject;
+        private Panel panelobject;
+        private Label LabelDopColor;
+        private Label LabelBaseColor;
+        private Button buttonOk;
+        private Button button2;
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormLocomotiveConfig.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ElectricLocomotive
+{
+    public partial class FormLocomotiveConfig : Form
+    {
+        private event Action<DrawningLocomotive> EventAddLocomotive;
+        DrawningLocomotive _locomotive = null;
+        public FormLocomotiveConfig()
+        {
+            InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPurple.MouseDown += PanelColor_MouseDown;
+            panelGray.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
+        }
+
+        public void AddEvent(Action<DrawningLocomotive> ev)
+        {
+            if (EventAddLocomotive == null)
+            {
+                EventAddLocomotive = new Action<DrawningLocomotive>(ev);
+            }
+            else
+            {
+                EventAddLocomotive += ev;
+            }
+        }
+
+        private void DrawLocomotive()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _locomotive?.SetPosition(5, 5, pictureBoxObject.Width,
+           pictureBoxObject.Height);
+            _locomotive?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        private void labelSimpleObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+
+        }
+
+        private void panelobject_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.Text))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void panelobject_DragDrop(object sender, DragEventArgs e)
+        {
+            switch (e.Data.GetData(DataFormats.Text).ToString())
+            {
+                case "labelSimpleObject":
+                    {
+                        _locomotive = new DrawningLocomotive((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White);
+                    }
+                    break;
+                case "labelHardObject":
+                    {
+                        _locomotive = new DrawningElectricLocomotive((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxObv.Checked, checkBoxProvod.Checked);
+                    }
+                    break;
+            }
+            DrawLocomotive();
+        }
+
+        private void buttonOk_Click(object sender, EventArgs e)
+        {
+            EventAddLocomotive?.Invoke(_locomotive);
+            Close();
+        }
+
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void LabelBaseColor_DragDrop(object sender, DragEventArgs e)
+        {
+            _locomotive.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+            DrawLocomotive();
+        }
+
+        private void LabelDopColor_DragDrop(object sender, DragEventArgs e)
+        {
+            if (_locomotive is not DrawningElectricLocomotive HardLocomotive)
+            {
+                return;
+            }
+            HardLocomotive.SetExtraColor((Color)e.Data.GetData(typeof(Color)));
+            DrawLocomotive();
+        }
+
+        private void LabelBaseColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void LabelDopColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormLocomotiveConfig.resx

@@ -0,0 +1,60 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

ElectricLocomotive/ElectricLocomotive/FormMapWithSetLocomotive.Designer.cs

@@ -0,0 +1,353 @@
+namespace ElectricLocomotive
+{
+    partial class FormMapWithSetLocomotive
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.label1 = new System.Windows.Forms.Label();
+            this.buttonAddLocomotive = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonRemoveCar = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.ButtonDeleteMap = new System.Windows.Forms.Button();
+            this.ListBoxMaps = new System.Windows.Forms.ListBox();
+            this.ButtonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.файлToolStripMenuItem = 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.ButtonSortByType = new System.Windows.Forms.Button();
+            this.ButtonSortByColor = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pictureBox1.Location = new System.Drawing.Point(0, 27);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(808, 694);
+            this.pictureBox1.TabIndex = 10;
+            this.pictureBox1.TabStop = false;
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.AutoSize = true;
+            this.buttonUp.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowup;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(892, 624);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 14;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.AutoSize = true;
+            this.buttonRight.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowright;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(928, 660);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 13;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.AutoSize = true;
+            this.buttonDown.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowdown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(892, 660);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 12;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.AutoSize = true;
+            this.buttonLeft.BackgroundImage = global::ElectricLocomotive.Properties.Resources.arrowleft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(856, 660);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 11;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(837, 29);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(83, 15);
+            this.label1.TabIndex = 15;
+            this.label1.Text = "Инструменты";
+            // 
+            // buttonAddLocomotive
+            // 
+            this.buttonAddLocomotive.Location = new System.Drawing.Point(837, 386);
+            this.buttonAddLocomotive.Name = "buttonAddLocomotive";
+            this.buttonAddLocomotive.Size = new System.Drawing.Size(151, 28);
+            this.buttonAddLocomotive.TabIndex = 17;
+            this.buttonAddLocomotive.Text = "Добавить локомотив";
+            this.buttonAddLocomotive.UseVisualStyleBackColor = true;
+            this.buttonAddLocomotive.Click += new System.EventHandler(this.ButtonAddLocomotive_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Карта с грязью",
+            "Карта с кустами"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(837, 90);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(151, 23);
+            this.comboBoxSelectorMap.TabIndex = 22;
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(837, 420);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(151, 23);
+            this.maskedTextBoxPosition.TabIndex = 23;
+            this.maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonRemoveCar
+            // 
+            this.buttonRemoveCar.Location = new System.Drawing.Point(837, 449);
+            this.buttonRemoveCar.Name = "buttonRemoveCar";
+            this.buttonRemoveCar.Size = new System.Drawing.Size(151, 28);
+            this.buttonRemoveCar.TabIndex = 24;
+            this.buttonRemoveCar.Text = "Удалить локомотив";
+            this.buttonRemoveCar.UseVisualStyleBackColor = true;
+            this.buttonRemoveCar.Click += new System.EventHandler(this.ButtonRemoveLocomotive_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(837, 483);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(151, 28);
+            this.buttonShowStorage.TabIndex = 25;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(837, 546);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(151, 28);
+            this.buttonShowOnMap.TabIndex = 26;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // ButtonDeleteMap
+            // 
+            this.ButtonDeleteMap.Location = new System.Drawing.Point(837, 239);
+            this.ButtonDeleteMap.Name = "ButtonDeleteMap";
+            this.ButtonDeleteMap.Size = new System.Drawing.Size(151, 33);
+            this.ButtonDeleteMap.TabIndex = 27;
+            this.ButtonDeleteMap.Text = "Удалить карту";
+            this.ButtonDeleteMap.UseVisualStyleBackColor = true;
+            this.ButtonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // ListBoxMaps
+            // 
+            this.ListBoxMaps.FormattingEnabled = true;
+            this.ListBoxMaps.ItemHeight = 15;
+            this.ListBoxMaps.Location = new System.Drawing.Point(837, 154);
+            this.ListBoxMaps.Name = "ListBoxMaps";
+            this.ListBoxMaps.Size = new System.Drawing.Size(151, 79);
+            this.ListBoxMaps.TabIndex = 28;
+            this.ListBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+            // 
+            // ButtonAddMap
+            // 
+            this.ButtonAddMap.Location = new System.Drawing.Point(837, 119);
+            this.ButtonAddMap.Name = "ButtonAddMap";
+            this.ButtonAddMap.Size = new System.Drawing.Size(151, 29);
+            this.ButtonAddMap.TabIndex = 29;
+            this.ButtonAddMap.Text = "Добавить карту";
+            this.ButtonAddMap.UseVisualStyleBackColor = true;
+            this.ButtonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(837, 61);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(151, 23);
+            this.textBoxNewMapName.TabIndex = 30;
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.файлToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Size = new System.Drawing.Size(1000, 24);
+            this.menuStrip1.TabIndex = 31;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // файлToolStripMenuItem
+            // 
+            this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+            this.файлToolStripMenuItem.Name = "файлToolStripMenuItem";
+            this.файлToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.файлToolStripMenuItem.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.FileName = "openFileDialog1";
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // ButtonSortByType
+            // 
+            this.ButtonSortByType.Location = new System.Drawing.Point(837, 288);
+            this.ButtonSortByType.Name = "ButtonSortByType";
+            this.ButtonSortByType.Size = new System.Drawing.Size(151, 40);
+            this.ButtonSortByType.TabIndex = 32;
+            this.ButtonSortByType.Text = "Сортировать по типу";
+            this.ButtonSortByType.UseVisualStyleBackColor = true;
+            this.ButtonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
+            // ButtonSortByColor
+            // 
+            this.ButtonSortByColor.Location = new System.Drawing.Point(837, 334);
+            this.ButtonSortByColor.Name = "ButtonSortByColor";
+            this.ButtonSortByColor.Size = new System.Drawing.Size(151, 40);
+            this.ButtonSortByColor.TabIndex = 33;
+            this.ButtonSortByColor.Text = "Сортировать по цвету";
+            this.ButtonSortByColor.UseVisualStyleBackColor = true;
+            this.ButtonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
+            // FormMapWithSetLocomotive
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1000, 722);
+            this.Controls.Add(this.ButtonSortByColor);
+            this.Controls.Add(this.ButtonSortByType);
+            this.Controls.Add(this.menuStrip1);
+            this.Controls.Add(this.textBoxNewMapName);
+            this.Controls.Add(this.ButtonAddMap);
+            this.Controls.Add(this.ListBoxMaps);
+            this.Controls.Add(this.ButtonDeleteMap);
+            this.Controls.Add(this.buttonRemoveCar);
+            this.Controls.Add(this.buttonShowStorage);
+            this.Controls.Add(this.buttonShowOnMap);
+            this.Controls.Add(this.maskedTextBoxPosition);
+            this.Controls.Add(this.comboBoxSelectorMap);
+            this.Controls.Add(this.buttonAddLocomotive);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.pictureBox1);
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "FormMapWithSetLocomotive";
+            this.Text = "Карта с набором объектов";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private PictureBox pictureBox1;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Label label1;
+        private Button buttonAddLocomotive;
+        private ComboBox comboBoxSelectorMap;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRemoveCar;
+        private Button buttonShowStorage;
+        private Button buttonShowOnMap;
+        private Button ButtonDeleteMap;
+        private ListBox ListBoxMaps;
+        private Button ButtonAddMap;
+        private TextBox textBoxNewMapName;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem файлToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+        private Button ButtonSortByType;
+        private Button ButtonSortByColor;
+    }
+}

ElectricLocomotive/ElectricLocomotive/FormMapWithSetLocomotive.cs

@@ -0,0 +1,272 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ElectricLocomotive
+{
+    public partial class FormMapWithSetLocomotive : Form
+    {
+        private readonly Dictionary<string, AbstractMap> _mapDict = new()
+        {
+            {"Простая карта", new SimpleMap() },
+            {"Карта с грязью", new FieldMap() },
+            {"Карта с кустами",new BushesMap() }
+        };
+        private readonly MapsCollection _mapsCollection;
+        private readonly ILogger _logger;
+        public FormMapWithSetLocomotive(ILogger<FormMapWithSetLocomotive> logger)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _mapsCollection = new MapsCollection(pictureBox1.Width, pictureBox1.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var elem in _mapDict)
+            {
+                comboBoxSelectorMap.Items.Add(elem.Key);
+            }
+        }
+        private void ReloadMaps()
+        {
+            int index = ListBoxMaps.SelectedIndex;
+
+            ListBoxMaps.Items.Clear();
+            foreach (var list in _mapsCollection.Keys)
+            {
+                ListBoxMaps.Items.Add(list);
+            }
+
+            if (ListBoxMaps.Items.Count > 0 && (index == -1 || index >= ListBoxMaps.Items.Count))
+            {
+                ListBoxMaps.SelectedIndex = 0;
+            }
+            else if (ListBoxMaps.Items.Count > 0 && index > -1 && index < ListBoxMaps.Items.Count)
+            {
+                ListBoxMaps.SelectedIndex = index;
+            }
+        }
+        
+        private void ButtonAddLocomotive_Click(object sender, EventArgs e)
+        {
+            var FormLocmotiveConfig = new FormLocomotiveConfig();
+            FormLocmotiveConfig.AddEvent(new(AddLocomotive));
+            FormLocmotiveConfig.Show();
+        }
+        public void AddLocomotive(DrawningLocomotive locomotive)
+        {
+            try
+            {
+                if (ListBoxMaps.SelectedIndex == -1)
+                {
+                    return;
+                }
+                if (_mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectLocomotive(locomotive) != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    _logger.LogInformation("Добавлен объект {@Locomotive}", locomotive);
+                    pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                    _logger.LogInformation("Не удалось добавить объект");
+                }
+            }
+            catch (StorageOverflowException ex)
+            {
+                _logger.LogWarning("Ошибка, переполнение хранилища :{0}", ex.Message);
+                MessageBox.Show($"Ошибка хранилище переполнено: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            catch (ArgumentException ex)
+            {
+                _logger.LogWarning("Ошибка добавления: {0}. Объект: {@Locomotive}", ex.Message, locomotive);
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        private void ButtonRemoveLocomotive_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);
+            try
+            {
+                var deletedLocomotive = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
+                if (deletedLocomotive != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    _logger.LogInformation("Из текущей карты удалён объект {@Locomotive}", deletedLocomotive);
+                    pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    _logger.LogInformation("Не удалось удалить объект по позиции {0}. Объект равен null", pos);
+                    MessageBox.Show("Не удалось удалить объект");
+                }
+            }
+            catch (LocomotiveNotFoundException ex)
+            {
+                _logger.LogWarning("Ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogWarning("Неизвестная ошибка удаления: {0}", ex.Message);
+                MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
+            }
+        }
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+        }
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            Direction dir = Direction.None;
+            switch (name)
+            {
+                case "buttonUp":
+                    dir = Direction.Up;
+                    break;
+                case "buttonDown":
+                    dir = Direction.Down;
+                    break;
+                case "buttonLeft":
+                    dir = Direction.Left;
+                    break;
+                case "buttonRight":
+                    dir = Direction.Right;
+                    break;
+            }
+            pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+        }
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 ||
+            string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка",
+               MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (!_mapDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK,
+               MessageBoxIcon.Error);
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text,
+           _mapDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+            _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
+        }
+        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            if (MessageBox.Show($"Удалить карту {ListBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(ListBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                ReloadMaps();
+            }
+        }
+
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.SaveData(saveFileDialog.FileName);
+                    MessageBox.Show("Сохранение прошло успешно", "Результат",
+                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат",
+                   MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
+                    ReloadMaps();
+                    MessageBox.Show("Данные загружены успешно!", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"{openFileDialog.FileName} загружено.");
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"Что-то пошло не так: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Не удалось загрузить: {openFileDialog.FileName} | {ex.Message}.");
+                }
+            }
+        }
+
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ??
+           string.Empty].Sort(new CarCompareByType());
+            pictureBox1.Image =
+           _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+
+        private void ButtonSortByColor_Click(object sender, EventArgs e)
+        {
+            if (ListBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].Sort(new ShipCompareByColor());
+            pictureBox1.Image = _mapsCollection[ListBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+    }
+}
+

ElectricLocomotive/ElectricLocomotive/FormMapWithSetLocomotive.resx

@@ -0,0 +1,69 @@
+<root>
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <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>146, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

ElectricLocomotive/ElectricLocomotive/IDrawningObject.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal interface IDrawningObject : IEquatable<IDrawningObject>
+    {
+		public float Step { get; }
+		void SetObject(int x, int y, int width, int height);
+		void MoveObject(Direction direction);
+		void DrawningObject(Graphics g);
+		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+		string GetInfo();
+	}
+}

ElectricLocomotive/ElectricLocomotive/LocomotiveCompareByColor.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class ShipCompareByColor : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xShip = x as DrawningObjectLocomotive;
+            var yShip = y as DrawningObjectLocomotive;
+            if (xShip == null && yShip == null)
+            {
+                return 0;
+            }
+            if (xShip == null && yShip != null)
+            {
+                return 1;
+            }
+            if (xShip != null && yShip == null)
+            {
+                return -1;
+            }
+            var xEntityShip = xShip.GetLocomotive.Locomotive;
+            var yEntityShip = yShip.GetLocomotive.Locomotive;
+            var baseColorCompare = xEntityShip.BodyColor.ToArgb().CompareTo(yEntityShip.BodyColor.ToArgb());
+            if (baseColorCompare != 0)
+            {
+                return baseColorCompare;
+            }
+            if (xEntityShip is EntityElectricLocomotive xWarmlyShip && yEntityShip is EntityElectricLocomotive yWarmlyShip)
+            {
+                var dopColorCompare = xWarmlyShip.DopColor.ToArgb().CompareTo(yWarmlyShip.DopColor.ToArgb());
+                if (dopColorCompare != 0)
+                {
+                    return dopColorCompare;
+                }
+            }
+            var speedCompare = xShip.GetLocomotive.Locomotive.Speed.CompareTo(yShip.GetLocomotive.Locomotive.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xShip.GetLocomotive.Locomotive.Weight.CompareTo(yShip.GetLocomotive.Locomotive.Weight);
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/LocomotiveCompareByType.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class CarCompareByType : IComparer<IDrawningObject>
+    {
+        public int Compare(IDrawningObject? x, IDrawningObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xCar = x as DrawningObjectLocomotive;
+            var yCar = y as DrawningObjectLocomotive;
+            if (xCar == null && yCar == null)
+            {
+                return 0;
+            }
+            if (xCar == null && yCar != null)
+            {
+                return 1;
+            }
+            if (xCar != null && yCar == null)
+            {
+                return -1;
+            }
+            if (xCar.GetLocomotive.GetType().Name != yCar.GetLocomotive.GetType().Name)
+            {
+                if (xCar.GetLocomotive.GetType().Name == "DrawningLocomotive")
+                {
+                    return -1;
+                }
+                return 1;
+            }
+            var speedCompare =
+           xCar.GetLocomotive.Locomotive.Speed.CompareTo(yCar.GetLocomotive.Locomotive.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xCar.GetLocomotive.Locomotive.Weight.CompareTo(yCar.GetLocomotive.Locomotive.Weight);
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/LocomotiveNotFoundException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace ElectricLocomotive
+{
+    [Serializable]
+    internal class LocomotiveNotFoundException : ApplicationException
+    {
+        public LocomotiveNotFoundException(int i) : base($"Не найден объект по позиции{ i}") { }
+        public LocomotiveNotFoundException() : base() { }
+        public LocomotiveNotFoundException(string message) : base(message) { }
+        public LocomotiveNotFoundException(string message, Exception exception) : base(message, exception) { }
+        protected LocomotiveNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

ElectricLocomotive/ElectricLocomotive/MapWithSetLocomotivGeneric.cs

@@ -0,0 +1,157 @@
+namespace ElectricLocomotive
+{
+    internal class MapWithSetLocomotivGeneric<T, U>
+        where T : class, IDrawningObject, IEquatable<T>
+        where U : AbstractMap
+    {
+        // Ширина окна отрисовки
+        private readonly int _pictureWidth;
+        // Высота окна отрисовки
+        private readonly int _pictureHeight;
+        // Размер занимаемого объектом места (ширина)
+        private readonly int _placeSizeWidth = 180;
+        // Размер занимаемого объектом места (высота)
+        private readonly int _placeSizeHeight = 150;
+        // Набор объектов
+        private readonly SetLocomotivGeneric<T> _setLocomotive;
+        // Карта
+        private readonly U _map;
+        // Конструктор
+        public MapWithSetLocomotivGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setLocomotive = new SetLocomotivGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        // Перегрузка оператора сложения
+        public static int operator +(MapWithSetLocomotivGeneric<T, U> map, T Locomotive)
+        {
+            return map._setLocomotive.Insert(Locomotive);
+        }
+        // Перегрузка оператора вычитания
+        public static T operator -(MapWithSetLocomotivGeneric<T, U> map, int position)
+        {
+            return map._setLocomotive.Remove(position);
+        }
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawLocomotive(gr);
+            return bmp;
+        }
+        // Просмотр объекта на карте
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var locomotive in _setLocomotive.GetLocomotive())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, locomotive);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+        ///
+        // Перемещение объекта по карте
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        // "Взбалтываем" набор, чтобы все элементы оказались в начале
+        private void Shaking()
+        {
+            int j = _setLocomotive.Count - 1;
+            for (int i = 0; i < _setLocomotive.Count; i++)
+            {
+                if (_setLocomotive[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var locomotive = _setLocomotive[j];
+                        if (locomotive != null)
+                        {
+                            _setLocomotive.Insert(locomotive, i);
+                            _setLocomotive.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        // Метод отрисовки фона
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Sienna, 3);
+            Brush brush = new SolidBrush(Color.DodgerBlue);
+            g.FillRectangle(brush, 0, 0, _pictureWidth, _pictureHeight);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight + 2, i * _placeSizeWidth + _placeSizeWidth / 2 + 40, j * _placeSizeHeight + 2);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth + 7, 2, i * _placeSizeWidth + 7, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+                g.DrawLine(pen, i * _placeSizeWidth + 3, 2, i * _placeSizeWidth + 3, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+        // Метод прорисовки объектов
+        private void DrawLocomotive(Graphics g)
+        {
+            int yNumOfPlaces = _pictureHeight / _placeSizeHeight;
+            int xNumOfPlaces = _pictureWidth / _placeSizeWidth;
+
+            int RowIndex = yNumOfPlaces - 1;
+            int ColumnIndex = 0;
+
+            foreach (var HardLocomotive in _setLocomotive.GetLocomotive())
+            {
+                (float Left, float Top, float Right, float Bottom) = HardLocomotive.GetCurrentPosition();
+                HardLocomotive.SetObject(ColumnIndex * _placeSizeWidth, RowIndex * _placeSizeHeight + (_placeSizeHeight - (int)(Bottom - Top) - 60), _pictureWidth, _pictureHeight);
+                HardLocomotive.DrawningObject(g);
+                if (ColumnIndex == xNumOfPlaces - 1)
+                {
+                    ColumnIndex = 0;
+                    RowIndex--;
+                }
+                else
+                {
+                    ColumnIndex++;
+                }
+
+            }
+        }
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var boat in _setLocomotive.GetLocomotive())
+            {
+                data += $"{boat.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setLocomotive.Insert(DrawningObjectLocomotive.Create(rec) as T);
+            }
+        }
+
+        public void Sort(IComparer<T> comparer)
+        {
+            _setLocomotive.SortSet(comparer);
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/MapsCollection.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class MapsCollection
+    {
+        readonly Dictionary<string, MapWithSetLocomotivGeneric<IDrawningObject, AbstractMap>> _mapStorages;
+        public List<string> Keys => _mapStorages.Keys.ToList();
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+
+        private readonly char separatorDict = '|';
+        private readonly char separatorData = ';';
+        public MapsCollection(int pictureWidth, int pictureHeight)
+        {
+            _mapStorages = new Dictionary<string, MapWithSetLocomotivGeneric<IDrawningObject, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+        public void AddMap(string name, AbstractMap map)
+        {
+            if (!_mapStorages.ContainsKey(name))
+            {
+                _mapStorages.Add(name, new MapWithSetLocomotivGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            }
+        }
+        public void DelMap(string name)
+        {
+            if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
+        }
+        public MapWithSetLocomotivGeneric<IDrawningObject, AbstractMap> this[string ind]
+        {
+            get
+            {
+                if (_mapStorages.ContainsKey(ind))
+                {
+                    return _mapStorages[ind];
+                }
+                return null;
+            }
+        }
+        private static void WriteToFile(string text, FileStream stream)
+        {
+            byte[] info = new UTF8Encoding(true).GetBytes(text);
+            stream.Write(info, 0, info.Length);
+        }
+        public void SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+            using (FileStream fs = new(filename, FileMode.Create))
+            {
+                WriteToFile($"MapsCollection{Environment.NewLine}", fs);
+                foreach (var storage in _mapStorages)
+                {
+
+                    WriteToFile($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict,separatorData)}{Environment.NewLine}", fs);
+                }
+            }
+        }
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new Exception("Файл не найден");
+            }
+            string bufferTextFromFile = "";
+            using (FileStream fs = new(filename, FileMode.Open))
+            {
+                byte[] b = new byte[fs.Length];
+                UTF8Encoding temp = new(true);
+                while (fs.Read(b, 0, b.Length) > 0)
+                {
+                    bufferTextFromFile += temp.GetString(b);
+                }
+            }
+            var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' },
+           StringSplitOptions.RemoveEmptyEntries);
+            if (!strs[0].Contains("MapsCollection"))
+            {
+                //если нет такой записи, то это не те данные
+                throw new Exception("Формат данных в файле не правильный");
+            }
+            //очищаем записи
+            _mapStorages.Clear();
+            for (int i = 1; i < strs.Length; ++i)
+            {
+                var elem = strs[i].Split(separatorDict);
+                AbstractMap map = null;
+                switch (elem[1])
+                {
+                    case "SimpleMap":
+                        map = new SimpleMap();
+                        break;
+                    case "FieldMap":
+                        map = new FieldMap();
+                        break;
+                    case "BushesMap":
+                        map = new BushesMap();
+                        break;
+                }
+                _mapStorages.Add(elem[0], new MapWithSetLocomotivGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+            }
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/Program.cs

@@ -1,3 +1,11 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
+using Serilog;
+using System.Diagnostics;
+using System.Reflection;
+
 namespace ElectricLocomotive
 {
     internal static class Program
@@ -11,7 +19,40 @@ namespace ElectricLocomotive
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormLocomotive());
+
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            
+            using (ServiceProvider serviceProvider =services.BuildServiceProvider())
+            {
+
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetLocomotive>());
+            }
+        }
+
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            string path = Directory.GetCurrentDirectory();
+            path = path.Substring(0, path.LastIndexOf("\\"));
+            path = path.Substring(0, path.LastIndexOf("\\"));
+            path = path.Substring(0, path.LastIndexOf("\\"));
+
+            services.AddSingleton<FormMapWithSetLocomotive>()
+            .AddLogging(option =>
+            {
+                var configuration = new ConfigurationBuilder()
+                    .SetBasePath(Directory.GetCurrentDirectory())
+                    .AddJsonFile(path: path + "\\serilog.json", optional: false, reloadOnChange: true)
+                    .Build();
+
+                var logger = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration)
+                    .CreateLogger();
+
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(logger);
+            });
+
         }
     }
 }

ElectricLocomotive/ElectricLocomotive/SetLocomotivGeneric.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class SetLocomotivGeneric<T>
+        where T : class, IEquatable<T>
+    {
+        private readonly List<T> _places;
+        public int Count => _places.Count;
+        private readonly int _maxCount;
+        public SetLocomotivGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+        public int Insert(T locomotive)
+        {
+            return Insert(locomotive, 0);
+        }
+        public int Insert(T locomotive, int position)
+        {
+            if (_places.Contains(locomotive))
+            {
+                throw new ArgumentException($"Объект {locomotive} уже присутствует в наборе");
+            }
+            if (position < 0 || position > Count || _maxCount == Count)
+            {
+                throw new StorageOverflowException(_maxCount);
+            }
+            _places.Insert(position, locomotive);
+            return position;
+        }
+        public T Remove(int position)
+        {
+            if (position >= Count || position < 0)
+            {
+                throw new LocomotiveNotFoundException(position);
+            }
+            T ship = _places[position];
+            _places.RemoveAt(position);
+            return ship;
+        }
+        public T this[int position]
+        {
+            get
+            {
+                if (position >= Count || position < 0)
+                {
+                    return null;
+                }
+                return _places[position];
+            }
+            set
+            {
+                if (position >= Count || position < 0)
+                {
+                    return;
+                }
+                Insert(value, position);
+
+            }
+        }
+        public IEnumerable<T> GetLocomotive()
+        {
+            foreach (var locomotive in _places)
+            {
+                if (locomotive != null)
+                {
+                    yield return locomotive;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+        public void SortSet(IComparer<T> comparer)
+        {
+            if (comparer == null)
+            {
+                return;
+            }
+            _places.Sort(comparer);
+        }
+
+    }
+}

ElectricLocomotive/ElectricLocomotive/SimpleMap.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ElectricLocomotive
+{
+    internal class SimpleMap : AbstractMap
+    {
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        private readonly Brush roadColor = new SolidBrush(Color.Gray);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x), j * (_size_y));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

ElectricLocomotive/ElectricLocomotive/StorageOverflowException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace ElectricLocomotive
+{
+    [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 context) : base(info, context) { }
+    }
+}

ElectricLocomotive/ElectricLocomotive/serilog.json

@@ -0,0 +1,20 @@
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.File" ],
+    "MinimumLevel": "Information",
+    "WriteTo": [
+      {
+        "Name": "File",
+        "Args": {
+          "path": "log.log",
+          "rollingInterval": "Day",
+          "outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ],
+    "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
+    "Properties": {
+      "Application": "Locomotive"
+    }
+  }
+}