name fix

Reviewed-on: http://student.git.athene.tech/NikGapon/ISEbd-21_Gapon_N.I._Airbus_Base/pulls/1

Airbus/Airbus/AbstractMap.cs

@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal abstract class AbstractMap
-    {
-        private IDrawningObject _drawningObject = null;
-
-        protected int[,] _map = null;
-        protected int _width;
-        protected int _height;
-        protected float _size_x;
-        protected float _size_y;
-        protected readonly Random _random = new();
-        protected readonly int _freeRoad = 0;
-        protected readonly int _barrier = 1;
-
-        public Bitmap CreateMap(int width, int height, IDrawningObject drawningObject)
-        {
-            _width = width;
-            _height = height;
-            _drawningObject = drawningObject;
-            GenerateMap();
-            while (!SetObjectOnMap())
-            {
-                GenerateMap();
-            }
-            return DrawMapWithObject();
-        }
-
-        private bool CanMove(Direction direction, (float Left, float Right, float Top, float Bottom) position) //Проверка на возможность шага
-        {
-            
-            for (int i = (int)(position.Top / _size_y); i <=(int)((position.Bottom + 25) / _size_y); ++i)
-            {
-                for (int j = (int)(position.Left / _size_x); j <= (int)((position.Right + 5) / _size_x); ++j)
-                {
-                    if (i >= 0 && j >= 0 && i < _map.GetLength(0) && j < _map.GetLength(1) && _map[i, j] == _barrier) return false;
-                }
-            }
-            return true;
-        }
-
-        public Bitmap MoveObject(Direction direction)
-        {
-            (float Left, float Right, float Top, float Bottom) position = _drawningObject.GetCurrentPosition();
-            if (direction == Direction.Left)
-            {
-                position.Left -= _drawningObject.Step;
-            }
-            else if (direction == Direction.Right)
-            {
-                position.Right += _drawningObject.Step;
-            }
-            else if (direction == Direction.Up)
-            {
-                position.Top -= _drawningObject.Step;
-            }
-            else if (direction == Direction.Down)
-            {
-                position.Bottom += _drawningObject.Step;
-            }
-
-            if (CanMove(direction, position))
-            {
-                _drawningObject.MoveObject(direction);
-            }
-            return DrawMapWithObject();
-        }
-
-        private bool SetObjectOnMap()
-        {
-            if (_drawningObject == null || _map == null)
-            {
-                return false;
-            }
-            int x = _random.Next(0, 10);
-            int y = _random.Next(0, 10);
-            _drawningObject.SetObject(x, y, _width, _height);
-            for (int i = (int)(_drawningObject.GetCurrentPosition().Top / _size_y); i <= (int)((_drawningObject.GetCurrentPosition().Bottom + 25) / _size_y); ++i)
-            {
-                for (int j = (int)(_drawningObject.GetCurrentPosition().Left / _size_x); j <= (int)((_drawningObject.GetCurrentPosition().Right + 5)/ _size_x); ++j)
-                {
-                    if (_map[i, j] == _barrier) _map[i, j] = _freeRoad;
-                }
-            }
-            return true;
-        }
-        private Bitmap DrawMapWithObject()
-        {
-            Bitmap bmp = new(_width, _height);
-            if (_drawningObject == null || _map == null)
-            {
-                return bmp;
-            }
-            Graphics gr = Graphics.FromImage(bmp);
-            for (int i = 0; i < _map.GetLength(0); ++i)
-            {
-                for (int j = 0; j < _map.GetLength(1); ++j)
-                {
-                    if (_map[i, j] == _freeRoad)
-                    {
-                        DrawRoadPart(gr, i, j);
-                    }
-                    else if (_map[i, j] == _barrier)
-                    {
-                        DrawBarrierPart(gr, i, j);
-                    }
-                }
-            }
-            _drawningObject.DrawningObject(gr);
-            return bmp;
-        }
-        protected abstract void GenerateMap();
-        protected abstract void DrawRoadPart(Graphics g, int i, int j);
-        protected abstract void DrawBarrierPart(Graphics g, int i, int j);
-    }
-}

Airbus/Airbus/Direction.cs

