Final

DoubleDeckerBus/DoubleDeckerBus/AbstractMap.cs

@@ -34,8 +34,7 @@ namespace DoubleDeckerBus
             return DrawMapWithObject();
         }
         public Bitmap MoveObject(Direction direction)
-        {
+        {   
-            
             _drawingObject.MoveObject(direction);
 
             bool collision = CheckCollision();
@@ -69,6 +68,7 @@ namespace DoubleDeckerBus
             int y = _random.Next(0, 10);
             _drawingObject.SetObject(x, y, _width, _height);
           
+            
             return !CheckCollision();
         }
         private Bitmap DrawMapWithObject()
@@ -109,13 +109,14 @@ namespace DoubleDeckerBus
 
             
 
-            for (int y = startY; y < endY; y++)
+            for (int y = startY; y <= endY + 1; y++)
             {
-                for (int x = startX; x < endX; x++)
+                for (int x = startX; x <= endX + 1; x++)
                 {
                     if (_map[x, y] == _barrier)
                     {
                         return true;
+                        break;
                     }
                 }
             }

DoubleDeckerBus/DoubleDeckerBus/BusCompareByColor.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DoubleDeckerBus
+{
+    internal class BusCompareByColor : IComparer<IDrawingObject>
+    {
+        public int Compare(IDrawingObject? x, IDrawingObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xBus = x as DrawingObjectBus;
+            var yBus = y as DrawingObjectBus;
+            if (xBus == null && yBus == null)
+            {
+                return 0;
+            }
+            if (xBus == null && yBus != null)
+            {
+                return 1;
+            }
+            if (xBus != null && yBus == null)
+            {
+                return -1;
+            }
+
+            var baseColorCompare = xBus.GetBus.Bus.BodyColor.ToString().CompareTo(yBus.GetBus.Bus.BodyColor.ToString());
+            if (baseColorCompare != 0)
+            {
+                return baseColorCompare;
+            }
+
+            if (xBus.GetBus.Bus is EntityDDB xDDB && yBus.GetBus.Bus is EntityDDB yDDB) {
+                var extraColorCompare = xDDB.BodyColor.ToString().CompareTo(yDDB.BodyColor.ToString());
+                if (extraColorCompare != 0)
+                {
+                    return extraColorCompare;
+                }
+            }
+
+            return 0;
+        }
+    }
+   
+}

DoubleDeckerBus/DoubleDeckerBus/BusCompareByType.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DoubleDeckerBus
+{
+    internal class BusCompareByType : IComparer<IDrawingObject>
+    {
+        public int Compare(IDrawingObject? x, IDrawingObject? y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+            if (x == null && y != null)
+            {
+                return 1;
+            }
+            if (x != null && y == null)
+            {
+                return -1;
+            }
+            var xBus = x as DrawingObjectBus;
+            var yBus = y as DrawingObjectBus;
+            if (xBus == null && yBus == null)
+            {
+                return 0;
+            }
+            if (xBus == null && yBus != null)
+            {
+                return 1;
+            }
+            if (xBus != null && yBus == null)
+            {
+                return -1;
+            }
+            if (xBus.GetBus.GetType().Name != yBus.GetBus.GetType().Name)
+            {
+                if (xBus.GetBus.GetType().Name == "DrawingBus")
+                {
+                    return -1;
+                }
+                return 1;
+            }
+            var speedCompare = xBus.GetBus.Bus.Speed.CompareTo(yBus.GetBus.Bus.Speed);
+            if (speedCompare != 0)
+            {
+                return speedCompare;
+            }
+            return xBus.GetBus.Bus.Weight.CompareTo(yBus.GetBus.Bus.Weight);
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/BusDelegate.cs

@@ -0,0 +1,4 @@
+namespace DoubleDeckerBus
+{
+    public delegate void BusDelegate(DrawingBus bus);
+}

DoubleDeckerBus/DoubleDeckerBus/BusNotFoundException.cs

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

DoubleDeckerBus/DoubleDeckerBus/Direction.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    internal enum Direction
+    public enum Direction
     {
         None = 0,
         Up = 1,

DoubleDeckerBus/DoubleDeckerBus/DoubleDeckerBus.csproj

@@ -8,6 +8,30 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="serilog.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="serilog.json">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>serilog.Designer.cs</LastGenOutput>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </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="Serilog.Extensions.Hosting" Version="5.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="FormBus.cs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -17,6 +41,11 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Update="serilog.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>serilog.json</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

DoubleDeckerBus/DoubleDeckerBus/DrawingBus.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    internal class DrawingBus
+    public class DrawingBus
     {
         public EntityBus Bus { get; protected set; }
 
@@ -19,7 +19,6 @@ namespace DoubleDeckerBus
         private readonly int _busHeight = 30;
 
 
-
         public DrawingBus(int speed, float weight, Color bodyColor) {
             Bus = new EntityBus(speed, weight, bodyColor);
         }

DoubleDeckerBus/DoubleDeckerBus/DrawingDDB.cs

@@ -8,6 +8,11 @@ namespace DoubleDeckerBus
 {
     internal class DrawingDDB : DrawingBus
     {
+        public void SetDopColor(Color color)
+        {
+            ((EntityDDB)Bus).ExtraColor = color;
+        }
+
         public DrawingDDB(int speed, float weight, Color bodyColor, Color extraColor, bool ledder, bool secondStage) : base(speed, weight, bodyColor, 100, 100) {
             Bus = new EntityDDB(speed, weight, bodyColor, extraColor, ledder, secondStage);
         }

DoubleDeckerBus/DoubleDeckerBus/DrawingObjectBus.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,13 +9,22 @@ namespace DoubleDeckerBus
 {
     internal class DrawingObjectBus : IDrawingObject
     {
-        private DrawingBus _bus = null;
+        public DrawingBus? _bus = null;
 
         public DrawingObjectBus(DrawingBus bus)
         {
             _bus = bus;
         }
 
+        public DrawingBus? Get_bus()
+        {
+            return _bus;
+        }
+
+        public DrawingBus getBus(DrawingBus? _bus) {
+            return _bus;
+        }
+
         public float Step => _bus?.Bus?.Step ?? 0;
 
         public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
@@ -22,6 +32,11 @@ namespace DoubleDeckerBus
             return _bus?.GetCurrentPosition() ?? default;
         }
 
+        public string? GetInfo()
+        {
+            return _bus?.GetDataForSave();
+        }
+
         public void MoveObject(Direction direction)
         {
             _bus?.MoveTransport(direction);
@@ -36,5 +51,68 @@ namespace DoubleDeckerBus
         {
             _bus.DrawTransport(g);
         }
+
+        public static IDrawingObject Create(string data)
+        {
+            return new DrawingObjectBus(data.CreateDrawningCar());
+        }
+
+        public DrawingBus getBus()
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool Equals(IDrawingObject? other)
+        {
+            if (other == null)
+            {
+                return false;
+            }
+            var otherBus = other as DrawingObjectBus;
+            if (otherBus == null)
+            {
+                return false;
+            }
+            var bus = _bus.Bus;
+            var otherBusBus = otherBus._bus.Bus;
+            if (bus.GetType().Name != otherBusBus.GetType().Name)
+            {
+                return false;
+            }
+            if (bus.Speed != otherBusBus.Speed)
+            {
+                return false;
+            }
+            if (bus.Weight != otherBusBus.Weight)
+            {
+                return false;
+            }
+            if (bus.BodyColor != otherBusBus.BodyColor)
+            {
+                return false;
+            }
+
+            if (bus is EntityDDB DDB && otherBusBus is EntityDDB otherDDB)
+            {
+
+                if (DDB.Ledder != otherDDB.Ledder) {
+                    return false;
+                }
+
+                if (DDB.SecondStage != otherDDB.SecondStage) {
+                    return false;
+                }
+
+                if (DDB.ExtraColor != otherDDB.ExtraColor)
+                {
+                    return false;
+                }
+                
+            }
+
+            return true;
+        }
+
+        public DrawingBus GetBus => _bus;
     }
 }

DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs

@@ -6,11 +6,11 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    internal class EntityBus
+    public class EntityBus
     {
         public int Speed { get; private set; }
         public float Weight { get; private set; }
-        public Color BodyColor { get; private set; }
+        public Color BodyColor { get;  set; }
         public float Step => Speed * 100 / Weight;
         public EntityBus(int speed, float weight, Color bodyColor)
         {
@@ -19,5 +19,11 @@ namespace DoubleDeckerBus
             Weight = (weight <= 0) ? rnd.Next(50, 70) : weight;
             BodyColor = bodyColor;
         }
+
+        public static EntityBus Creator(string data) {
+            string[] strs = data.Split(':');
+            return new EntityBus(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/EntityDDB.cs

@@ -8,7 +8,7 @@ namespace DoubleDeckerBus
 {
     internal class EntityDDB : EntityBus
     {
-        public Color ExtraColor { get; private set; }
+        public Color ExtraColor { get; set; }
 
         public bool Ledder { get; private set; }
 

DoubleDeckerBus/DoubleDeckerBus/ExtentionCar.cs

@@ -0,0 +1,35 @@
+namespace DoubleDeckerBus
+{
+    internal static class ExtentionBus
+    {
+        private static readonly char _separatorForObject = ':';
+            public static DrawingBus CreateDrawningCar(this string info)
+            {
+                string[] strs = info.Split(_separatorForObject);
+                if (strs.Length == 3)
+                {
+                    return new DrawingBus(Convert.ToInt32(strs[0]),
+                        Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+                }
+                if (strs.Length == 6)
+                {
+                    return new DrawingDDB(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 DrawingBus drawingBus)
+        {
+            var bus = drawingBus.Bus;
+            var str = $"{bus.Speed}{_separatorForObject}{bus.Weight}{_separatorForObject}{bus.BodyColor.Name}";
+            if (bus is not EntityDDB sportCar)
+            {
+                return str;
+            }
+            return $"{str}{_separatorForObject}{sportCar.ExtraColor.Name}{_separatorForObject}{sportCar.SecondStage}{_separatorForObject}{sportCar.Ledder}";
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/FormBus.Designer.cs

@@ -39,6 +39,7 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.pictureBoxBus = new System.Windows.Forms.PictureBox();
             this.buttonСreateExtra = new System.Windows.Forms.Button();
+            this.ButtonSelectBus = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
             this.SuspendLayout();
@@ -165,11 +166,22 @@
             this.buttonСreateExtra.UseVisualStyleBackColor = true;
             this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click);
             // 
+            // ButtonSelectBus
+            // 
+            this.ButtonSelectBus.Location = new System.Drawing.Point(525, 290);
+            this.ButtonSelectBus.Name = "ButtonSelectBus";
+            this.ButtonSelectBus.Size = new System.Drawing.Size(75, 23);
+            this.ButtonSelectBus.TabIndex = 9;
+            this.ButtonSelectBus.Text = "Выбрать";
+            this.ButtonSelectBus.UseVisualStyleBackColor = true;
+            this.ButtonSelectBus.Click += new System.EventHandler(this.ButtonSelectBus_Click);
+            // 
             // FormBus
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(700, 338);
+            this.Controls.Add(this.ButtonSelectBus);
             this.Controls.Add(this.buttonСreateExtra);
             this.Controls.Add(this.buttonRight);
             this.Controls.Add(this.buttonDown);
@@ -202,5 +214,6 @@
         private Button buttonRight;
         private PictureBox pictureBoxBus;
         private Button buttonСreateExtra;
+        private Button ButtonSelectBus;
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormBus.cs

@@ -3,6 +3,9 @@ namespace DoubleDeckerBus
     public partial class FormBus : Form
     {
         private DrawingBus _bus;
+
+        public DrawingBus SelectedBus { get; private set; }
+
         public FormBus()
         {
             InitializeComponent();
@@ -19,7 +22,13 @@ namespace DoubleDeckerBus
         private void ButtonCreate_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
+            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;
+            }
+            _bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
             SetData();
             Draw();
         }
@@ -60,12 +69,28 @@ namespace DoubleDeckerBus
         private void ButtonÑreateExtra_Click(object sender, EventArgs e)
         {
             Random rnd = new();
-            _bus = new DrawingDDB(rnd.Next(100, 300), rnd.Next(1000, 2000),
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+            ColorDialog dialog = new();
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
+            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;
+            }
+            _bus = new DrawingDDB(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 ButtonSelectBus_Click(object sender, EventArgs e)
+        {
+            SelectedBus = _bus;
+            DialogResult = DialogResult.OK;
+        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormBusConfig.Designer.cs

@@ -0,0 +1,383 @@
+namespace DoubleDeckerBus
+{
+    partial class FormBusConfig
+    {
+        /// <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.groupBoxConfig = new System.Windows.Forms.GroupBox();
+            this.labelModifiedObject = new System.Windows.Forms.Label();
+            this.labelSimpleObject = new System.Windows.Forms.Label();
+            this.groupBoxColors = new System.Windows.Forms.GroupBox();
+            this.panelWhite = new System.Windows.Forms.Panel();
+            this.panelGray = new System.Windows.Forms.Panel();
+            this.panelBlack = new System.Windows.Forms.Panel();
+            this.panelPurple = new System.Windows.Forms.Panel();
+            this.panelGreen = new System.Windows.Forms.Panel();
+            this.panelBlue = new System.Windows.Forms.Panel();
+            this.panelYellow = new System.Windows.Forms.Panel();
+            this.panelRed = new System.Windows.Forms.Panel();
+            this.checkBoxStage = new System.Windows.Forms.CheckBox();
+            this.checkBoxLadder = new System.Windows.Forms.CheckBox();
+            this.labelWeight = new System.Windows.Forms.Label();
+            this.labelSpeed = new System.Windows.Forms.Label();
+            this.numericUpDownWeight = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDownSpeed = new System.Windows.Forms.NumericUpDown();
+            this.pictureBoxObject = new System.Windows.Forms.PictureBox();
+            this.panelObject = new System.Windows.Forms.Panel();
+            this.labelExtraColor = new System.Windows.Forms.Label();
+            this.labelColor = new System.Windows.Forms.Label();
+            this.buttonAdd = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.groupBoxConfig.SuspendLayout();
+            this.groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWeight)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownSpeed)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxObject)).BeginInit();
+            this.panelObject.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            this.groupBoxConfig.Controls.Add(this.labelModifiedObject);
+            this.groupBoxConfig.Controls.Add(this.labelSimpleObject);
+            this.groupBoxConfig.Controls.Add(this.groupBoxColors);
+            this.groupBoxConfig.Controls.Add(this.checkBoxStage);
+            this.groupBoxConfig.Controls.Add(this.checkBoxLadder);
+            this.groupBoxConfig.Controls.Add(this.labelWeight);
+            this.groupBoxConfig.Controls.Add(this.labelSpeed);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownWeight);
+            this.groupBoxConfig.Controls.Add(this.numericUpDownSpeed);
+            this.groupBoxConfig.Location = new System.Drawing.Point(14, 16);
+            this.groupBoxConfig.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxConfig.Name = "groupBoxConfig";
+            this.groupBoxConfig.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxConfig.Size = new System.Drawing.Size(529, 277);
+            this.groupBoxConfig.TabIndex = 0;
+            this.groupBoxConfig.TabStop = false;
+            this.groupBoxConfig.Text = "Параметры";
+            // 
+            // labelModifiedObject
+            // 
+            this.labelModifiedObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelModifiedObject.Location = new System.Drawing.Point(370, 193);
+            this.labelModifiedObject.Name = "labelModifiedObject";
+            this.labelModifiedObject.Size = new System.Drawing.Size(114, 54);
+            this.labelModifiedObject.TabIndex = 8;
+            this.labelModifiedObject.Text = "Продвинутый";
+            this.labelModifiedObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelModifiedObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // labelSimpleObject
+            // 
+            this.labelSimpleObject.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelSimpleObject.Location = new System.Drawing.Point(223, 193);
+            this.labelSimpleObject.Name = "labelSimpleObject";
+            this.labelSimpleObject.Size = new System.Drawing.Size(114, 54);
+            this.labelSimpleObject.TabIndex = 7;
+            this.labelSimpleObject.Text = "Простой";
+            this.labelSimpleObject.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelSimpleObject.MouseDown += new System.Windows.Forms.MouseEventHandler(this.LabelObject_MouseDown);
+            // 
+            // groupBoxColors
+            // 
+            this.groupBoxColors.Controls.Add(this.panelWhite);
+            this.groupBoxColors.Controls.Add(this.panelGray);
+            this.groupBoxColors.Controls.Add(this.panelBlack);
+            this.groupBoxColors.Controls.Add(this.panelPurple);
+            this.groupBoxColors.Controls.Add(this.panelGreen);
+            this.groupBoxColors.Controls.Add(this.panelBlue);
+            this.groupBoxColors.Controls.Add(this.panelYellow);
+            this.groupBoxColors.Controls.Add(this.panelRed);
+            this.groupBoxColors.Location = new System.Drawing.Point(223, 23);
+            this.groupBoxColors.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxColors.Name = "groupBoxColors";
+            this.groupBoxColors.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBoxColors.Size = new System.Drawing.Size(262, 155);
+            this.groupBoxColors.TabIndex = 6;
+            this.groupBoxColors.TabStop = false;
+            this.groupBoxColors.Text = "Цвета";
+            // 
+            // panelWhite
+            // 
+            this.panelWhite.BackColor = System.Drawing.Color.White;
+            this.panelWhite.Location = new System.Drawing.Point(37, 84);
+            this.panelWhite.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelWhite.Name = "panelWhite";
+            this.panelWhite.Size = new System.Drawing.Size(48, 53);
+            this.panelWhite.TabIndex = 1;
+            // 
+            // panelGray
+            // 
+            this.panelGray.BackColor = System.Drawing.Color.Gray;
+            this.panelGray.Location = new System.Drawing.Point(91, 84);
+            this.panelGray.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelGray.Name = "panelGray";
+            this.panelGray.Size = new System.Drawing.Size(48, 53);
+            this.panelGray.TabIndex = 1;
+            // 
+            // panelBlack
+            // 
+            this.panelBlack.BackColor = System.Drawing.Color.Black;
+            this.panelBlack.Location = new System.Drawing.Point(146, 84);
+            this.panelBlack.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelBlack.Name = "panelBlack";
+            this.panelBlack.Size = new System.Drawing.Size(48, 53);
+            this.panelBlack.TabIndex = 1;
+            // 
+            // panelPurple
+            // 
+            this.panelPurple.BackColor = System.Drawing.Color.Purple;
+            this.panelPurple.Location = new System.Drawing.Point(201, 84);
+            this.panelPurple.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelPurple.Name = "panelPurple";
+            this.panelPurple.Size = new System.Drawing.Size(48, 53);
+            this.panelPurple.TabIndex = 1;
+            // 
+            // panelGreen
+            // 
+            this.panelGreen.BackColor = System.Drawing.Color.Green;
+            this.panelGreen.Location = new System.Drawing.Point(91, 23);
+            this.panelGreen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelGreen.Name = "panelGreen";
+            this.panelGreen.Size = new System.Drawing.Size(48, 53);
+            this.panelGreen.TabIndex = 1;
+            // 
+            // panelBlue
+            // 
+            this.panelBlue.BackColor = System.Drawing.Color.Blue;
+            this.panelBlue.Location = new System.Drawing.Point(146, 23);
+            this.panelBlue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelBlue.Name = "panelBlue";
+            this.panelBlue.Size = new System.Drawing.Size(48, 53);
+            this.panelBlue.TabIndex = 1;
+            // 
+            // panelYellow
+            // 
+            this.panelYellow.BackColor = System.Drawing.Color.Yellow;
+            this.panelYellow.Location = new System.Drawing.Point(201, 23);
+            this.panelYellow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelYellow.Name = "panelYellow";
+            this.panelYellow.Size = new System.Drawing.Size(48, 53);
+            this.panelYellow.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            this.panelRed.BackColor = System.Drawing.Color.Red;
+            this.panelRed.Location = new System.Drawing.Point(37, 23);
+            this.panelRed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelRed.Name = "panelRed";
+            this.panelRed.Size = new System.Drawing.Size(48, 53);
+            this.panelRed.TabIndex = 0;
+            // 
+            // checkBoxStage
+            // 
+            this.checkBoxStage.AutoSize = true;
+            this.checkBoxStage.Location = new System.Drawing.Point(7, 180);
+            this.checkBoxStage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.checkBoxStage.Name = "checkBoxStage";
+            this.checkBoxStage.Size = new System.Drawing.Size(118, 24);
+            this.checkBoxStage.TabIndex = 5;
+            this.checkBoxStage.Text = "Второй этаж";
+            this.checkBoxStage.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxLadder
+            // 
+            this.checkBoxLadder.AutoSize = true;
+            this.checkBoxLadder.Location = new System.Drawing.Point(7, 131);
+            this.checkBoxLadder.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.checkBoxLadder.Name = "checkBoxLadder";
+            this.checkBoxLadder.Size = new System.Drawing.Size(97, 24);
+            this.checkBoxLadder.TabIndex = 4;
+            this.checkBoxLadder.Text = "Лестница";
+            this.checkBoxLadder.UseVisualStyleBackColor = true;
+            // 
+            // labelWeight
+            // 
+            this.labelWeight.AutoSize = true;
+            this.labelWeight.Location = new System.Drawing.Point(7, 79);
+            this.labelWeight.Name = "labelWeight";
+            this.labelWeight.Size = new System.Drawing.Size(33, 20);
+            this.labelWeight.TabIndex = 3;
+            this.labelWeight.Text = "Вес";
+            // 
+            // labelSpeed
+            // 
+            this.labelSpeed.AutoSize = true;
+            this.labelSpeed.Location = new System.Drawing.Point(7, 25);
+            this.labelSpeed.Name = "labelSpeed";
+            this.labelSpeed.Size = new System.Drawing.Size(73, 20);
+            this.labelSpeed.TabIndex = 2;
+            this.labelSpeed.Text = "Скорость";
+            // 
+            // numericUpDownWeight
+            // 
+            this.numericUpDownWeight.Location = new System.Drawing.Point(81, 68);
+            this.numericUpDownWeight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.numericUpDownWeight.Name = "numericUpDownWeight";
+            this.numericUpDownWeight.Size = new System.Drawing.Size(94, 27);
+            this.numericUpDownWeight.TabIndex = 1;
+            this.numericUpDownWeight.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // numericUpDownSpeed
+            // 
+            this.numericUpDownSpeed.Location = new System.Drawing.Point(81, 23);
+            this.numericUpDownSpeed.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.numericUpDownSpeed.Name = "numericUpDownSpeed";
+            this.numericUpDownSpeed.Size = new System.Drawing.Size(94, 27);
+            this.numericUpDownSpeed.TabIndex = 0;
+            this.numericUpDownSpeed.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // pictureBoxObject
+            // 
+            this.pictureBoxObject.Location = new System.Drawing.Point(22, 65);
+            this.pictureBoxObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.pictureBoxObject.Name = "pictureBoxObject";
+            this.pictureBoxObject.Size = new System.Drawing.Size(313, 140);
+            this.pictureBoxObject.TabIndex = 1;
+            this.pictureBoxObject.TabStop = false;
+            // 
+            // panelObject
+            // 
+            this.panelObject.AllowDrop = true;
+            this.panelObject.Controls.Add(this.labelExtraColor);
+            this.panelObject.Controls.Add(this.labelColor);
+            this.panelObject.Controls.Add(this.pictureBoxObject);
+            this.panelObject.Location = new System.Drawing.Point(550, 16);
+            this.panelObject.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.panelObject.Name = "panelObject";
+            this.panelObject.Size = new System.Drawing.Size(351, 217);
+            this.panelObject.TabIndex = 2;
+            this.panelObject.DragDrop += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragDrop);
+            this.panelObject.DragEnter += new System.Windows.Forms.DragEventHandler(this.PanelObject_DragEnter);
+            // 
+            // labelExtraColor
+            // 
+            this.labelExtraColor.AllowDrop = true;
+            this.labelExtraColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelExtraColor.Location = new System.Drawing.Point(170, 20);
+            this.labelExtraColor.Name = "labelExtraColor";
+            this.labelExtraColor.Size = new System.Drawing.Size(164, 30);
+            this.labelExtraColor.TabIndex = 9;
+            this.labelExtraColor.Text = "Доп цвет";
+            this.labelExtraColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelExtraColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelExtraColor_DragDrop);
+            this.labelExtraColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelExtraColor_DragEnter);
+            // 
+            // labelColor
+            // 
+            this.labelColor.AllowDrop = true;
+            this.labelColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.labelColor.Location = new System.Drawing.Point(22, 20);
+            this.labelColor.Name = "labelColor";
+            this.labelColor.Size = new System.Drawing.Size(141, 30);
+            this.labelColor.TabIndex = 8;
+            this.labelColor.Text = "Цвет";
+            this.labelColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelColor.UseCompatibleTextRendering = true;
+            this.labelColor.DragDrop += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragDrop);
+            this.labelColor.DragEnter += new System.Windows.Forms.DragEventHandler(this.LabelColor_DragEnter);
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(561, 241);
+            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(152, 52);
+            this.buttonAdd.TabIndex = 3;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(733, 241);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(152, 52);
+            this.buttonCancel.TabIndex = 4;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // FormBusConfig
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(914, 328);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonAdd);
+            this.Controls.Add(this.panelObject);
+            this.Controls.Add(this.groupBoxConfig);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormBusConfig";
+            this.Text = "Создние объекта";
+            this.groupBoxConfig.ResumeLayout(false);
+            this.groupBoxConfig.PerformLayout();
+            this.groupBoxColors.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 groupBoxConfig;
+        private CheckBox checkBoxStage;
+        private CheckBox checkBoxLadder;
+        private Label labelWeight;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private NumericUpDown numericUpDownSpeed;
+        private GroupBox groupBoxColors;
+        private Panel panelWhite;
+        private Panel panelGray;
+        private Panel panelBlack;
+        private Panel panelPurple;
+        private Panel panelGreen;
+        private Panel panelBlue;
+        private Panel panelYellow;
+        private Panel panelRed;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private PictureBox pictureBoxObject;
+        private Panel panelObject;
+        private Label labelExtraColor;
+        private Label labelColor;
+        private Button buttonAdd;
+        private Button buttonCancel;
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/FormBusConfig.cs

@@ -0,0 +1,151 @@
+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 DoubleDeckerBus
+{
+    public partial class FormBusConfig : Form
+    {
+        DrawingBus _bus = null;
+        private event BusDelegate EventAddBus;
+
+        public FormBusConfig()
+        {
+            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;
+            buttonCancel.Click += (object sender, EventArgs a) => Close();
+        }
+
+        private void LabelObject_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Label).DoDragDrop((sender as Label).Name, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void DrawBus()
+        {
+            Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _bus?.SetPosition(5, 5, pictureBoxObject.Width, pictureBoxObject.Height);
+            _bus?.DrawTransport(gr);
+            pictureBoxObject.Image = bmp;
+        }
+
+        public void AddEvent(BusDelegate ev)
+        {
+            if (EventAddBus == null)
+            {
+                EventAddBus = new BusDelegate(ev);
+            }
+            else
+            {
+                EventAddBus += ev;
+            }
+        }
+
+        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":
+                    _bus = new DrawingBus((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelColor.BackColor);
+                    break;
+                case "labelModifiedObject":
+                    _bus = new DrawingDDB((int)numericUpDownSpeed.Value, (int)numericUpDownWeight.Value, labelColor.BackColor, labelExtraColor.BackColor,
+                        checkBoxLadder.Checked, checkBoxStage.Checked);
+                    break;
+            }
+            DrawBus();
+        }
+
+        private void PanelColor_MouseDown(object sender, MouseEventArgs e)
+        {
+            (sender as Control).DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+        }
+
+        private void LabelColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void LabelColor_DragDrop(object sender, DragEventArgs e)
+        {
+            var color = e.Data.GetData(typeof(Color));
+            if (color != null) {
+                (sender as Label).BackColor = (Color)color;
+            }
+            if (_bus != null)
+            {
+                _bus.Bus.BodyColor = (Color)color;
+                DrawBus();
+            }
+        }
+
+        private void LabelExtraColor_DragEnter(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(typeof(Color)))
+            {
+                e.Effect = DragDropEffects.Copy;
+            }
+            else
+            {
+                e.Effect = DragDropEffects.None;
+            }
+        }
+
+        private void LabelExtraColor_DragDrop(object sender, DragEventArgs e)
+        {
+            var color = e.Data.GetData(typeof(Color));
+            if (color != null)
+            {
+                (sender as Label).BackColor = (Color)color;
+            }
+            if (_bus != null)
+            {
+                if (_bus is DrawingDDB bus)
+                {
+                    bus.SetDopColor((Color)color);
+                    DrawBus();
+                }
+                DrawBus();
+            }
+        }
+
+        private void ButtonAdd_Click(object sender, EventArgs e)
+        {   
+            EventAddBus?.Invoke(_bus);
+            Close();
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/FormBusConfig.resx

@@ -57,7 +57,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>

DoubleDeckerBus/DoubleDeckerBus/FormMap.Designer.cs

@@ -1,214 +0,0 @@
-namespace DoubleDeckerBus
-{
-    partial class FormMap
-    {
-        /// <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.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.pictureBoxBus = new System.Windows.Forms.PictureBox();
-            this.buttonСreateExtra = new System.Windows.Forms.Button();
-            this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
-            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
-            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit();
-            this.statusStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // buttonCreate
-            // 
-            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.buttonCreate.Location = new System.Drawing.Point(0, 389);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(99, 28);
-            this.buttonCreate.TabIndex = 2;
-            this.buttonCreate.Text = "Создать";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click);
-            // 
-            // buttonUp
-            // 
-            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(718, 337);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(30, 29);
-            this.buttonUp.TabIndex = 3;
-            this.buttonUp.Text = " ";
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.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.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.LeftArrow;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(693, 363);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(30, 29);
-            this.buttonLeft.TabIndex = 4;
-            this.buttonLeft.Text = " ";
-            this.buttonLeft.UseVisualStyleBackColor = true;
-            this.buttonLeft.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.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.DownArrow;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(719, 388);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(30, 29);
-            this.buttonDown.TabIndex = 5;
-            this.buttonDown.Text = " ";
-            this.buttonDown.UseVisualStyleBackColor = true;
-            this.buttonDown.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.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(745, 363);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(30, 29);
-            this.buttonRight.TabIndex = 6;
-            this.buttonRight.Text = " ";
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // pictureBoxBus
-            // 
-            this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBoxBus.Location = new System.Drawing.Point(0, 0);
-            this.pictureBoxBus.Name = "pictureBoxBus";
-            this.pictureBoxBus.Size = new System.Drawing.Size(800, 425);
-            this.pictureBoxBus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.pictureBoxBus.TabIndex = 7;
-            this.pictureBoxBus.TabStop = false;
-            // 
-            // buttonСreateExtra
-            // 
-            this.buttonСreateExtra.Location = new System.Drawing.Point(118, 388);
-            this.buttonСreateExtra.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonСreateExtra.Name = "buttonСreateExtra";
-            this.buttonСreateExtra.Size = new System.Drawing.Size(113, 28);
-            this.buttonСreateExtra.TabIndex = 8;
-            this.buttonСreateExtra.Text = "Модификация";
-            this.buttonСreateExtra.UseVisualStyleBackColor = true;
-            this.buttonСreateExtra.Click += new System.EventHandler(this.ButtonСreateExtra_Click);
-            // 
-            // toolStripStatusLabelSpeed
-            // 
-            this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed";
-            this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(80, 20);
-            this.toolStripStatusLabelSpeed.Text = "Скорость: ";
-            // 
-            // toolStripStatusLabelWeight
-            // 
-            this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight";
-            this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(40, 20);
-            this.toolStripStatusLabelWeight.Text = "Вес: ";
-            // 
-            // toolStripStatusLabelBodyColor
-            // 
-            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
-            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(49, 20);
-            this.toolStripStatusLabelBodyColor.Text = "Цвет: ";
-            // 
-            // statusStrip1
-            // 
-            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolStripStatusLabelSpeed,
-            this.toolStripStatusLabelWeight,
-            this.toolStripStatusLabelBodyColor});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 425);
-            this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(800, 26);
-            this.statusStrip1.TabIndex = 1;
-            this.statusStrip1.Text = "statusStrip1";
-            // 
-            // 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(0, 0);
-            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(138, 28);
-            this.comboBoxSelectorMap.TabIndex = 9;
-            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-            // 
-            // FormMap
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 451);
-            this.Controls.Add(this.comboBoxSelectorMap);
-            this.Controls.Add(this.buttonСreateExtra);
-            this.Controls.Add(this.buttonRight);
-            this.Controls.Add(this.buttonDown);
-            this.Controls.Add(this.buttonLeft);
-            this.Controls.Add(this.buttonUp);
-            this.Controls.Add(this.buttonCreate);
-            this.Controls.Add(this.pictureBoxBus);
-            this.Controls.Add(this.statusStrip1);
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.Name = "FormMap";
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit();
-            this.statusStrip1.ResumeLayout(false);
-            this.statusStrip1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-            #endregion
-        private Button buttonCreate;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonDown;
-        private Button buttonRight;
-        private PictureBox pictureBoxBus;
-        private Button buttonСreateExtra;
-        private ToolStripStatusLabel toolStripStatusLabelSpeed;
-        private ToolStripStatusLabel toolStripStatusLabelWeight;
-        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
-        private StatusStrip statusStrip1;
-        private ComboBox comboBoxSelectorMap;
-    }
-}

DoubleDeckerBus/DoubleDeckerBus/FormMap.cs

@@ -1,87 +0,0 @@
-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 DoubleDeckerBus
-{
-    public partial class FormMap : Form
-    {
-        private AbstractMap _abstractMap;
-        public FormMap()
-        {
-            InitializeComponent();
-            _abstractMap = new SimpleMap();
-            comboBoxSelectorMap.SelectedIndex = 0;
-        }
-
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var bus = new DrawingBus(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            SetData(bus);
-        }
-
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            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;
-            }
-            pictureBoxBus.Image = _abstractMap?.MoveObject(dir);
-        }
-
-        private void SetData(DrawingBus bus)
-        {
-            toolStripStatusLabelSpeed.Text = $"Скорость: {bus.Bus.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {bus.Bus.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {bus.Bus.BodyColor.Name}";
-            pictureBoxBus.Image = _abstractMap.CreateMap(pictureBoxBus.Width, pictureBoxBus.Height,
-                new DrawingObjectBus(bus));
-        }
-
-        private void ButtonСreateExtra_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            var bus = new DrawingDDB(rnd.Next(100, 300), rnd.Next(1000, 2000),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
-                Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
-            SetData(bus);
-        }
-
-        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            switch (comboBoxSelectorMap.Text)
-            {
-                case "Простая карта":
-                    _abstractMap = new SimpleMap();
-                    break;
-                case "Водная карта":
-                    _abstractMap = new WaterMap();
-                    break;
-            }
-        }
-    }
-
-
-}
-

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.Designer.cs

@@ -0,0 +1,371 @@
+namespace DoubleDeckerBus
+{
+    partial class FormMapWithSetBuses
+    {
+        /// <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.groupBoxSettings = new System.Windows.Forms.GroupBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.listBoxMaps = new System.Windows.Forms.ListBox();
+            this.ButtonDeleteMap = new System.Windows.Forms.Button();
+            this.ButtonAddMap = new System.Windows.Forms.Button();
+            this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonDeleteBus = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddBus = new System.Windows.Forms.Button();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
+            this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.button1 = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.ButtonSortByColor = new System.Windows.Forms.Button();
+            this.ButtonSortByType = new System.Windows.Forms.Button();
+            this.groupBoxSettings.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.menuStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBoxSettings
+            // 
+            this.groupBoxSettings.Controls.Add(this.ButtonSortByColor);
+            this.groupBoxSettings.Controls.Add(this.ButtonSortByType);
+            this.groupBoxSettings.Controls.Add(this.groupBox1);
+            this.groupBoxSettings.Controls.Add(this.buttonRight);
+            this.groupBoxSettings.Controls.Add(this.buttonDown);
+            this.groupBoxSettings.Controls.Add(this.buttonLeft);
+            this.groupBoxSettings.Controls.Add(this.buttonUp);
+            this.groupBoxSettings.Controls.Add(this.button1);
+            this.groupBoxSettings.Controls.Add(this.buttonShowStorage);
+            this.groupBoxSettings.Controls.Add(this.buttonDeleteBus);
+            this.groupBoxSettings.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxSettings.Controls.Add(this.buttonAddBus);
+            this.groupBoxSettings.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxSettings.Location = new System.Drawing.Point(645, 24);
+            this.groupBoxSettings.Name = "groupBoxSettings";
+            this.groupBoxSettings.Size = new System.Drawing.Size(200, 710);
+            this.groupBoxSettings.TabIndex = 0;
+            this.groupBoxSettings.TabStop = false;
+            this.groupBoxSettings.Text = "Инструменты";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.listBoxMaps);
+            this.groupBox1.Controls.Add(this.ButtonDeleteMap);
+            this.groupBox1.Controls.Add(this.ButtonAddMap);
+            this.groupBox1.Controls.Add(this.textBoxNewMapName);
+            this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBox1.Location = new System.Drawing.Point(0, 22);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(200, 339);
+            this.groupBox1.TabIndex = 11;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Карты";
+            // 
+            // listBoxMaps
+            // 
+            this.listBoxMaps.FormattingEnabled = true;
+            this.listBoxMaps.ItemHeight = 15;
+            this.listBoxMaps.Location = new System.Drawing.Point(6, 150);
+            this.listBoxMaps.Name = "listBoxMaps";
+            this.listBoxMaps.Size = new System.Drawing.Size(188, 124);
+            this.listBoxMaps.TabIndex = 4;
+            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.listBoxMaps_SelectedIndexChanged);
+            // 
+            // ButtonDeleteMap
+            // 
+            this.ButtonDeleteMap.Location = new System.Drawing.Point(6, 280);
+            this.ButtonDeleteMap.Name = "ButtonDeleteMap";
+            this.ButtonDeleteMap.Size = new System.Drawing.Size(194, 53);
+            this.ButtonDeleteMap.TabIndex = 3;
+            this.ButtonDeleteMap.Text = "Удалить карту";
+            this.ButtonDeleteMap.UseVisualStyleBackColor = true;
+            this.ButtonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+            // 
+            // ButtonAddMap
+            // 
+            this.ButtonAddMap.Location = new System.Drawing.Point(6, 84);
+            this.ButtonAddMap.Name = "ButtonAddMap";
+            this.ButtonAddMap.Size = new System.Drawing.Size(194, 53);
+            this.ButtonAddMap.TabIndex = 2;
+            this.ButtonAddMap.Text = "Добавить карту";
+            this.ButtonAddMap.UseVisualStyleBackColor = true;
+            this.ButtonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+            // 
+            // textBoxNewMapName
+            // 
+            this.textBoxNewMapName.Location = new System.Drawing.Point(6, 22);
+            this.textBoxNewMapName.Name = "textBoxNewMapName";
+            this.textBoxNewMapName.Size = new System.Drawing.Size(188, 23);
+            this.textBoxNewMapName.TabIndex = 1;
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 55);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.RightArrow;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(109, 658);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(26, 22);
+            this.buttonRight.TabIndex = 10;
+            this.buttonRight.Text = " ";
+            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.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.DownArrow;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(86, 677);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(26, 22);
+            this.buttonDown.TabIndex = 9;
+            this.buttonDown.Text = " ";
+            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.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.LeftArrow;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(63, 658);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(26, 22);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.Text = " ";
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.UpArrow;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(85, 639);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(26, 22);
+            this.buttonUp.TabIndex = 7;
+            this.buttonUp.Text = " ";
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDeleteBus
+            // 
+            this.buttonDeleteBus.Location = new System.Drawing.Point(6, 522);
+            this.buttonDeleteBus.Name = "buttonDeleteBus";
+            this.buttonDeleteBus.Size = new System.Drawing.Size(188, 36);
+            this.buttonDeleteBus.TabIndex = 3;
+            this.buttonDeleteBus.Text = "Удалить автобус";
+            this.buttonDeleteBus.UseVisualStyleBackColor = true;
+            this.buttonDeleteBus.Click += new System.EventHandler(this.ButtonRemoveBus_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 493);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddBus
+            // 
+            this.buttonAddBus.Location = new System.Drawing.Point(6, 451);
+            this.buttonAddBus.Name = "buttonAddBus";
+            this.buttonAddBus.Size = new System.Drawing.Size(188, 36);
+            this.buttonAddBus.TabIndex = 1;
+            this.buttonAddBus.Text = "Добавить автобус";
+            this.buttonAddBus.UseVisualStyleBackColor = true;
+            this.buttonAddBus.Click += new System.EventHandler(this.ButtonAddBus_Click);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 24);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(645, 710);
+            this.pictureBox.TabIndex = 1;
+            this.pictureBox.TabStop = false;
+            // 
+            // menuStrip1
+            // 
+            this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.FileToolStripMenuItem});
+            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip1.Name = "menuStrip1";
+            this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2);
+            this.menuStrip1.Size = new System.Drawing.Size(845, 24);
+            this.menuStrip1.TabIndex = 2;
+            this.menuStrip1.Text = "menuStrip1";
+            // 
+            // FileToolStripMenuItem
+            // 
+            this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SaveToolStripMenuItem,
+            this.LoadToolStripMenuItem});
+            this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
+            this.FileToolStripMenuItem.Size = new System.Drawing.Size(48, 20);
+            this.FileToolStripMenuItem.Text = "Файл";
+            // 
+            // SaveToolStripMenuItem
+            // 
+            this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+            this.SaveToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.SaveToolStripMenuItem.Text = "Сохранение";
+            this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+            // 
+            // LoadToolStripMenuItem
+            // 
+            this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+            this.LoadToolStripMenuItem.Size = new System.Drawing.Size(141, 22);
+            this.LoadToolStripMenuItem.Text = "Загрузка";
+            this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.FileName = "openFileDialog1";
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(6, 605);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(182, 35);
+            this.button1.TabIndex = 5;
+            this.button1.Text = "Посмотреть карту";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(6, 564);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(182, 35);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // ButtonSortByColor
+            // 
+            this.ButtonSortByColor.Location = new System.Drawing.Point(12, 402);
+            this.ButtonSortByColor.Name = "ButtonSortByColor";
+            this.ButtonSortByColor.Size = new System.Drawing.Size(182, 35);
+            this.ButtonSortByColor.TabIndex = 13;
+            this.ButtonSortByColor.Text = "Сортировать по цвету";
+            this.ButtonSortByColor.UseVisualStyleBackColor = true;
+            this.ButtonSortByColor.Click += new System.EventHandler(this.ButtonSortByColor_Click);
+            // 
+            // ButtonSortByType
+            // 
+            this.ButtonSortByType.Location = new System.Drawing.Point(12, 361);
+            this.ButtonSortByType.Name = "ButtonSortByType";
+            this.ButtonSortByType.Size = new System.Drawing.Size(182, 35);
+            this.ButtonSortByType.TabIndex = 12;
+            this.ButtonSortByType.Text = "Сортировать по типу";
+            this.ButtonSortByType.UseVisualStyleBackColor = true;
+            this.ButtonSortByType.Click += new System.EventHandler(this.ButtonSortByType_Click);
+            // 
+            // FormMapWithSetBuses
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(845, 734);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxSettings);
+            this.Controls.Add(this.menuStrip1);
+            this.MainMenuStrip = this.menuStrip1;
+            this.Name = "FormMapWithSetBuses";
+            this.Text = "Карты с набором объектов";
+            this.groupBoxSettings.ResumeLayout(false);
+            this.groupBoxSettings.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.menuStrip1.ResumeLayout(false);
+            this.menuStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private GroupBox groupBoxSettings;
+        private PictureBox pictureBox;
+        private Button buttonAddBus;
+        private Button buttonDeleteBus;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private GroupBox groupBox1;
+        private TextBox textBoxNewMapName;
+        private ComboBox comboBoxSelectorMap;
+        private Button ButtonDeleteMap;
+        private Button ButtonAddMap;
+        private ListBox listBoxMaps;
+        private MenuStrip menuStrip1;
+        private ToolStripMenuItem FileToolStripMenuItem;
+        private ToolStripMenuItem SaveToolStripMenuItem;
+        private ToolStripMenuItem LoadToolStripMenuItem;
+        private OpenFileDialog openFileDialog;
+        private SaveFileDialog saveFileDialog;
+        private Button ButtonSortByColor;
+        private Button ButtonSortByType;
+        private Button button1;
+        private Button buttonShowStorage;
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.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;
+using static System.Windows.Forms.DataFormats;
+
+namespace DoubleDeckerBus
+{
+    public partial class FormMapWithSetBuses : Form
+    {
+
+        private readonly Dictionary<string, AbstractMap> _mapsDict = new Dictionary<string, AbstractMap>() {
+            { "Простая карта", new SimpleMap() },
+            { "Водная карта", new WaterMap() }
+        };
+
+        private readonly MapsCollection _mapsCollection;
+
+        private readonly ILogger _logger;
+
+        public FormMapWithSetBuses(ILogger<FormMapWithSetBuses> logger)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+            comboBoxSelectorMap.Items.Clear();
+            foreach (var item in _mapsDict) {
+                comboBoxSelectorMap.Items.Add(item.Key);
+            }
+        }
+
+        private void ReloadMaps()
+        {
+            int index = listBoxMaps.SelectedIndex;
+
+            listBoxMaps.Items.Clear();
+            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
+            {
+                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
+            }
+
+            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 ButtonAddBus_Click(object sender, EventArgs e)
+        {
+            var formBusConfig = new FormBusConfig();
+            formBusConfig.AddEvent(AddBus);
+            formBusConfig.Show();
+        }
+
+        private void AddBus(DrawingBus bus)
+        {   
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            try
+            {
+                DrawingObjectBus _bus = new(bus);
+                _ = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + _bus;
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                _logger.LogInformation($"Объект добавлен");
+            }
+            catch (StorageOverflowException ex)
+            {
+                MessageBox.Show($"Не удалось добавить объект {ex.Message}");
+                _logger.LogInformation($"Объект не добаавлен {ex.Message}");
+            }
+            catch (Exception ex) {
+                MessageBox.Show($"Не удалось добавить объект {ex.Message}");
+                _logger.LogInformation($"Объект не добаавлен {ex.Message}");
+            }
+        }
+
+        private void ButtonRemoveBus_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            try
+            {
+                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
+                {
+                    MessageBox.Show("Объект удален");
+                    _logger.LogInformation($"Объект удален");
+                    pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось удалить объект");
+                    _logger.LogInformation($"Объект не удален");
+                }
+            }
+            catch (BusNotFoundException ex)
+            {
+                MessageBox.Show($"Ошибка удаления: {ex.Message}");
+                _logger.LogWarning("Автобус не найден");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"Неизветсная шибка: {ex.Message}");
+                _logger.LogWarning("Неизвестная ошибка при удалении");
+            }
+            
+        }
+
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation($"Отображение хранилища");
+        }
+
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                return;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
+            _logger.LogInformation($"Отображение карты");
+        }
+
+        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;
+            }
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
+            _logger.LogInformation($"Передвижение {name}");
+        }
+
+        private void ButtonAddMap_Click(object sender, EventArgs e)
+        {
+            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+            {
+                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning($"Не все данные заполнены при добавлени карты");
+                return;
+            }
+            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+            {
+                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogWarning($"Нет такой карты {comboBoxSelectorMap.Text}");
+                return;
+            }
+            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+            ReloadMaps();
+            _logger.LogInformation($"Добавлена карта {textBoxNewMapName.Text}");
+        }
+
+        private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+            _logger.LogInformation($"Выбраная карта изменилась {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
+        }
+
+        private void ButtonDeleteMap_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1)
+            {
+                _logger.LogWarning("Удаление карты не произошло. Не выбрана карта");
+                return;
+            }
+
+            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            {
+                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
+                _logger.LogInformation($"Удалена карта {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);
+                    _logger.LogInformation($"Сохранение {openFileDialog.FileName} прошло успешно");
+                }
+                catch (Exception ex) {
+                    MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Сохранение {openFileDialog.FileName} прошло не успешно");
+                }
+            }
+        }
+
+        private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                try {
+                    _mapsCollection.LoadData(openFileDialog.FileName);
+                    MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    _logger.LogInformation($"Загрузка из файла {openFileDialog.FileName} прошла успешна");
+                    ReloadMaps();
+                }
+                catch (Exception ex)
+                { 
+                    MessageBox.Show($"Ошибка при загрузке: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    _logger.LogWarning($"Загрузка из файла {openFileDialog.FileName} прошла не успешно");
+                }
+            }
+        }
+
+        private void ButtonSortByType_Click(object sender, EventArgs e)
+        {
+            if (listBoxMaps.SelectedIndex == -1) {
+                return;
+            }
+            _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? String.Empty].Sort(new BusCompareByType());
+            pictureBox.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 BusCompareByColor());
+            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+        }
+    }
+}
+

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.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>17, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>152, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>319, 17</value>
+  </metadata>
+</root>

