Merge pull request 'Emelyanov A.S. LabWork03' (#7) from LabWork03 into LabWork02

Reviewed-on: http://student.git.athene.tech/Emelyanov535/Pibd-22_Emelyanov_A.S._Airbus._Base/pulls/7

Airbus/Airbus/AbstractMap.cs

@@ -0,0 +1,124 @@
+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 CheckBarriers(float topOffset, float rightOffset, float leftOffset, float bottomOffset)
+        {
+            int top = Convert.ToInt32((_drawningObject.GetCurrentPosition().Top + topOffset) / _size_y);
+            int right = Convert.ToInt32((_drawningObject.GetCurrentPosition().Right + rightOffset) / _size_x);
+            int left = Convert.ToInt32((_drawningObject.GetCurrentPosition().Left + leftOffset) / _size_x);
+            int bottom = Convert.ToInt32((_drawningObject.GetCurrentPosition().Bottom + bottomOffset) / _size_y);
+            if (top < 0 || left < 0 || right >= _map.GetLength(1) || bottom >= _map.GetLength(0)) return false;
+            for (int i = top; i <= bottom; i++)
+            {
+                for (int j = left; j <= right; j++)
+                {
+                    if (_map[j, i] == _barrier) return false;
+                }
+            }
+            return true;
+        }
+
+        public Bitmap MoveObject(Direction direction)
+        {
+            // TODO проверка, что объект может переместится в требуемом направлении
+            if (_drawningObject == null) return DrawMapWithObject();
+            bool isTrue = true;
+            switch (direction)
+            {
+                case Direction.Left:
+                    if (!CheckBarriers(0, -1 * _drawningObject.Step, -1 * _drawningObject.Step, 0)) isTrue = false;
+                    break;
+                case Direction.Right:
+                    if (!CheckBarriers(0, _drawningObject.Step, _drawningObject.Step, 0)) isTrue = false;
+                    break;
+                case Direction.Up:
+                    if (!CheckBarriers(-1 * _drawningObject.Step, 0, 0, -1 * _drawningObject.Step)) isTrue = false;
+                    break;
+                case Direction.Down:
+                    if (!CheckBarriers(_drawningObject.Step, 0, 0, _drawningObject.Step)) isTrue = false;
+                    break;
+            }
+            if (isTrue)
+            {
+                _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);
+            // TODO првоерка, что объект не "накладывается" на закрытые участки
+            if (!CheckBarriers(0, 0, 0, 0)) return false;
+
+            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,8 +6,9 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    internal enum Direction
+    public enum Direction
     {
+        None = 0,
         Up = 1,
         Down = 2,
         Left = 3,

Airbus/Airbus/DrawningAirbus.cs

@@ -6,172 +6,78 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    internal class DrawningAirbus
+    internal class DrawningAirbus : DrawningPlane
     {
-        /// <summary>
-        /// Класс-сущность
-        /// </summary>
-        public EntityAirbus Airbus { get; private set; }
-
-        /// <summary>
-        /// Левая координата отрисовки самолета
-        /// </summary>
-        private float _startPosX;
-        /// <summary>
-        /// Верхняя кооридната отрисовки самолета
-        /// </summary>
-        private float _startPosY;
-        /// <summary>
-        /// Ширина окна отрисовки
-        /// </summary>
-        private int? _pictureWidth = null;
-        /// <summary>
-        /// Высота окна отрисовки
-        /// </summary>
-        private int? _pictureHeight = null;
-        
-
-        /// <summary>
-        /// Ширина отрисовки самолета
-        /// </summary>
-        private readonly int _AirbusWidth = 130;
-        /// <summary>
-        /// Высота отрисовки самолета
-        /// </summary>
-        private readonly int _AirbusHeight = 70;
         /// <summary>
         /// Инициализация свойств
         /// </summary>
         /// <param name="speed">Скорость</param>
-        /// <param name="weight">Вес самолета</param>
+        /// <param name="weight">Вес автомобиля</param>
         /// <param name="bodyColor">Цвет кузова</param>
-        public void Init(EntityAirbus Airbus)
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public DrawningAirbus(int speed, float weight, Color bodyColor, Color
+       dopColor, bool bodyKit, bool wing, bool sportLine) :
+        base(speed, weight, bodyColor, 140, 70)
         {
-            this.Airbus = Airbus;
+            Plane = new EntityAirbus(speed, weight, bodyColor, dopColor, bodyKit, wing, sportLine);
         }
-        /// <summary>
+        public override void DrawTransport(Graphics g)
-        /// Установка позиции самолета
-        /// </summary>
-        /// <param name="x">Координата X</param>
-        /// <param name="y">Координата Y</param>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public void SetPosition(int x, int y, int width, int height)
         {
-            if (x >= 0 && x + _AirbusWidth <= width && y >= 0 && y + _AirbusHeight <= height)
+            if (Plane is not EntityAirbus Airbus)
-            {
-                _startPosX = x;
-                _startPosY = y;
-                _pictureWidth = width;
-                _pictureHeight = height;
-            }
-            
-        }
-        /// <summary>
-        /// Изменение направления пермещения
-        /// </summary>
-        /// <param name="direction">Направление</param>
-        public void MoveTransport(Direction direction)
-        {
-            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
-            {
-                return;
-            }
-            switch (direction)
-            {
-                // вправо
-                case Direction.Right:
-                    if (_startPosX + _AirbusWidth + Airbus.Step < _pictureWidth)
-                    {
-                        _startPosX += Airbus.Step;
-                    }
-                    break;
-                //влево
-                case Direction.Left:
-                    if (_startPosX - Airbus.Step > 0)
-                    {
-                        _startPosX -= Airbus.Step;
-                    }
-                    break;
-                //вверх
-                case Direction.Up:
-                    if (_startPosY - Airbus.Step > 0)
-                    {
-                        _startPosY -= Airbus.Step;
-                    }
-                    break;
-                //вниз
-                case Direction.Down:
-                    if (_startPosY + _AirbusHeight + Airbus.Step < _pictureHeight)
-                    {
-                        _startPosY += Airbus.Step;
-                    }
-                    break;
-            }
-        }
-        /// <summary>
-        /// Отрисовка самолета
-        /// </summary>
-        /// <param name="g"></param>
-        public void DrawTransport(Graphics g)
-        {
-            if (_startPosX < 0 || _startPosY < 0
-                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
             {
                 return;
             }
             Pen pen = new(Color.Black);
-            //границы самолета
+            Brush dopBrush = new SolidBrush(Airbus.DopColor);
-            g.DrawEllipse(pen, _startPosX, _startPosY + 30, 20, 20);
+            Brush fireBrush = new SolidBrush(Color.Red);
-            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 30, 100, 20);
+            Brush WindowBrush = new SolidBrush(Color.Blue);
 
-            g.DrawLine(pen, _startPosX + 110, _startPosY + 30, _startPosX + 130, _startPosY+40);
+            _startPosX += 10;
-            g.DrawLine(pen, _startPosX + 110, _startPosY+50, _startPosX + 130, _startPosY+40);
+            _startPosY += 5;
-
+            base.DrawTransport(g);
-
+            _startPosX -= 10;
-            g.DrawLine(pen, _startPosX, _startPosY, _startPosX, _startPosY+40);
+            _startPosY -= 5;
-            g.DrawLine(pen, _startPosX, _startPosY, _startPosX + 30, _startPosY+30);
+            if (Airbus.BodyKit)
-
-
-            g.DrawLine(pen, _startPosX + 40, _startPosY + 50, _startPosX + 40, _startPosY+55);
-            g.DrawLine(pen, _startPosX + 100, _startPosY + 50, _startPosX + 100, _startPosY+55);
-
-            g.DrawEllipse(pen, _startPosX + 95, _startPosY + 55, 10, 10);
-            g.DrawEllipse(pen, _startPosX + 29, _startPosY + 55, 10, 10);
-            g.DrawEllipse(pen, _startPosX + 41, _startPosY + 55, 10, 10);
-
-            Brush br = new SolidBrush(Airbus?.BodyColor ?? Color.Black);
-            g.FillEllipse(br, _startPosX, _startPosY + 31, 20, 19);
-            g.FillRectangle(br, _startPosX + 10, _startPosY + 31, 100, 19);
-
-            //илюминатор
-            Brush brBlack = new SolidBrush(Color.Black);
-            g.FillEllipse(brBlack, _startPosX + 40, _startPosY + 35, 60, 5);
-            g.FillEllipse(brBlack, _startPosX - 5, _startPosY + 25, 30, 10);
-        }
-        /// <summary>
-        /// Смена границ формы отрисовки
-        /// </summary>
-        /// <param name="width">Ширина картинки</param>
-        /// <param name="height">Высота картинки</param>
-        public void ChangeBorders(int width, int height)
             {
-            _pictureWidth = width;
+                //1 реактор
-            _pictureHeight = height;
+                g.DrawRectangle(pen, _startPosX + 70, _startPosY + 50, 22, 16);
-            if (_pictureWidth <= _AirbusWidth || _pictureHeight <= _AirbusHeight)
+                g.FillRectangle(dopBrush, _startPosX + 70, _startPosY + 50, 22, 16);
+
+                g.FillEllipse(dopBrush, _startPosX + 84, _startPosY + 50, 16, 16);
+
+                g.DrawEllipse(pen, _startPosX + 62, _startPosY + 50, 16, 16);
+                g.FillEllipse(fireBrush, _startPosX + 62, _startPosY + 50, 16, 16);
+
+                //2 реактор
+
+                g.DrawRectangle(pen, _startPosX + 8, _startPosY + 18, 22, 16);
+                g.FillRectangle(dopBrush, _startPosX + 8, _startPosY + 18, 22, 16);
+
+                g.FillEllipse(dopBrush, _startPosX + 24, _startPosY + 18, 16, 16);
+
+                g.DrawEllipse(pen, _startPosX, _startPosY + 18, 16, 16);
+                g.FillEllipse(fireBrush, _startPosX, _startPosY + 18, 16, 16);
+
+
+            }
+            if (Airbus.Wing)
             {
-                _pictureWidth = null;
+
-                _pictureHeight = null;
+                g.DrawLine(pen, _startPosX + 70, _startPosY + 20, _startPosX + 70, _startPosY + 35);
-                return;
+                g.DrawLine(pen, _startPosX + 70, _startPosY + 20, _startPosX + 90, _startPosY + 35);
             }
-            if (_startPosX + _AirbusWidth > _pictureWidth)
+            if (Airbus.SportLine)
             {
-                _startPosX = _pictureWidth.Value - _AirbusWidth;
+                g.DrawEllipse(pen, _startPosX + 110, _startPosY + 40, 9, 9);
-            }
+                g.FillEllipse(WindowBrush, _startPosX + 110, _startPosY + 40, 9, 9);
-            if (_startPosY + _AirbusHeight > _pictureHeight)
+
-            {
-                _startPosY = _pictureHeight.Value - _AirbusHeight;
-            }
             }
+
+
+        }
+
     }
 }