@@ -6,9 +6,8 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    public enum  Direction
+    internal enum  Direction
     {
-        None = 0,
         Left = 1, //Влево
 		Up = 2, //Вверх
 		Right = 3, //Вправо

Airbus/Airbus/DrawingAirbus.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal class DrawingAirbus : DrawningAirplane
-    {
-        public DrawingAirbus(int speed, float weight, Color bodyColor, Color dopColor, bool compartment, bool engine) :
-        base(speed, weight, bodyColor, 150, 30)
-        {
-            airplane = new EntityAirbus(speed, weight, bodyColor, dopColor, compartment, engine);
-        }
-
-        public override void DrawTransport(Graphics g)
-        {
-            if (airplane is not EntityAirbus grandAirbus)
-            {
-                return;
-            }
-
-            Pen pen = new(Color.Black, 2);
-            Brush dopBrush = new SolidBrush(grandAirbus.DopColor);
-            if (grandAirbus.Engine)
-            {
-                g.FillRectangle(dopBrush, _startPosX , _startPosY + 12 + _airplaneWidth / 10, 10, 10);    
-                g.FillRectangle(dopBrush, _startPosX, _startPosY + 12 + _airplaneWidth / 5, 10, 10);
-                
-            }
-
-            _startPosX += 10;
-            base.DrawTransport(g);
-            _startPosX -= 10;
-
-            if (grandAirbus.Compartment)
-            {
-                g.FillRectangle(dopBrush, _startPosX + 85, _startPosY + 10, 50, 15);
-                g.DrawPolygon(pen, new[]
-            {
-                new Point((int)(_startPosX + 85), (int)(_startPosY + 10)),
-                new Point((int)(_startPosX + 85), (int)(_startPosY + 25)),
-                new Point((int)(_startPosX + 60), (int)(_startPosY + 25)),
-                new Point((int)(_startPosX + 85), (int)(_startPosY + 10)),
-            });
-            }
-
-        }
-    }
-}

Airbus/Airbus/DrawingAirplane.cs

@@ -6,24 +6,25 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-        public class DrawningAirplane
+        internal class DrawningAirplane
     {
             /// Класс-сущность
-            public EntityAirplane airplane { protected set; get; }
+            public EntityAirplane airplane { private set; get; }
             /// Левая координата отрисовки автомобиля
-            protected float _startPosX;
+            private float _startPosX;
             /// Верхняя кооридната отрисовки автомобиля
-            protected float _startPosY;
+            private float _startPosY;
             /// Ширина окна отрисовки
             private int? _pictureWidth = null;
             /// Высота окна отрисовки
             private int? _pictureHeight = null;
             /// Ширина отрисовки автомобиля
-            protected readonly int _airplaneWidth = 150; //Ширина отрисовки корабля 
+            private readonly int _airplaneWidth = 150; //Ширина отрисовки корабля 
-            protected readonly int _airplaneHeight = 30; //Высота отрисовки корабля
+            private readonly int _airplaneHeight = 30; //Высота отрисовки корабля
-            public DrawningAirplane(int speed, float weight, Color bodyColor)
+            public void Init(int speed, float weight, Color bodyColor)
             {
-                airplane = new EntityAirplane(speed, weight, bodyColor);
+                airplane = new EntityAirplane();
+             airplane.Init(speed, weight, bodyColor);
             }
             
             public void SetPosition(int x, int y, int width, int height)
@@ -58,14 +59,8 @@ namespace Airbus
                         break;
                 }
             }
-        protected DrawningAirplane(int speed, float weight, Color bodyColor, int
+            
-                     carWidth, int carHeight) :
+            public void DrawTransport(Graphics g)
-        this(speed, weight, bodyColor)
-        {
-            _airplaneWidth = carWidth;
-            _airplaneHeight = carHeight;
-        }
-        public virtual void DrawTransport(Graphics g)
             {
                 if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
                 {
@@ -119,10 +114,6 @@ namespace Airbus
                     _startPosY = _pictureHeight.Value - _airplaneHeight;
                 }
             }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return (_startPosX, _startPosX + _airplaneWidth, _startPosY, _startPosY + _airplaneHeight);
         }
-    }
 
     }

Airbus/Airbus/DrawningObjectAirplane.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal class DrawningObjectAirplane : IDrawningObject
-    {
-        private DrawningAirplane _airplane = null;
-
-        public DrawningObjectAirplane(DrawningAirplane airplane)
-        {
-            _airplane = airplane;
-        }
-        public float Step => _airplane?.airplane?.Step ?? 0;
-        public void DrawningObject(Graphics g)
-        {
-            _airplane?.DrawTransport(g);
-        }
-        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
-        {
-            return _airplane?.GetCurrentPosition() ?? default;
-        }
-        public void MoveObject(Direction direction)
-        {
-            _airplane?.MoveTransport(direction);
-        }
-        public void SetObject(int x, int y, int width, int height)
-        {
-            _airplane?.SetPosition(x, y, width, height);
-        }
-    }
-}