DoubleDeckerBus/DoubleDeckerBus/IDrawingObject.cs

@@ -6,8 +6,9 @@ using System.Threading.Tasks;
 
 namespace DoubleDeckerBus
 {
-    internal interface IDrawingObject
+    internal interface IDrawingObject : IEquatable<IDrawingObject>
     {
+        public DrawingBus getBus();
         public float Step { get; }
 
         void SetObject(int x, int y, int width, int height);
@@ -18,5 +19,6 @@ namespace DoubleDeckerBus
 
         (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
 
+        string GetInfo();
     }
 }

DoubleDeckerBus/DoubleDeckerBus/MapWithSetBusesGeneric.cs

@@ -0,0 +1,166 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DoubleDeckerBus
+{
+    internal class MapWithSetBusesGeneric<T, U>
+        where T : class, IDrawingObject, IEquatable<T>
+        where U : AbstractMap
+    {
+
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        private readonly int _placeSizeWidth = 210;
+        private readonly int _placeSizeHeight = 90;
+        private readonly SetBusesGeneric<T> _setBuses;
+        private readonly U _map;
+
+        public MapWithSetBusesGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setBuses = new SetBusesGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+
+        public static int operator +(MapWithSetBusesGeneric<T, U> map, T bus)
+        {   
+            return map._setBuses.Insert(bus);
+        }
+
+        public static T operator -(MapWithSetBusesGeneric<T, U> map, int position)
+        {
+            return map._setBuses.Remove(position);
+        }
+  
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawBuses(gr);
+            return bmp;
+        }
+
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            foreach (var bus in _setBuses.GetBuses())
+            {
+                return _map.CreateMap(_pictureWidth, _pictureHeight, bus);
+            }
+            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 = _setBuses.Count - 1;
+            for (int i = 0; i < _setBuses.Count; i++)
+            {
+                if (_setBuses[i] == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var bus = _setBuses[j];
+                        if (bus != null)
+                        {
+                            _setBuses.Insert(bus, i);
+                            _setBuses.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            Brush pointColor = new SolidBrush(Color.Orange);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
+                {
+                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight,
+                        i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (40)));
+
+                    g.FillPolygon(pointColor, new Point[] {
+                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (40))),
+                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2 - 10, (int)((j * _placeSizeHeight) - (50))),
+                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2, (int)((j * _placeSizeHeight) - (60))),
+                        new Point(i * _placeSizeWidth + _placeSizeWidth / 2 + 10, (int)((j * _placeSizeHeight) - (50)))
+                    });
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+        }
+
+        private void DrawBuses(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+
+            int currentWidth = width - 1;
+            int currentHeight = 0;
+
+            foreach (var bus in _setBuses.GetBuses())
+            {
+
+                bus?.SetObject(currentWidth * _placeSizeWidth,
+                    currentHeight * _placeSizeHeight,
+                    _pictureWidth, _pictureHeight);
+                bus?.DrawingObject(g);
+
+                if (currentWidth > 0)
+                    currentWidth--;
+                else
+                {
+                    currentWidth = width - 1;
+                    currentHeight++;
+                }
+                if (currentHeight > height) return;
+            }
+        }
+
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var bus in _setBuses.GetBuses())
+            {
+                data += $"{bus.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setBuses.Insert(DrawingObjectBus.Create(rec) as T);
+            }
+        }
+
+        public void Sort(IComparer<T> comparer) {
+            _setBuses.SortSet(comparer);
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/MapsCollection.cs

@@ -0,0 +1,107 @@
+using DoubleDeckerBus;
+using System.Text;
+
+namespace DoubleDeckerBus
+{
+    internal class MapsCollection
+    {
+        
+        readonly Dictionary<string, MapWithSetBusesGeneric<IDrawingObject, 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, MapWithSetBusesGeneric<IDrawingObject, AbstractMap>>();
+            _pictureWidth = pictureWidth;
+            _pictureHeight = pictureHeight;
+        }
+       
+        public void AddMap(string name, AbstractMap map)
+        {
+            if (Keys.Contains(name)) return;
+            _mapStorages.Add(name, new MapWithSetBusesGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+        }
+
+        public void DelMap(string name)
+        {
+            _mapStorages.Remove(name);
+        }
+
+        public MapWithSetBusesGeneric<IDrawingObject, AbstractMap> this[string ind]
+        {
+            get
+            {
+                _mapStorages.TryGetValue(ind, out var result);
+                return result;
+            }
+        }
+
+        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 (StreamWriter sw = new(filename))
+            {
+                sw.Write($"MapsCollection{Environment.NewLine}");
+                foreach (var storage in _mapStorages)
+                {
+                    sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+                }
+            }
+        }
+
+        public void LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                throw new FileNotFoundException("Файл не найден");
+            }
+            string line;
+            using (StreamReader sw = new(filename))
+            {
+                line = sw.ReadLine();
+                if (line == null || !line.Contains("MapsCollection"))
+                {
+                    throw new FileFormatException("Формат данных в файле не совпадает");
+                }
+
+                _mapStorages.Clear();
+                line = sw.ReadLine();
+                while (line != null)
+                {
+                    var elem = line.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "WaterMap":
+                            map = new WaterMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetBusesGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+                    line = sw.ReadLine();
+                }
+            }
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/Program.cs

@@ -1,3 +1,9 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Serilog;
+using Serilog.Extensions.Logging;
+
 namespace DoubleDeckerBus
 {
     internal static class Program
@@ -11,7 +17,27 @@ namespace DoubleDeckerBus
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMap());
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            using (ServiceProvider serviceProvider = services.BuildServiceProvider())
+            {
+                Application.Run(serviceProvider.GetRequiredService<FormMapWithSetBuses>());
+            }
+        }
+
+        private static void ConfigureServices(ServiceCollection services) {
+            services.AddSingleton<FormMapWithSetBuses>().AddLogging(option =>
+            {
+                var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: "serilog.json").Build();
+
+                var logger = new LoggerConfiguration()
+                    .ReadFrom.Configuration(configuration)
+                    .CreateLogger();
+
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddSerilog(logger);
+            });
+            
         }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/SetBusesGeneric.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DoubleDeckerBus