Airbus/Airbus/DrawningObjectPlane.cs

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

Airbus/Airbus/DrawningPlane.cs

@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    public class DrawningPlane
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityPlane Plane { get; protected set; }
+
+        /// <summary>
+        /// Левая координата отрисовки самолета
+        /// </summary>
+        protected float _startPosX;
+        /// <summary>
+        /// Верхняя кооридната отрисовки самолета
+        /// </summary>
+        protected float _startPosY;
+        /// <summary>
+        /// Ширина окна отрисовки
+        /// </summary>
+        private int? _pictureWidth = null;
+        /// <summary>
+        /// Высота окна отрисовки
+        /// </summary>
+        private int? _pictureHeight = null;
+        
+
+        /// <summary>
+        /// Ширина отрисовки самолета
+        /// </summary>
+        private readonly int _PlaneWidth = 130;
+        /// <summary>
+        /// Высота отрисовки самолета
+        /// </summary>
+        private readonly int _PlaneHeight = 70;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес самолета</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        public DrawningPlane(int speed, float weight, Color bodyColor)
+        {
+            Plane = new EntityPlane(speed, weight, bodyColor);
+            
+        }
+        /// <summary>
+        /// Установка позиции самолета
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void SetPosition(int x, int y, int width, int height)
+        {
+            if (x >= 0 && x + _PlaneWidth <= width && y >= 0 && y + _PlaneHeight <= height)
+            {
+                _startPosX = x;
+                _startPosY = y;
+                _pictureWidth = width;
+                _pictureHeight = height;
+            }
+            
+        }
+        /// <summary>
+        /// Изменение направления пермещения
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        public void MoveTransport(Direction direction)
+        {
+            if (!_pictureWidth.HasValue || !_pictureHeight.HasValue)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                // вправо
+                case Direction.Right:
+                    if (_startPosX + _PlaneWidth + Plane.Step < _pictureWidth)
+                    {
+                        _startPosX += Plane.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    if (_startPosX - Plane.Step > 0)
+                    {
+                        _startPosX -= Plane.Step;
+                    }
+                    break;
+                //вверх
+                case Direction.Up:
+                    if (_startPosY - Plane.Step > 0)
+                    {
+                        _startPosY -= Plane.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _PlaneHeight + Plane.Step < _pictureHeight)
+                    {
+                        _startPosY += Plane.Step;
+                    }
+                    break;
+            }
+        }
+        /// <summary>
+        /// Отрисовка самолета
+        /// </summary>
+        /// <param name="g"></param>
+        /// 
+        protected DrawningPlane(int speed, float weight, Color bodyColor, int planeWidth, int planeHeight) : this(speed, weight, bodyColor)
+        {
+            _PlaneWidth = planeWidth;
+            _PlaneHeight = planeHeight;
+        }
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (_startPosX < 0 || _startPosY < 0
+                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+            //границы самолета
+            g.DrawEllipse(pen, _startPosX, _startPosY + 30, 20, 20);
+            g.DrawRectangle(pen, _startPosX + 10, _startPosY + 30, 100, 20);
+
+            g.DrawLine(pen, _startPosX + 110, _startPosY + 30, _startPosX + 130, _startPosY+40);
+            g.DrawLine(pen, _startPosX + 110, _startPosY+50, _startPosX + 130, _startPosY+40);
+
+
+            g.DrawLine(pen, _startPosX, _startPosY, _startPosX, _startPosY+40);
+            g.DrawLine(pen, _startPosX, _startPosY, _startPosX + 30, _startPosY+30);
+
+
+            g.DrawLine(pen, _startPosX + 40, _startPosY + 50, _startPosX + 40, _startPosY+55);
+            g.DrawLine(pen, _startPosX + 100, _startPosY + 50, _startPosX + 100, _startPosY+55);
+
+            g.DrawEllipse(pen, _startPosX + 95, _startPosY + 55, 10, 10);
+            g.DrawEllipse(pen, _startPosX + 29, _startPosY + 55, 10, 10);
+            g.DrawEllipse(pen, _startPosX + 41, _startPosY + 55, 10, 10);
+
+            Brush br = new SolidBrush(Plane?.BodyColor ?? Color.Black);
+            g.FillEllipse(br, _startPosX, _startPosY + 31, 20, 19);
+            g.FillRectangle(br, _startPosX + 10, _startPosY + 31, 100, 19);
+
+            //илюминатор
+            Brush brBlack = new SolidBrush(Color.Black);
+            g.FillEllipse(brBlack, _startPosX + 40, _startPosY + 35, 60, 5);
+            g.FillEllipse(brBlack, _startPosX - 5, _startPosY + 25, 30, 10);
+        }
+        /// <summary>
+        /// Смена границ формы отрисовки
+        /// </summary>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_pictureWidth <= _PlaneWidth || _pictureHeight <= _PlaneHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+            if (_startPosX + _PlaneWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _PlaneWidth;
+            }
+            if (_startPosY + _PlaneHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _PlaneHeight;
+            }
+        }
+
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _PlaneWidth, _startPosY + _PlaneHeight);
+        }
+    }
+}