Airbus/Airbus/EntityAirbus.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal class EntityAirbus : EntityAirplane
-    {
-        public Color DopColor { get; private set; }
-        public bool Compartment { get; private set; }
-        public bool Engine { get; private set; }
-        public EntityAirbus(int speed, float weight, Color bodyColor, Color
-       dopColor, bool compartment, bool engine) :
-        base(speed, weight, bodyColor)
-        {
-            DopColor = dopColor;
-            Compartment = compartment;
-            Engine = engine;
-        }
-
-    }
-}

Airbus/Airbus/EntityAirplane.cs

@@ -6,14 +6,14 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    public class EntityAirplane
+    internal class EntityAirplane
     {
         public int Speed { get; private set; } //Скорость
         public float Weight { get; private set; } //Вес
         public Color BodyColor { get; private set; } //Цвет
         public float Step => Speed * 100 / Weight; //Шаг при перемещении
                                                    //Инициализация
-        public EntityAirplane(int speed, float weight, Color bodyColor)
+        public void Init(int speed, float weight, Color bodyColor)
         {
             Random random = new Random();
             Speed = speed <= 0 ? random.Next(50, 150) : speed;

Airbus/Airbus/FormAirplane.Designer.cs

@@ -36,8 +36,6 @@
             this.buttonRight = new System.Windows.Forms.Button();
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
-            this.buttonModCreate = new System.Windows.Forms.Button();
-            this.buttonSelecdAirplane = new System.Windows.Forms.Button();
             this.statusStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
             this.SuspendLayout();
@@ -142,33 +140,11 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // buttonModCreate
-            // 
-            this.buttonModCreate.Location = new System.Drawing.Point(81, 402);
-            this.buttonModCreate.Name = "buttonModCreate";
-            this.buttonModCreate.Size = new System.Drawing.Size(75, 23);
-            this.buttonModCreate.TabIndex = 7;
-            this.buttonModCreate.Text = "Модификация";
-            this.buttonModCreate.UseVisualStyleBackColor = true;
-            this.buttonModCreate.Click += new System.EventHandler(this.buttonModCreate_Click);
-            // 
-            // buttonSelecdAirplane
-            // 
-            this.buttonSelecdAirplane.Location = new System.Drawing.Point(595, 402);
-            this.buttonSelecdAirplane.Name = "buttonSelecdAirplane";
-            this.buttonSelecdAirplane.Size = new System.Drawing.Size(75, 23);
-            this.buttonSelecdAirplane.TabIndex = 8;
-            this.buttonSelecdAirplane.Text = "Выбрать";
-            this.buttonSelecdAirplane.UseVisualStyleBackColor = true;
-            this.buttonSelecdAirplane.Click += new System.EventHandler(this.buttonSelectAirplane_Click);
-            // 
             // FormAirplane
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.buttonSelecdAirplane);
-            this.Controls.Add(this.buttonModCreate);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonLeft);
             this.Controls.Add(this.buttonRight);
@@ -196,7 +172,5 @@
         private Button buttonRight;
         private Button buttonLeft;
         private Button buttonDown;
-        private Button buttonModCreate;
-        private Button buttonSelecdAirplane;
     }
 }

Airbus/Airbus/FormAirplane.cs

@@ -15,8 +15,6 @@ namespace Airbus
     {
         private DrawningAirplane airplane;
 
-        public DrawningAirplane SelectedAirplane { get; private set; }
-
         public FormAirplane()
         {
             InitializeComponent();
@@ -29,25 +27,16 @@ namespace Airbus
             airplane.DrawTransport(g);
             pictureBox.Image = bmp;
         }
-        private void SetData()
+
+        private void buttonCreate_Click(object sender, EventArgs e)
         {
             Random random = new Random();
+            airplane = new DrawningAirplane();
+            airplane.Init(random.Next(100, 300), random.Next(1000, 3000), Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
             airplane.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBox.Width, pictureBox.Height);
             toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.airplane?.Speed}";
             toolStripStatusLabelWight.Text = $"Вес: {airplane.airplane?.Weight}";
             toolStripStatusLabelColor.Text = $" : {airplane.airplane?.BodyColor}";
-        }
-        private void buttonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            airplane = new DrawningAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), color);
-            SetData();
             Draw();
         }
 
@@ -78,30 +67,5 @@ namespace Airbus
             airplane?.ChangeBorders(pictureBox.Width, pictureBox.Height);
             Draw();
         }