+{
+    internal class SetBusesGeneric<T>
+        where T : class, IEquatable<T>
+    {
+        private readonly List<T> _places;
+
+        public int Count => _places.Count;
+        private int BusyPlaces = 0;
+
+        private readonly int _maxCount;
+
+        public SetBusesGeneric(int count)
+        {
+            _maxCount = count;
+            _places = new List<T>();
+        }
+
+        public int Insert(T bus)
+        {
+            return Insert(bus, 0);
+        }
+
+        public int Insert(T bus, int position)
+        {
+            if (_places.Contains(bus))
+            {
+                throw new ArgumentException("The same bus exist");
+            }
+
+            if (position < 0 || position >= _maxCount)
+            {
+                throw new BusNotFoundException("Место указано неверно");
+            }
+
+
+            BusyPlaces++;
+            _places.Insert(position, bus);
+            return position;
+        }
+
+        public T Remove(int position)
+        {
+
+            if (position < 0 || position >= _maxCount) {
+                throw new BusNotFoundException(position);
+            }
+            T savedBus = _places[position];
+            _places.RemoveAt(position);
+            return savedBus;
+        }
+
+        public T this[int position] {
+            get {
+                if (position < 0 || position >= _maxCount) return default(T);
+                return _places[position];
+            }
+            set {
+                Insert(value, position);
+            }
+
+        }
+
+        public IEnumerable<T> GetBuses() {
+            foreach (var bus in _places)
+            {
+                if (bus != null)
+                {
+                    yield return bus;
+                }
+                else
+                {
+                    yield break;
+                }
+            }
+        }
+
+        public void SortSet(IComparer<T> comparer) {
+            if (comparer == null) {
+                return;
+            }
+            _places.Sort(comparer);
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/StorageOverFlowException.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DoubleDeckerBus
+{
+    [Serializable]
+    internal class StorageOverflowException : ApplicationException
+    {
+        public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count}") { }
+        public StorageOverflowException() : base() { }
+        public StorageOverflowException(string message) : base(message) { }
+        public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
+        protected StorageOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/serilog.Designer.cs

@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace DoubleDeckerBus {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")]
+    internal sealed partial class serilog : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static serilog defaultInstance = ((serilog)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new serilog())));
+        
+        public static serilog Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/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": "DoubleDeckerBus"
+    }
+  }
+}