Airbus/Airbus/EntityAirbus.cs

@@ -6,39 +6,41 @@ using System.Threading.Tasks;
 
 namespace Airbus
 {
-    internal class EntityAirbus
+    internal class EntityAirbus : EntityPlane
     {
         /// <summary>
-        /// Скорость
+        /// Дополнительный цвет
         /// </summary>
-        public int Speed { get; private set; }
+        public Color DopColor { get; private set; }
         /// <summary>
-        /// Вес
+        /// Признак наличия обвеса
         /// </summary>
-        public float Weight { get; private set; }
+        public bool BodyKit { get; private set; }
         /// <summary>
-        /// Цвет кузова
+        /// Признак наличия антикрыла
         /// </summary>
-        public Color BodyColor { get; private set; }
+        public bool Wing { get; private set; }
         /// <summary>
-        /// Шаг перемещения автомобиля
+        /// Признак наличия гоночной полосы
         /// </summary>
-        public float Step => Speed * 100 / Weight;
+        public bool SportLine { get; private set; }
         /// <summary>
-        /// Инициализация полей объекта-класса автомобиля
+        /// Инициализация свойств
         /// </summary>
-        /// <param name="speed"></param>
+        /// <param name="speed">Скорость</param>
-        /// <param name="weight"></param>
+        /// <param name="weight">Вес автомобиля</param>
-        /// <param name="bodyColor"></param>
+        /// <param name="bodyColor">Цвет кузова</param>
-        /// <returns></returns>
+        /// <param name="dopColor">Дополнительный цвет</param>
-        public void Init(int speed, float weight, Color bodyColor)
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public EntityAirbus(int speed, float weight, Color bodyColor, Color dopColor, bool bodyKit, bool wing, bool sportLine) : base(speed, weight, bodyColor)
         {
-            Random rnd = new();
+            DopColor = dopColor;
-            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            BodyKit = bodyKit;
-            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            Wing = wing;
-            BodyColor = bodyColor;
+            SportLine = sportLine;
         }
 
-        
     }
 }