-        private void buttonModCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialog = new();
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                color = dialog.Color;
-            }
-            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
-            ColorDialog dialogDop = new();
-            if (dialogDop.ShowDialog() == DialogResult.OK)
-            {
-                dopColor = dialogDop.Color;
-            }
-            airplane = new DrawingAirbus(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 buttonSelectAirplane_Click(object sender, EventArgs e)
-        {
-            SelectedAirplane = airplane;
-            DialogResult = DialogResult.OK;
-        }
     }
-}
+}

Airbus/Airbus/FormMapWithSetAirplane.Designer.cs

@@ -1,280 +0,0 @@
-namespace Airbus
-{
-    partial class FormMapWithSetAirplane
-    {
-        /// <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.groupBoxTools = new System.Windows.Forms.GroupBox();
-            this.groupBoxMaps = new System.Windows.Forms.GroupBox();
-            this.listBoxMaps = new System.Windows.Forms.ListBox();
-            this.buttonDelMap = 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.buttonDown = new System.Windows.Forms.Button();
-            this.buttonRight = new System.Windows.Forms.Button();
-            this.buttonLeft = new System.Windows.Forms.Button();
-            this.buttonUp = new System.Windows.Forms.Button();
-            this.buttonShowOnMap = new System.Windows.Forms.Button();
-            this.buttonStorage = new System.Windows.Forms.Button();
-            this.buttonRemoveAirplane = new System.Windows.Forms.Button();
-            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
-            this.buttonAddAirplane = new System.Windows.Forms.Button();
-            this.pictureBox = new System.Windows.Forms.PictureBox();
-            this.groupBoxTools.SuspendLayout();
-            this.groupBoxMaps.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // groupBoxTools
-            // 
-            this.groupBoxTools.Controls.Add(this.groupBoxMaps);
-            this.groupBoxTools.Controls.Add(this.buttonDown);
-            this.groupBoxTools.Controls.Add(this.buttonRight);
-            this.groupBoxTools.Controls.Add(this.buttonLeft);
-            this.groupBoxTools.Controls.Add(this.buttonUp);
-            this.groupBoxTools.Controls.Add(this.buttonShowOnMap);
-            this.groupBoxTools.Controls.Add(this.buttonStorage);
-            this.groupBoxTools.Controls.Add(this.buttonRemoveAirplane);
-            this.groupBoxTools.Controls.Add(this.maskedTextBoxPosition);
-            this.groupBoxTools.Controls.Add(this.buttonAddAirplane);
-            this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxTools.Location = new System.Drawing.Point(631, 0);
-            this.groupBoxTools.Name = "groupBoxTools";
-            this.groupBoxTools.Size = new System.Drawing.Size(200, 593);
-            this.groupBoxTools.TabIndex = 0;
-            this.groupBoxTools.TabStop = false;
-            this.groupBoxTools.Text = "Инструменты";
-            // 
-            // groupBoxMaps
-            // 
-            this.groupBoxMaps.Controls.Add(this.listBoxMaps);
-            this.groupBoxMaps.Controls.Add(this.buttonDelMap);
-            this.groupBoxMaps.Controls.Add(this.buttonAddMap);
-            this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
-            this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
-            this.groupBoxMaps.Location = new System.Drawing.Point(6, 22);
-            this.groupBoxMaps.Name = "groupBoxMaps";
-            this.groupBoxMaps.Size = new System.Drawing.Size(188, 211);
-            this.groupBoxMaps.TabIndex = 10;
-            this.groupBoxMaps.TabStop = false;
-            this.groupBoxMaps.Text = "Карты";
-            // 
-            // listBoxMaps
-            // 
-            this.listBoxMaps.FormattingEnabled = true;
-            this.listBoxMaps.ItemHeight = 15;
-            this.listBoxMaps.Location = new System.Drawing.Point(6, 105);
-            this.listBoxMaps.Name = "listBoxMaps";
-            this.listBoxMaps.Size = new System.Drawing.Size(170, 64);
-            this.listBoxMaps.TabIndex = 4;
-            this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.listBoxMaps_SelectedIndexChanged);
-            // 
-            // buttonDelMap
-            // 
-            this.buttonDelMap.Location = new System.Drawing.Point(43, 175);
-            this.buttonDelMap.Name = "buttonDelMap";
-            this.buttonDelMap.Size = new System.Drawing.Size(106, 23);
-            this.buttonDelMap.TabIndex = 3;
-            this.buttonDelMap.Text = "Удалить карту";
-            this.buttonDelMap.UseVisualStyleBackColor = true;
-            this.buttonDelMap.Click += new System.EventHandler(this.buttonDelMap_Click);
-            // 
-            // buttonAddMap
-            // 
-            this.buttonAddMap.Location = new System.Drawing.Point(6, 76);
-            this.buttonAddMap.Name = "buttonAddMap";
-            this.buttonAddMap.Size = new System.Drawing.Size(170, 23);
-            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, 18);
-            this.textBoxNewMapName.Name = "textBoxNewMapName";
-            this.textBoxNewMapName.Size = new System.Drawing.Size(170, 23);
-            this.textBoxNewMapName.TabIndex = 1;
-            // 
-            // comboBoxSelectorMap
-            // 
-            this.comboBoxSelectorMap.FormattingEnabled = true;
-            this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Первая карта",
-            "Вторая карта",
-            "Третья карта"});
-            this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 47);
-            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-            this.comboBoxSelectorMap.Size = new System.Drawing.Size(170, 23);
-            this.comboBoxSelectorMap.TabIndex = 0;
-            
-            // 
-            // buttonDown
-            // 
-            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDown.BackgroundImage = global::Airbus.Properties.Resources.v4;
-            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(80, 523);
-            this.buttonDown.Name = "buttonDown";
-            this.buttonDown.Size = new System.Drawing.Size(35, 35);
-            this.buttonDown.TabIndex = 9;
-            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::Airbus.Properties.Resources.v3;
-            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(112, 491);
-            this.buttonRight.Name = "buttonRight";
-            this.buttonRight.Size = new System.Drawing.Size(35, 35);
-            this.buttonRight.TabIndex = 8;
-            this.buttonRight.UseVisualStyleBackColor = true;
-            this.buttonRight.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::Airbus.Properties.Resources.v1;
-            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(49, 491);
-            this.buttonLeft.Name = "buttonLeft";
-            this.buttonLeft.Size = new System.Drawing.Size(35, 35);
-            this.buttonLeft.TabIndex = 7;
-            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::Airbus.Properties.Resources.v2;
-            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(80, 459);
-            this.buttonUp.Name = "buttonUp";
-            this.buttonUp.Size = new System.Drawing.Size(35, 35);
-            this.buttonUp.TabIndex = 6;
-            this.buttonUp.UseVisualStyleBackColor = true;
-            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
-            // 
-            // buttonShowOnMap
-            // 
-            this.buttonShowOnMap.Location = new System.Drawing.Point(62, 370);
-            this.buttonShowOnMap.Name = "buttonShowOnMap";
-            this.buttonShowOnMap.Size = new System.Drawing.Size(75, 23);
-            this.buttonShowOnMap.TabIndex = 5;
-            this.buttonShowOnMap.Text = "карта";
-            this.buttonShowOnMap.UseVisualStyleBackColor = true;
-            this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click);
-            // 
-            // buttonStorage
-            // 
-            this.buttonStorage.Location = new System.Drawing.Point(6, 399);
-            this.buttonStorage.Name = "buttonStorage";
-            this.buttonStorage.Size = new System.Drawing.Size(188, 23);
-            this.buttonStorage.TabIndex = 4;
-            this.buttonStorage.Text = "Хранилище";
-            this.buttonStorage.UseVisualStyleBackColor = true;
-            this.buttonStorage.Click += new System.EventHandler(this.buttonStorage_Click);
-            // 
-            // buttonRemoveAirplane
-            // 
-            this.buttonRemoveAirplane.Location = new System.Drawing.Point(12, 297);
-            this.buttonRemoveAirplane.Name = "buttonRemoveAirplane";
-            this.buttonRemoveAirplane.Size = new System.Drawing.Size(182, 23);
-            this.buttonRemoveAirplane.TabIndex = 3;
-            this.buttonRemoveAirplane.Text = "Удалить";
-            this.buttonRemoveAirplane.UseVisualStyleBackColor = true;
-            this.buttonRemoveAirplane.Click += new System.EventHandler(this.buttonRemoveAirplane_Click);
-            // 
-            // maskedTextBoxPosition
-            // 
-            this.maskedTextBoxPosition.Location = new System.Drawing.Point(12, 268);
-            this.maskedTextBoxPosition.Mask = "00";
-            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
-            this.maskedTextBoxPosition.Size = new System.Drawing.Size(182, 23);
-            this.maskedTextBoxPosition.TabIndex = 2;
-            // 
-            // buttonAddAirplane
-            // 
-            this.buttonAddAirplane.Location = new System.Drawing.Point(12, 239);
-            this.buttonAddAirplane.Name = "buttonAddAirplane";
-            this.buttonAddAirplane.Size = new System.Drawing.Size(182, 23);
-            this.buttonAddAirplane.TabIndex = 1;
-            this.buttonAddAirplane.Text = "Добавить Самолёт";
-            this.buttonAddAirplane.UseVisualStyleBackColor = true;
-            this.buttonAddAirplane.Click += new System.EventHandler(this.buttonAddAirplane_Click);
-            // 
-            // pictureBox
-            // 
-            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pictureBox.Location = new System.Drawing.Point(0, 0);
-            this.pictureBox.Name = "pictureBox";
-            this.pictureBox.Size = new System.Drawing.Size(631, 593);
-            this.pictureBox.TabIndex = 1;
-            this.pictureBox.TabStop = false;
-            // 
-            // FormMapWithSetAirplane
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(831, 593);
-            this.Controls.Add(this.pictureBox);
-            this.Controls.Add(this.groupBoxTools);
-            this.Name = "FormMapWithSetAirplane";
-            this.Text = "FormMapWithSetAirplane";
-            this.groupBoxTools.ResumeLayout(false);
-            this.groupBoxTools.PerformLayout();
-            this.groupBoxMaps.ResumeLayout(false);
-            this.groupBoxMaps.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private GroupBox groupBoxTools;
-        private Button buttonShowOnMap;
-        private Button buttonStorage;
-        private Button buttonRemoveAirplane;
-        private MaskedTextBox maskedTextBoxPosition;
-        private Button buttonAddAirplane;
-        private ComboBox comboBoxSelectorMap;
-        private PictureBox pictureBox;
-        private Button buttonUp;
-        private Button buttonLeft;
-        private Button buttonRight;
-        private Button buttonDown;
-        private GroupBox groupBoxMaps;
-        private ListBox listBoxMaps;
-        private Button buttonDelMap;
-        private Button buttonAddMap;
-        private TextBox textBoxNewMapName;
-    }
-}

Airbus/Airbus/FormMapWithSetAirplane.cs

@@ -1,204 +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;
-using static System.Windows.Forms.DataFormats;
-
-namespace Airbus
-{
-    public partial class FormMapWithSetAirplane : Form
-    {
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-        {
-         { "Простая карта", new SimpleMap() }, { "Вторая карта", new SecondMap() },{ "Третья карта", new ThirdMap() }
-        };
-        /// <summary>
-        /// Объект от коллекции карт
-        /// </summary>
-        private readonly MapsCollection _mapsCollection;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        public FormMapWithSetAirplane()
-        {
-            InitializeComponent();
-            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
-            comboBoxSelectorMap.Items.Clear();
-            foreach (var elem in _mapsDict)
-            {
-                comboBoxSelectorMap.Items.Add(elem.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 buttonAddMap_Click(object sender, EventArgs e)
-        {
-            if (comboBoxSelectorMap.SelectedIndex == -1 ||
-           string.IsNullOrEmpty(textBoxNewMapName.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка",
-               MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
-            {
-                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK,
-               MessageBoxIcon.Error);
-                return;
-            }
-            _mapsCollection.AddMap(textBoxNewMapName.Text,
-           _mapsDict[comboBoxSelectorMap.Text]);
-            ReloadMaps();
-        }
-        private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox.Image =
-           _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
-        private void buttonDelMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?",
-           "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ??
-               string.Empty);
-                ReloadMaps();
-            }
-        }
-
-        private void buttonAddAirplane_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            FormAirplane form = new();
-            if (form.ShowDialog() == DialogResult.OK)
-            {
-                DrawningObjectAirplane airplane = new(form.SelectedAirplane);
-                if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + airplane > -1)
-                {
-                    MessageBox.Show("Объект добавлен");
-                    pictureBox.Image =
-                   _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-                }
-                else
-                {
-                    MessageBox.Show("Не удалось добавить объект");
-                }
-            }
-        }
-        private void buttonRemoveAirplane_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
-            {
-                return;
-            }
-            if (MessageBox.Show("Удалить объект?", "Удаление",
-           MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
-            {
-                return;
-            }
-            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ??
-           string.Empty] - pos != null)
-            {
-                MessageBox.Show("Объект удален");
-                pictureBox.Image =
-               _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-            }
-            else
-            {
-                MessageBox.Show("Не удалось удалить объект");
-            }
-        }
-        private void buttonStorage_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-
-        }
-        /// <summary>
-        /// Выбор карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        
-        private void buttonShowOnMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
-
-
-        }
-        /// <summary>
-        /// Перемещение
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        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);
-
-        }
-    }
-}