Airbus/Airbus/EntityPlane.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    public class EntityPlane
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public float Weight { get; private set; }
+        /// <summary>
+        /// Цвет кузова
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Шаг перемещения автомобиля
+        /// </summary>
+        public float Step => Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса автомобиля
+        /// </summary>
+        /// <param name="speed"></param>
+        /// <param name="weight"></param>
+        /// <param name="bodyColor"></param>
+        /// <returns></returns>
+        public EntityPlane(int speed, float weight, Color bodyColor)
+        {
+            Random rnd = new();
+            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            BodyColor = bodyColor;
+        }
+
+        
+    }
+}

Airbus/Airbus/FormAirbus.cs

@@ -1,89 +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 Airbus
-{
-    public partial class FormAirbus : Form
-    {
-        private DrawningAirbus _airbus;
-
-        public FormAirbus()
-        {
-            InitializeComponent();
-        }
-        /// <summary>
-		/// Метод прорисовки самолета
-		/// </summary>
-		private void Draw()
-        {
-            Bitmap bmp = new(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _airbus?.DrawTransport(gr);
-            pictureBoxAirbus.Image = bmp;
-        }
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random rnd = new();
-            _airbus = new DrawningAirbus();
-            EntityAirbus Airbus = new EntityAirbus();
-            Airbus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
-            _airbus.Init(Airbus);
-            _airbus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height);
-            toolStripStatusLabelSpeed.Text = $"Скорость: {_airbus.Airbus.Speed}";
-            toolStripStatusLabelWeight.Text = $"Вес: {_airbus.Airbus.Weight}";
-            toolStripStatusLabelBodyColor.Text = $"Цвет: {_airbus.Airbus.BodyColor.Name}";
-            Draw();
-        }
-        /// <summary>
-        /// Изменение размеров формы
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            //получаем имя кнопки
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            switch (name)
-            {
-                case "buttonUp":
-                    _airbus?.MoveTransport(Direction.Up);
-                    break;
-                case "buttonDown":
-                    _airbus?.MoveTransport(Direction.Down);
-                    break;
-                case "buttonLeft":
-                    _airbus?.MoveTransport(Direction.Left);
-                    break;
-                case "buttonRight":
-                    _airbus?.MoveTransport(Direction.Right);
-                    break;
-            }
-            Draw();
-        }
-        /// <summary>
-        /// Изменение размеров формы
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void PictureBoxAirbus_Resize(object sender, EventArgs e)
-        {
-            _airbus?.ChangeBorders(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
-            Draw();
-        }
-
-        
-    }
-
-}