Airbus/Airbus/FormMapWithSetAirplane.resx

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

Airbus/Airbus/IDrawningObject.cs

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

Airbus/Airbus/MapWithSetAirplaneGeneric.cs

@@ -1,185 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal class MapWithSetAirplaneGeneric<T, U>
-    where T : class, IDrawningObject
-    where U : AbstractMap
-    {
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Размер занимаемого объектом места (ширина)
-        /// </summary>
-        private readonly int _placeSizeWidth = 300;
-        /// <summary>
-        /// Размер занимаемого объектом места (высота)
-        /// </summary>
-        private readonly int _placeSizeHeight = 70;
-        /// <summary>
-        /// Набор объектов
-        /// </summary>
-        private readonly SetAirplaneGeneric<T> _setAirplane;
-        /// <summary>
-        /// Карта
-        /// </summary>
-        private readonly U _map;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="picWidth"></param>
-        /// <param name="picHeight"></param>
-        /// <param name="map"></param>
-        public MapWithSetAirplaneGeneric(int picWidth, int picHeight, U map)
-        {
-            int width = picWidth / _placeSizeWidth;
-            int height = picHeight / _placeSizeHeight;
-            _setAirplane = new SetAirplaneGeneric<T>(width * height);
-            _pictureWidth = picWidth;
-            _pictureHeight = picHeight;
-            _map = map;
-        }
-        /// <summary>
-        /// Перегрузка оператора сложения
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="car"></param>
-        /// <returns></returns>
-        public static int operator +(MapWithSetAirplaneGeneric<T, U> map, T airplane)
-        {
-            return map._setAirplane.Insert(airplane);
-        }
-        /// <summary>
-        /// Перегрузка оператора вычитания
-        /// </summary>
-        /// <param name="map"></param>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public static T operator -(MapWithSetAirplaneGeneric<T, U> map, int
-       position)
-        {
-            return map._setAirplane.Remove(position);
-        }
-        /// <summary>
-        /// Вывод всего набора объектов
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowSet()
-        {
-            Bitmap bmp = new(_pictureWidth, _pictureHeight);
-            Graphics gr = Graphics.FromImage(bmp);
-            DrawBackground(gr);
-            DrawAirplanes(gr);
-            return bmp;
-        }
-        /// <summary>
-        /// Просмотр объекта на карте
-        /// </summary>
-        /// <returns></returns>
-        public Bitmap ShowOnMap()
-        {
-            Shaking();
-            for (int i = 0; i < _setAirplane.Count; i++)
-            {
-                var airplane = _setAirplane[i];
-                if (airplane != null)
-                {
-                    return _map.CreateMap(_pictureWidth, _pictureHeight, airplane);
-                }
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// Перемещение объекта по крате
-        /// </summary>
-        /// <param name="direction"></param>
-        /// <returns></returns>
-        public Bitmap MoveObject(Direction direction)
-        {
-            if (_map != null)
-            {
-                return _map.MoveObject(direction);
-            }
-            return new(_pictureWidth, _pictureHeight);
-        }
-        /// <summary>
-        /// "Взбалтываем" набор, чтобы все элементы оказались в начале
-        /// </summary>
-        private void Shaking()
-        {
-            int j = _setAirplane.Count - 1;
-            for (int i = 0; i < _setAirplane.Count; i++)
-            {
-                if (_setAirplane[i] == null)
-                {
-                    for (; j > i; j--)
-                    {
-                        var airplane = _setAirplane[j];
-                        if (airplane != null)
-                        {
-                            _setAirplane.Insert(airplane, i);
-                            _setAirplane.Remove(j);
-                            break;
-                        }
-                    }
-                    if (j <= i)
-                    {
-                        return;
-                    }
-                }
-            }
-        }
-        /// <summary>
-        /// Метод отрисовки фона
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawBackground(Graphics g)
-        {
-            Pen pen = new(Color.Black, 3);
-            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
-            {
-                for (int j = 1; j < _pictureHeight / _placeSizeHeight + 1; ++j)
-                {
-                    pen = new(Color.Black, 3);
-                    g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 15, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2 +  20, j * _placeSizeHeight - 30);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 20, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 30, j * _placeSizeHeight - 30);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 30, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 35, j * _placeSizeHeight );
-
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 15, j * _placeSizeHeight - 45, i * _placeSizeWidth + _placeSizeWidth / 2 + 35, j * _placeSizeHeight - 45); 
-                    pen = new(Color.Blue, 1);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 30, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 45, j * _placeSizeHeight - 40);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 45, j * _placeSizeHeight - 40, i * _placeSizeWidth + _placeSizeWidth / 2 + 35, j * _placeSizeHeight - 45);
-
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 20, j * _placeSizeHeight - 30, i * _placeSizeWidth + _placeSizeWidth / 2 + 5, j * _placeSizeHeight - 40);
-                    g.DrawLine(pen, i * _placeSizeWidth + _placeSizeWidth / 2 + 5, j * _placeSizeHeight - 40, i * _placeSizeWidth + _placeSizeWidth / 2 + 15, j * _placeSizeHeight - 45);
-                }
-
-            }
-        }
-        /// <summary>
-        /// Метод прорисовки объектов
-        /// </summary>
-        /// <param name="g"></param>
-        private void DrawAirplanes(Graphics g)
-        {
-            int countInLine = _pictureWidth / _placeSizeWidth;
-            int maxLeft = (countInLine - 1) * _placeSizeWidth;
-            for (int i = 0; i < _setAirplane.Count; i++)
-            {
-                _setAirplane[i]?.SetObject(maxLeft - i % countInLine * _placeSizeWidth, (_pictureHeight - (i / 2 * _placeSizeHeight + _placeSizeHeight + 30)), _pictureWidth, _placeSizeHeight);
-                _setAirplane[i]?.DrawningObject(g);
-            }
-        }
-    }
-}

Airbus/Airbus/MapsCollection.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal class MapsCollection
-    {
-        readonly Dictionary<string, MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap>> _mapStorages;
-        /// <summary>
-        /// Возвращение списка названий карт
-        /// </summary>
-        public List<string> Keys => _mapStorages.Keys.ToList();
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private readonly int _pictureWidth;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private readonly int _pictureHeight;
-        /// <summary>
-        /// Конструктор
-        /// </summary>
-        /// <param name="pictureWidth"></param>
-        /// <param name="pictureHeight"></param>
-        public MapsCollection(int pictureWidth, int pictureHeight)
-        {
-            _mapStorages = new Dictionary<string, MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap>>();
-            _pictureWidth = pictureWidth;
-            _pictureHeight = pictureHeight;
-        }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        /// <param name="map">Карта</param>
-        public void AddMap(string name, AbstractMap map)
-        {
-            if (!_mapStorages.ContainsKey(name))
-            {
-                MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap> Map = new(_pictureWidth, _pictureHeight, map);
-                _mapStorages.Add(name, Map);
-            }
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="name">Название карты</param>
-        public void DelMap(string name)
-        {
-            if (_mapStorages.ContainsKey(name)) _mapStorages.Remove(name);
-        }
-        /// <summary>
-        /// Доступ к парковке
-        /// </summary>
-        /// <param name="ind"></param>
-        /// <returns></returns>
-        public MapWithSetAirplaneGeneric<DrawningObjectAirplane, AbstractMap> this[string ind]
-        {
-            get
-            {
-                if (_mapStorages.ContainsKey(ind))
-                return _mapStorages[ind];
-                return null;
-            }
-        }
-    }
-}