Airbus/Airbus/FormMapWithSetPlanes.Designer.cs

@@ -0,0 +1,226 @@
+namespace Airbus
+{
+    partial class FormMapWithSetPlanes
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            this.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemovePlane = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddPlane = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.buttonLeft);
+            this.groupBox1.Controls.Add(this.buttonRight);
+            this.groupBox1.Controls.Add(this.buttonDown);
+            this.groupBox1.Controls.Add(this.buttonUp);
+            this.groupBox1.Controls.Add(this.buttonShowOnMap);
+            this.groupBox1.Controls.Add(this.buttonShowStorage);
+            this.groupBox1.Controls.Add(this.buttonRemovePlane);
+            this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBox1.Controls.Add(this.buttonAddPlane);
+            this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Location = new System.Drawing.Point(685, 0);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.groupBox1.Size = new System.Drawing.Size(229, 600);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Инструменты";
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.BackgroundImage = global::Airbus.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(64, 541);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(34, 40);
+            this.buttonLeft.TabIndex = 9;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.BackgroundImage = global::Airbus.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(146, 541);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(34, 40);
+            this.buttonRight.TabIndex = 8;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.BackgroundImage = global::Airbus.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(105, 541);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(34, 40);
+            this.buttonDown.TabIndex = 7;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.BackgroundImage = global::Airbus.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(105, 493);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(34, 40);
+            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(19, 411);
+            this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(195, 41);
+            this.buttonShowOnMap.TabIndex = 5;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.buttonShowOnMap_Click_1);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(19, 345);
+            this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(195, 45);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.buttonShowStorage_Click_1);
+            // 
+            // buttonRemovePlane
+            // 
+            this.buttonRemovePlane.Location = new System.Drawing.Point(19, 225);
+            this.buttonRemovePlane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonRemovePlane.Name = "buttonRemovePlane";
+            this.buttonRemovePlane.Size = new System.Drawing.Size(195, 41);
+            this.buttonRemovePlane.TabIndex = 3;
+            this.buttonRemovePlane.Text = "Удалить самолёт";
+            this.buttonRemovePlane.UseVisualStyleBackColor = true;
+            this.buttonRemovePlane.Click += new System.EventHandler(this.buttonRemovePlane_Click_1);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(19, 168);
+            this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(195, 27);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddPlane
+            // 
+            this.buttonAddPlane.Location = new System.Drawing.Point(19, 85);
+            this.buttonAddPlane.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.buttonAddPlane.Name = "buttonAddPlane";
+            this.buttonAddPlane.Size = new System.Drawing.Size(195, 41);
+            this.buttonAddPlane.TabIndex = 1;
+            this.buttonAddPlane.Text = "Добавить самолёт";
+            this.buttonAddPlane.UseVisualStyleBackColor = true;
+            this.buttonAddPlane.Click += new System.EventHandler(this.buttonAddPlane_Click_1);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Вторая карта"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(19, 29);
+            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(195, 28);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.comboBoxSelectorMap_SelectedIndexChanged_1);
+            // 
+            // pictureBox
+            // 
+            this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBox.Location = new System.Drawing.Point(0, 0);
+            this.pictureBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(685, 600);
+            this.pictureBox.TabIndex = 0;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetPlanes
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(914, 600);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBox1);
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Name = "FormMapWithSetPlanes";
+            this.Text = "FormMapWithSetPlanes";
+            this.Click += new System.EventHandler(this.ButtonMove_Click);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private GroupBox groupBox1;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonShowOnMap;
+        private Button buttonShowStorage;
+        private Button buttonRemovePlane;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddPlane;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+    }
+}