Airbus/Airbus/Program.cs

@@ -11,7 +11,7 @@ namespace Airbus
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormMapWithSetAirplane());
+            Application.Run(new FormAirplane());
         }
     }
 }

Airbus/Airbus/SecondMap.cs

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

Airbus/Airbus/SetAirplaneGeneric.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Airbus
-{
-    internal class SetAirplaneGeneric<T>
-        where T : class
-    {
-        private readonly List<T> _places;
-        public int Count => _places.Count;
-        private readonly int _maxCount;
-        public SetAirplaneGeneric(int count)
-        {
-            _maxCount = count;
-            _places = new List<T>();
-        }
-        public int Insert(T airplane)
-        {
-            return Insert(airplane, 0);
-        }
-
-        public int Insert(T airplane, int position)
-        {
-            if (position < 0 || position > _places.Count) return -1;
-            _places.Insert(position, airplane);
-            return position;
-        }
-        /// <summary>
-        /// Удаление объекта из набора с конкретной позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T Remove(int position)
-        {
-            if (0 > position && position >= Count)
-                return null;
-            T delobj = _places[position];
-            _places[position] = null;
-            return delobj;
-        }
-        /// <summary>
-        /// Получение объекта из набора по позиции
-        /// </summary>
-        /// <param name="position"></param>
-        /// <returns></returns>
-        public T this[int position]
-        {
-            get
-            {
-                if (position <= Count || position >= 0)
-                {
-                    return _places[position];
-                }
-                else return null;
-            }
-            set
-            {
-                Insert(value, position);
-            }
-        }
-        public IEnumerable<T> GetAirplanes()
-        {
-            foreach (var car in _places)
-            {
-                if (car != null)
-                {
-                    yield return car;
-                }
-                else
-                {
-                    yield break;
-                }
-            }
-        }
-
-    }
-}

Airbus/Airbus/SimpleMap.cs

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

Airbus/Airbus/ThirdMap.cs

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