Airbus/Airbus/FormMapWithSetPlanes.cs

@@ -0,0 +1,167 @@
+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 FormMapWithSetPlanes : Form
+    {
+        /// <summary>
+        /// Объект от класса карты с набором объектов
+        /// </summary>
+        private MapWithSetPlanesGeneric<DrawningObjectPlane, AbstractMap> _mapPlanesCollectionGeneric;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        public FormMapWithSetPlanes()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// Выбор карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void comboBoxSelectorMap_SelectedIndexChanged_1(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Вторая карта":
+                    map = new MyMap();
+                    break;
+
+            }
+            if (map != null)
+            {
+                _mapPlanesCollectionGeneric = new
+                MapWithSetPlanesGeneric<DrawningObjectPlane, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapPlanesCollectionGeneric = null;
+            }
+        }
+        /// <summary>
+        /// Добавление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAddPlane_Click_1(object sender, EventArgs e)
+        {
+            if (_mapPlanesCollectionGeneric == null)
+            {
+                return;
+            }
+            FormPlane form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectPlane plane = new(form.SelectedPlane);
+                if (_mapPlanesCollectionGeneric + plane != -1)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapPlanesCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonRemovePlane_Click_1(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);
+            if (_mapPlanesCollectionGeneric - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapPlanesCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Вывод набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonShowStorage_Click_1(object sender, EventArgs e)
+        {
+            if (_mapPlanesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapPlanesCollectionGeneric.ShowSet();
+        }
+        /// <summary>
+        /// Вывод карты
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonShowOnMap_Click_1(object sender, EventArgs e)
+        {
+            if (_mapPlanesCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapPlanesCollectionGeneric.ShowOnMap();
+        }
+        /// <summary>
+        /// Перемещение
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapPlanesCollectionGeneric == null)
+            {
+                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 = _mapPlanesCollectionGeneric.MoveObject(dir);
+        }
+
+        
+    }
+}

Airbus/Airbus/FormMapWithSetPlanes.resx

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

Airbus/Airbus/FormPlane.Designer.cs

@@ -1,6 +1,6 @@
 namespace Airbus
 {
-    partial class FormAirbus
+    partial class FormPlane
     {
         /// <summary>
         /// Required designer variable.
@@ -38,6 +38,8 @@
             this.buttonLeft = new System.Windows.Forms.Button();
             this.buttonUp = new System.Windows.Forms.Button();
             this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectPlane = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirbus)).BeginInit();
             this.statusStrip1.SuspendLayout();
             this.SuspendLayout();
@@ -149,11 +151,33 @@
             this.buttonDown.UseVisualStyleBackColor = true;
             this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
             // 
-            // FormAirbus
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Location = new System.Drawing.Point(98, 285);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(99, 23);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+            // 
+            // buttonSelectPlane
+            // 
+            this.buttonSelectPlane.Location = new System.Drawing.Point(514, 285);
+            this.buttonSelectPlane.Name = "buttonSelectPlane";
+            this.buttonSelectPlane.Size = new System.Drawing.Size(75, 23);
+            this.buttonSelectPlane.TabIndex = 8;
+            this.buttonSelectPlane.Text = "Выбрать";
+            this.buttonSelectPlane.UseVisualStyleBackColor = true;
+            this.buttonSelectPlane.Click += new System.EventHandler(this.buttonSelectPlane_Click);
+            // 
+            // FormPlane
             // 
             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.buttonSelectPlane);
+            this.Controls.Add(this.buttonCreateModif);
             this.Controls.Add(this.buttonDown);
             this.Controls.Add(this.buttonUp);
             this.Controls.Add(this.buttonLeft);
@@ -162,7 +186,7 @@
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.pictureBoxAirbus);
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormAirbus";
+            this.Name = "FormPlane";
             this.Text = "Самолет";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAirbus)).EndInit();
             this.statusStrip1.ResumeLayout(false);
@@ -184,5 +208,7 @@
         private Button buttonLeft;
         private Button buttonUp;
         private Button buttonDown;
+        private Button buttonCreateModif;
+        private Button buttonSelectPlane;
     }
 }

Airbus/Airbus/FormPlane.cs

@@ -0,0 +1,125 @@
+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 Airbus
+{
+    public partial class FormPlane : Form
+    {
+        private DrawningPlane _plane;
+
+        public DrawningPlane SelectedPlane { get; private set; }
+
+        public FormPlane()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+		/// Метод прорисовки самолета
+		/// </summary>
+		private void Draw()
+        {
+            Bitmap bmp = new(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _plane?.DrawTransport(gr);
+            pictureBoxAirbus.Image = bmp;
+        }
+
+        private void SetData()
+        {
+            Random rnd = new();
+            _plane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirbus.Width, pictureBoxAirbus.Height);
+            toolStripStatusLabelSpeed.Text = $"Скорость: {_plane.Plane.Speed}";
+            toolStripStatusLabelWeight.Text = $"Вес: {_plane.Plane.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Цвет: {_plane.Plane.BodyColor.Name}";
+        }
+        /// <summary>
+        /// Обработка нажатия кнопки "Создать"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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;
+            }
+            _plane = new DrawningPlane(rnd.Next(100, 300), rnd.Next(1000, 2000),color);
+            SetData();
+            Draw();
+        }
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            //получаем имя кнопки
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _plane?.MoveTransport(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _plane?.MoveTransport(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _plane?.MoveTransport(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _plane?.MoveTransport(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        /// <summary>
+        /// Изменение размеров формы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void PictureBoxAirbus_Resize(object sender, EventArgs e)
+        {
+            _plane?.ChangeBorders(pictureBoxAirbus.Width, pictureBoxAirbus.Height);
+            Draw();
+        }
+
+        private void buttonCreateModif_Click(object sender, EventArgs e)
+        {
+            Random rnd = new();
+            Color color = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialog = new();
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                color = dialog.Color;
+            }
+            Color dopColor = Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256));
+            ColorDialog dialogDop = new();
+            if (dialogDop.ShowDialog() == DialogResult.OK)
+            {
+                dopColor = dialogDop.Color;
+            }
+            _plane = new DrawningAirbus(rnd.Next(100, 300), rnd.Next(1000, 2000), color, dopColor, Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
+            SetData();
+            Draw();
+        }
+
+        private void buttonSelectPlane_Click(object sender, EventArgs e)
+        {
+            SelectedPlane = _plane;
+            DialogResult = DialogResult.OK;
+        }
+    }
+
+}

Airbus/Airbus/IDrawningObject.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal interface IDrawningObject
+    {
+        /// <summary>
+        /// Шаг перемещения объекта
+        /// </summary>
+        public float Step { get; }
+        /// <summary>
+        /// Установка позиции объекта
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина полотна</param>
+        /// <param name="height">Высота полотна</param>
+        void SetObject(int x, int y, int width, int height);
+        /// <summary>
+        /// Изменение направления пермещения объекта
+        /// </summary>
+        /// <param name="direction">Направление</param>
+        void MoveObject(Direction direction);
+        /// <summary>
+        /// Отрисовка объекта
+        /// </summary>
+        /// <param name="g"></param>
+        void DrawningObject(Graphics g);
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        (float Left, float Top, float Right, float Bottom)
+        GetCurrentPosition();
+    }
+}

Airbus/Airbus/MapWithSetPlanesGeneric.cs

@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class MapWithSetPlanesGeneric<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 = 210;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetPlanesGeneric<T> _setPlanes;
+        /// <summary>
+        /// Карта
+        /// </summary>
+        private readonly U _map;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        /// <param name="map"></param>
+        public MapWithSetPlanesGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setPlanes = new SetPlanesGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="planes"></param>
+        /// <returns></returns>
+        public static int operator +(MapWithSetPlanesGeneric<T, U> map, T planes)
+        {
+            return map._setPlanes.Insert(planes);
+        }
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public static T operator -(MapWithSetPlanesGeneric<T, U> map, int position)
+        {
+            return map._setPlanes.Remove(position);
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawPlanes(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Просмотр объекта на карте
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setPlanes.Count; i++)
+            {
+                var plane = _setPlanes.Get(i);
+                if (plane != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, plane);
+                }
+            }
+            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 = _setPlanes.Count - 1;
+            for (int i = 0; i < _setPlanes.Count; i++)
+            {
+                if (_setPlanes.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var plane = _setPlanes.Get(j);
+                        if (plane != null)
+                        {
+                            _setPlanes.Insert(plane, i);
+                            _setPlanes.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Brush road = new SolidBrush(Color.Gray);
+            g.FillRectangle(road, 0, 0, _pictureWidth, _pictureHeight);
+            Brush lines = new SolidBrush(Color.White);
+            for (int y = 0; y < _pictureHeight; y+=80)
+            {
+                g.FillRectangle(lines, _pictureWidth / 2 - 10, y, 20, 70);
+            }
+            int lastLine = 0;
+            for (int y = 50; y < _pictureHeight; y += _pictureHeight/3 - 50)
+            {
+                g.FillRectangle(lines, _pictureWidth / 3 - 10, y, 20, 70);
+                g.FillRectangle(lines, _pictureWidth - _pictureWidth / 3 - 10, y, 20, 70);
+                lastLine = y;
+            }
+            g.FillRectangle(lines, _pictureWidth / 3 - 40, lastLine, 20, 70);
+            g.FillRectangle(lines, _pictureWidth - _pictureWidth / 3 + 20, lastLine, 20, 70);
+
+            Pen pen = new(Color.Black, 3);
+            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, 0, i * _placeSizeWidth,
+               (_pictureHeight / _placeSizeHeight) * _placeSizeHeight);
+            }
+            
+
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawPlanes(Graphics g)
+        {
+            int width = _pictureWidth / _placeSizeWidth;
+            int height = _pictureHeight / _placeSizeHeight;
+
+            for (int i = 0; i < _setPlanes.Count; i++)
+            {
+                // TODO установка позиции
+                if(_setPlanes.Get(i) != null)
+                {
+                    _setPlanes.Get(i).SetObject((width - i % width - 1) * _placeSizeWidth,(height - i / width - 1) * _placeSizeHeight, _pictureWidth, _pictureHeight);
+                    _setPlanes.Get(i)?.DrawningObject(g);
+                }
+            }
+        }
+    }
+
+}

Airbus/Airbus/MyMap.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class MyMap : AbstractMap
+    {
+
+        private readonly Brush barrierColor = new SolidBrush(Color.White);
+        private readonly Brush roadColor = new SolidBrush(Color.SkyBlue);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _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 < 25)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

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 FormAirbus());
+            Application.Run(new FormMapWithSetPlanes());
         }
     }
 }

Airbus/Airbus/SetPlanesGeneric.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class SetPlanesGeneric<T>
+        where T : class
+    {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private readonly T[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetPlanesGeneric(int count)
+        {
+            _places = new T[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="car">Добавляемый самолёт</param>
+        /// <returns></returns>
+        public int Insert(T plane)
+        {
+            // TODO вставка в начало набора
+            return Insert(plane, 0); 
+        }
+
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="plane">Добавляемый самолёт</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public int Insert(T plane, int position)
+        {
+            // TODO проверка позиции
+            // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+            // проверка, что после вставляемого элемента в массиве есть пустой элемент
+            // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
+            // TODO вставка по позиции
+
+            if(_places[position] == null)
+            {
+                _places[position] = plane;
+                return position;
+            }
+            else
+            {
+                int pos = -1;
+                bool isFree = false;
+                for (int i = 0; i < Count; i++)
+                {
+                    if (_places[i] == null)
+                    {
+                        isFree = true;
+                        pos = i;
+                        break;
+                    }
+                }
+                if (isFree)
+                {
+                    for (var i = pos; i > position; --i) _places[i] = _places[i - 1];
+                    _places[position] = plane;
+                    return position;
+                }
+                else
+                {
+                    return -1;
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из массива, присовив элементу массива значение null
+            if (position < 0 || position >= Count || _places[position] == null) return null;
+            T DeletePlane = _places[position];
+            _places[position] = null;
+            return DeletePlane;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T Get(int position)
+        {
+            // TODO проверка позиции
+            if (position < 0 || position >= Count)
+            {
+                return null;
+            }
+            return _places[position];
+        }
+    }
+
+}

Airbus/Airbus/SimpleMap.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Airbus
+{
+    internal class SimpleMap : AbstractMap
+    {
+        /// <summary>
+        /// Цвет участка закрытого
+        /// </summary>
+        private readonly Brush barrierColor = new SolidBrush(Color.Black);
+        /// <summary>
+        /// Цвет участка открытого
+        /// </summary>
+        private readonly Brush roadColor = new SolidBrush(Color.Gray);
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(barrierColor, i * _size_x, j * _size_y, _size_x, _size_y);
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _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++;
+                }
+            }
+        }
+
+    }
+}