changes forms

This reverts commit c2f55b2ccb.

GasolineTanker/GasolineTanker/AbstractMap.cs

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

GasolineTanker/GasolineTanker/Direction.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    public enum Direction
+    {
+        None = 0,
+        Up = 1,
+        Down = 2,
+        Left = 3,
+        Right = 4
+    }
+}

GasolineTanker/GasolineTanker/DrawningGasolineTanker.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    internal class DrawningGasolineTanker : DrawningTanker
+    {
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="Cabin">Признак наличия обвеса</param>
+        /// <param name="Signal">Признак наличия антикрыла</param>
+        /// <param name="BenzoBack">Признак наличия гоночной полосы</param>
+        public DrawningGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool Cabin, bool Signal, bool BenzoBack) :
+            base(speed, weight, bodyColor, 160, 125)
+        {
+            Tanker = new EntityGasolineTanker(speed, weight, bodyColor, dopColor, Cabin, Signal, BenzoBack);
+        }
+        public override void DrawTransport(Graphics g)
+        {
+            if (Tanker is not EntityGasolineTanker GasolineTanker)
+            {
+                return;
+            }
+
+            _startPosX += 10;
+            _startPosY += 5;
+            base.DrawTransport(g);
+            _startPosX -= 10;
+            _startPosY -= 5;
+
+            Pen pen = new(Color.Black);
+            Brush dopBrush = new SolidBrush(GasolineTanker.DopColor);
+            Brush WindowBrush = new SolidBrush(Color.LightBlue);
+
+            if (GasolineTanker.Cabin)
+            {
+                g.DrawRectangle(pen, _startPosX + 115, _startPosY + 29, 40, 25);
+                g.FillEllipse(dopBrush, _startPosX + 143, _startPosY + 35, 10, 10);
+                g.FillRectangle(WindowBrush, _startPosX + 116, _startPosY + 10, 39, 18);
+            }
+
+            //Бензобак
+            if (GasolineTanker.BenzoBack)
+            {
+                g.FillEllipse(dopBrush, _startPosX+10, _startPosY+5, 100, 50);
+            }
+            //Сигналка 
+            if (GasolineTanker.Signal)
+            {
+                g.FillRectangle(dopBrush, _startPosX + 122, _startPosY - 1, 25, 6);
+                g.FillEllipse(dopBrush, _startPosX + 124, _startPosY - 16, 20, 20);
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/DrawningObjectTanker.cs

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

GasolineTanker/GasolineTanker/DrawningTanker.cs

@@ -0,0 +1,188 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    /// <summary>
+    /// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+    /// </summary>
+    public class DrawningTanker
+    {
+        /// <summary>
+        /// Класс-сущность
+        /// </summary>
+        public EntityTanker Tanker { 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 _TankerWidth = 150;
+        /// <summary>
+        /// Высота отрисовки Танкера
+        /// </summary>
+        private readonly int _TankerHeight = 120;
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес танкера</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        public DrawningTanker(int speed, float weight, Color bodyColor)
+        {
+            Tanker = new EntityTanker(speed, weight, bodyColor);
+        }
+        /// <summary>
+        /// Установка позиции танкера
+        /// </summary>
+        /// <param name="x">Координата X</param>
+        /// <param name="y">Координата Y</param>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+
+        protected DrawningTanker(int speed, float weight, Color bodyColor, int carWidth, int carHeight) :
+            this(speed, weight, bodyColor)
+        {
+            _TankerWidth = carWidth;
+            _TankerHeight = carHeight;
+        }
+        /// <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 + _TankerWidth <= width && y + _TankerHeight <= height && x >= 0 && y >= 0)
+            {
+                _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 + _TankerWidth + Tanker.Step < _pictureWidth)
+                    {
+                        _startPosX += Tanker.Step;
+                    }
+                    break;
+                //влево
+                case Direction.Left:
+                    if (_startPosX - Tanker.Step > 0)
+                    {
+                        _startPosX -= Tanker.Step;
+                    }
+                    break;
+
+                //вверх
+                case Direction.Up:
+                    if (_startPosY - Tanker.Step > 0)
+                    {
+                        _startPosY -= Tanker.Step;
+                    }
+                    break;
+                //вниз
+                case Direction.Down:
+                    if (_startPosY + _TankerHeight + Tanker.Step < _pictureHeight)
+                    {
+                        _startPosY += Tanker.Step;
+                    }
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Отрисовка танкера
+        /// </summary>
+        /// <param name="g"></param>
+        public virtual void DrawTransport(Graphics g)
+        {
+            if (_startPosX < 0 || _startPosY < 0
+                || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black);
+
+            //кузов
+            Brush br = new SolidBrush(Tanker?.BodyColor ?? Color.Gray);
+            g.FillRectangle(br, _startPosX + 100, _startPosY, 50, 60);
+            g.FillRectangle(br, _startPosX, _startPosY+50, 100, 10);
+
+            //Колёса
+            Brush brBlack = new SolidBrush(Color.Black);
+            g.FillEllipse(brBlack, _startPosX, _startPosY + 58, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 40, _startPosY + 58, 40, 40);
+            g.FillEllipse(brBlack, _startPosX + 110, _startPosY + 58, 40, 40);
+
+        }
+        /// <summary>
+        /// Смена границ формы отрисовки
+        /// </summary>
+        /// <param name="width">Ширина картинки</param>
+        /// <param name="height">Высота картинки</param>
+        public void ChangeBorders(int width, int height)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            if (_pictureWidth <= _TankerWidth || _pictureHeight <= _TankerHeight)
+            {
+                _pictureWidth = null;
+                _pictureHeight = null;
+                return;
+            }
+
+           
+            if (_startPosX + _TankerWidth > _pictureWidth)
+            {
+                _startPosX = _pictureWidth.Value - _TankerWidth;
+            }
+
+            if (_startPosY + _TankerHeight > _pictureHeight)
+            {
+                _startPosY = _pictureHeight.Value - _TankerHeight;
+            }
+        }
+        /// <summary>
+        /// Получение текущей позиции объекта
+        /// </summary>
+        /// <returns></returns>
+        public (float Left, float Right, float Top, float Bottom) GetCurrentPosition()
+        {
+            return (_startPosX, _startPosY, _startPosX + _TankerWidth, _startPosY + _TankerHeight);
+        }
+    }
+}

GasolineTanker/GasolineTanker/EntityGasolineTanker.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    internal class EntityGasolineTanker : EntityTanker
+    {
+        /// <summary>
+        /// Дополнительный цвет
+        /// </summary>
+        public Color DopColor { get; private set; }
+        /// <summary>
+        /// Признак наличия обвеса
+        /// </summary>
+        public bool Cabin { get; private set; }
+        /// <summary>
+        /// Признак наличия антикрыла
+        /// </summary>
+        public bool Signal { get; private set; }
+        /// <summary>
+        /// Признак наличия гоночной полосы
+        /// </summary>
+        public bool BenzoBack { get; private set; }
+        /// <summary>
+        /// Инициализация свойств
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Цвет кузова</param>
+        /// <param name="dopColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="Signal">Признак наличия антикрыла</param>
+        /// <param name="benzoBack">Признак наличия гоночной полосы</param>
+        public EntityGasolineTanker(int speed, float weight, Color bodyColor, Color dopColor, bool сabin, bool signal, bool benzoBack) :
+                   base(speed, weight, bodyColor)
+        {
+            DopColor = dopColor;
+            Cabin = сabin;
+            Signal = signal;
+            BenzoBack = benzoBack;
+        }
+    }
+}

GasolineTanker/GasolineTanker/EntityTanker.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    public class EntityTanker
+    {
+        /// <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 * 50 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса танкера
+        /// </summary>
+        /// <param name="speed"></param>
+        /// <param name="weight"></param>
+        /// <param name="bodyColor"></param>
+        /// <returns></returns>
+        public EntityTanker(int speed, float weight, Color bodyColor)
+        {
+            Random rnd = new Random();
+            Speed = speed <= 0 ? rnd.Next(50, 150) : speed;
+            Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
+            BodyColor = bodyColor;
+        }
+    }
+}

GasolineTanker/GasolineTanker/Form1.Designer.cs

@@ -1,39 +0,0 @@
-namespace GasolineTanker
-{
-    partial class Form1
-    {
-        /// <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.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "Form1";
-        }
-
-        #endregion
-    }
-}

GasolineTanker/GasolineTanker/Form1.cs

@@ -1,10 +0,0 @@
-namespace GasolineTanker
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

GasolineTanker/GasolineTanker/FormLawn.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    internal class FormLawn : AbstractMap
+    {
+        private readonly Brush tankColor = new SolidBrush(Color.Yellow);
+        private readonly Pen logoPen = new Pen(Color.DarkGreen, 5);
+        private readonly Brush roadColor = new SolidBrush(Color.Green);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+            g.FillEllipse(tankColor, i * _size_x, j * _size_y, _size_x, _size_y);
+            g.DrawEllipse(logoPen, 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[39, 26];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 20)
+            {
+                int x = _random.Next(0, 39);
+                int y = _random.Next(0, 26);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}
+
+

GasolineTanker/GasolineTanker/FormMapWithSetTankers.Designer.cs

@@ -0,0 +1,228 @@
+namespace GasolineTanker
+{
+    partial class FormMapWithSetTankers
+    {
+        /// <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.groupBoxTool = new System.Windows.Forms.GroupBox();
+            this.buttonShowOnMap = new System.Windows.Forms.Button();
+            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.buttonShowStorage = new System.Windows.Forms.Button();
+            this.buttonRemoveTanker = new System.Windows.Forms.Button();
+            this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
+            this.buttonAddTanker = new System.Windows.Forms.Button();
+            this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
+            this.pictureBox = new System.Windows.Forms.PictureBox();
+            this.groupBoxTool.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // groupBoxTool
+            // 
+            this.groupBoxTool.Controls.Add(this.buttonShowOnMap);
+            this.groupBoxTool.Controls.Add(this.buttonLeft);
+            this.groupBoxTool.Controls.Add(this.buttonRight);
+            this.groupBoxTool.Controls.Add(this.buttonDown);
+            this.groupBoxTool.Controls.Add(this.buttonUp);
+            this.groupBoxTool.Controls.Add(this.buttonShowStorage);
+            this.groupBoxTool.Controls.Add(this.buttonRemoveTanker);
+            this.groupBoxTool.Controls.Add(this.maskedTextBoxPosition);
+            this.groupBoxTool.Controls.Add(this.buttonAddTanker);
+            this.groupBoxTool.Controls.Add(this.comboBoxSelectorMap);
+            this.groupBoxTool.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBoxTool.Location = new System.Drawing.Point(842, 0);
+            this.groupBoxTool.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxTool.Name = "groupBoxTool";
+            this.groupBoxTool.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxTool.Size = new System.Drawing.Size(192, 565);
+            this.groupBoxTool.TabIndex = 0;
+            this.groupBoxTool.TabStop = false;
+            this.groupBoxTool.Text = "Инструменты";
+            // 
+            // buttonShowOnMap
+            // 
+            this.buttonShowOnMap.Location = new System.Drawing.Point(9, 382);
+            this.buttonShowOnMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonShowOnMap.Name = "buttonShowOnMap";
+            this.buttonShowOnMap.Size = new System.Drawing.Size(175, 22);
+            this.buttonShowOnMap.TabIndex = 9;
+            this.buttonShowOnMap.Text = "Посмотреть карту";
+            this.buttonShowOnMap.UseVisualStyleBackColor = true;
+            this.buttonShowOnMap.Click += new System.EventHandler(this.ButtonShowOnMap_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(44, 525);
+            this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(35, 30);
+            this.buttonLeft.TabIndex = 8;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.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::GasolineTanker.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(122, 525);
+            this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(35, 30);
+            this.buttonRight.TabIndex = 7;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(83, 525);
+            this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(35, 30);
+            this.buttonDown.TabIndex = 6;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.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::GasolineTanker.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(83, 491);
+            this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(35, 30);
+            this.buttonUp.TabIndex = 5;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonShowStorage
+            // 
+            this.buttonShowStorage.Location = new System.Drawing.Point(9, 298);
+            this.buttonShowStorage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonShowStorage.Name = "buttonShowStorage";
+            this.buttonShowStorage.Size = new System.Drawing.Size(175, 22);
+            this.buttonShowStorage.TabIndex = 4;
+            this.buttonShowStorage.Text = "Посмотреть хранилище";
+            this.buttonShowStorage.UseVisualStyleBackColor = true;
+            this.buttonShowStorage.Click += new System.EventHandler(this.ButtonShowStorage_Click);
+            // 
+            // buttonRemoveTanker
+            // 
+            this.buttonRemoveTanker.Location = new System.Drawing.Point(9, 262);
+            this.buttonRemoveTanker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonRemoveTanker.Name = "buttonRemoveTanker";
+            this.buttonRemoveTanker.Size = new System.Drawing.Size(175, 22);
+            this.buttonRemoveTanker.TabIndex = 3;
+            this.buttonRemoveTanker.Text = "Удалить грузовик";
+            this.buttonRemoveTanker.UseVisualStyleBackColor = true;
+            this.buttonRemoveTanker.Click += new System.EventHandler(this.ButtonRemoveTanker_Click);
+            // 
+            // maskedTextBoxPosition
+            // 
+            this.maskedTextBoxPosition.Location = new System.Drawing.Point(9, 238);
+            this.maskedTextBoxPosition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.maskedTextBoxPosition.Mask = "00";
+            this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            this.maskedTextBoxPosition.Size = new System.Drawing.Size(176, 23);
+            this.maskedTextBoxPosition.TabIndex = 2;
+            // 
+            // buttonAddTanker
+            // 
+            this.buttonAddTanker.Location = new System.Drawing.Point(9, 211);
+            this.buttonAddTanker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonAddTanker.Name = "buttonAddTanker";
+            this.buttonAddTanker.Size = new System.Drawing.Size(175, 22);
+            this.buttonAddTanker.TabIndex = 1;
+            this.buttonAddTanker.Text = "Добавить грузовик";
+            this.buttonAddTanker.UseVisualStyleBackColor = true;
+            this.buttonAddTanker.Click += new System.EventHandler(this.ButtonAddTanker_Click);
+            // 
+            // comboBoxSelectorMap
+            // 
+            this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSelectorMap.FormattingEnabled = true;
+            this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Минное поле",
+            "Лужайка"});
+            this.comboBoxSelectorMap.Location = new System.Drawing.Point(9, 26);
+            this.comboBoxSelectorMap.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+            this.comboBoxSelectorMap.Size = new System.Drawing.Size(176, 23);
+            this.comboBoxSelectorMap.TabIndex = 0;
+            this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+            // 
+            // 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, 2, 3, 2);
+            this.pictureBox.Name = "pictureBox";
+            this.pictureBox.Size = new System.Drawing.Size(842, 565);
+            this.pictureBox.TabIndex = 9;
+            this.pictureBox.TabStop = false;
+            // 
+            // FormMapWithSetTankers
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1034, 565);
+            this.Controls.Add(this.pictureBox);
+            this.Controls.Add(this.groupBoxTool);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "FormMapWithSetTankers";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Карта с набором объектов";
+            this.groupBoxTool.ResumeLayout(false);
+            this.groupBoxTool.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private GroupBox groupBoxTool;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonShowStorage;
+        private Button buttonRemoveTanker;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonAddTanker;
+        private ComboBox comboBoxSelectorMap;
+        private PictureBox pictureBox;
+        private Button buttonShowOnMap;
+    }
+}

GasolineTanker/GasolineTanker/FormMapWithSetTankers.cs

@@ -0,0 +1,137 @@
+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 GasolineTanker
+{
+    public partial class FormMapWithSetTankers : Form
+    {
+        private MapWithSetTankersGeneric<DrawningObjectTanker, AbstractMap> _mapTankerCollectionGeneric;
+
+        public FormMapWithSetTankers()
+        {
+            InitializeComponent();
+        }
+
+        private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            AbstractMap map = null;
+            switch (comboBoxSelectorMap.Text)
+            {
+                case "Простая карта":
+                    map = new SimpleMap();
+                    break;
+                case "Минное поле":
+                    map = new MineField();
+                    break;
+                case "Лужайка":
+                    map = new FormLawn();
+                    break;
+            }
+            if (map != null)
+            {
+                _mapTankerCollectionGeneric = new MapWithSetTankersGeneric<DrawningObjectTanker, AbstractMap>(
+                    pictureBox.Width, pictureBox.Height, map);
+            }
+            else
+            {
+                _mapTankerCollectionGeneric = null;
+            }
+        }
+
+        private void ButtonAddTanker_Click(object sender, EventArgs e)
+        {
+            if (_mapTankerCollectionGeneric == null)
+            {
+                return;
+            }
+            FormTanker form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                DrawningObjectTanker tanker = new(form.SelectedTanker);
+                if (_mapTankerCollectionGeneric + tanker)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapTankerCollectionGeneric.ShowSet();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+
+        private void ButtonRemoveTanker_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapTankerCollectionGeneric - pos)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapTankerCollectionGeneric.ShowSet();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+
+        private void ButtonShowStorage_Click(object sender, EventArgs e)
+        {
+            if (_mapTankerCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapTankerCollectionGeneric.ShowSet();
+        }
+
+        private void ButtonShowOnMap_Click(object sender, EventArgs e)
+        {
+            if (_mapTankerCollectionGeneric == null)
+            {
+                return;
+            }
+            pictureBox.Image = _mapTankerCollectionGeneric.ShowOnMap();
+        }
+
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_mapTankerCollectionGeneric == 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 = _mapTankerCollectionGeneric.MoveObject(dir);
+        }
+    }
+}

GasolineTanker/GasolineTanker/FormMapWithSetTankers.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>

GasolineTanker/GasolineTanker/FormTanker.Designer.cs

@@ -0,0 +1,207 @@
+namespace GasolineTanker
+{
+    partial class FormTanker
+    {
+        /// <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.pictureBoxTanker = new System.Windows.Forms.PictureBox();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.toolStripStatusSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusWeight = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel();
+            this.Create = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            this.buttonCreateModif = new System.Windows.Forms.Button();
+            this.buttonSelectTanker = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).BeginInit();
+            this.statusStrip1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // pictureBoxTanker
+            // 
+            this.pictureBoxTanker.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxTanker.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxTanker.Name = "pictureBoxTanker";
+            this.pictureBoxTanker.Size = new System.Drawing.Size(821, 429);
+            this.pictureBoxTanker.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxTanker.TabIndex = 0;
+            this.pictureBoxTanker.TabStop = false;
+            this.pictureBoxTanker.Resize += new System.EventHandler(this.pictureBoxTanker_Resize);
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripStatusSpeed,
+            this.toolStripStatusWeight,
+            this.toolStripStatusLabelBodyColor});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 407);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(821, 22);
+            this.statusStrip1.TabIndex = 1;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // toolStripStatusSpeed
+            // 
+            this.toolStripStatusSpeed.Name = "toolStripStatusSpeed";
+            this.toolStripStatusSpeed.Size = new System.Drawing.Size(59, 17);
+            this.toolStripStatusSpeed.Text = "Скорость";
+            // 
+            // toolStripStatusWeight
+            // 
+            this.toolStripStatusWeight.Name = "toolStripStatusWeight";
+            this.toolStripStatusWeight.Size = new System.Drawing.Size(26, 17);
+            this.toolStripStatusWeight.Text = "Вес";
+            // 
+            // toolStripStatusLabelBodyColor
+            // 
+            this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor";
+            this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(33, 17);
+            this.toolStripStatusLabelBodyColor.Text = "Цвет";
+            // 
+            // Create
+            // 
+            this.Create.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.Create.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.Create.Location = new System.Drawing.Point(12, 370);
+            this.Create.Name = "Create";
+            this.Create.Size = new System.Drawing.Size(75, 32);
+            this.Create.TabIndex = 2;
+            this.Create.Text = "Создать";
+            this.Create.UseVisualStyleBackColor = true;
+            this.Create.Click += new System.EventHandler(this.ButtonCreate_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowUp;
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUp.Location = new System.Drawing.Point(738, 336);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 3;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowLeft;
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonLeft.Location = new System.Drawing.Point(702, 372);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 4;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.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::GasolineTanker.Properties.Resources.arrowRight;
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonRight.Location = new System.Drawing.Point(774, 372);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 5;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = global::GasolineTanker.Properties.Resources.arrowDown;
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonDown.Location = new System.Drawing.Point(738, 372);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 6;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click);
+            // 
+            // buttonCreateModif
+            // 
+            this.buttonCreateModif.Location = new System.Drawing.Point(93, 370);
+            this.buttonCreateModif.Name = "buttonCreateModif";
+            this.buttonCreateModif.Size = new System.Drawing.Size(97, 32);
+            this.buttonCreateModif.TabIndex = 7;
+            this.buttonCreateModif.Text = "Модификация";
+            this.buttonCreateModif.UseVisualStyleBackColor = true;
+            this.buttonCreateModif.Click += new System.EventHandler(this.buttonCreateModif_Click);
+            // 
+            // buttonSelectTanker
+            // 
+            this.buttonSelectTanker.Location = new System.Drawing.Point(592, 372);
+            this.buttonSelectTanker.Name = "buttonSelectTanker";
+            this.buttonSelectTanker.Size = new System.Drawing.Size(75, 23);
+            this.buttonSelectTanker.TabIndex = 8;
+            this.buttonSelectTanker.Text = "Выбрать";
+            this.buttonSelectTanker.UseVisualStyleBackColor = true;
+            this.buttonSelectTanker.Click += new System.EventHandler(this.buttonSelectTanker_Click);
+            // 
+            // FormTanker
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(821, 429);
+            this.Controls.Add(this.buttonSelectTanker);
+            this.Controls.Add(this.buttonCreateModif);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.Create);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.pictureBoxTanker);
+            this.Name = "FormTanker";
+            this.Text = "Tanker";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTanker)).EndInit();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxTanker;
+        private StatusStrip statusStrip1;
+        private ToolStripStatusLabel toolStripStatusSpeed;
+        private ToolStripStatusLabel toolStripStatusWeight;
+        private ToolStripStatusLabel toolStripStatusLabelBodyColor;
+        private Button Create;
+        private Button buttonUp;
+        private Button buttonLeft;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonCreateModif;
+        private Button buttonSelectTanker;
+    }
+}

GasolineTanker/GasolineTanker/FormTanker.cs

@@ -0,0 +1,121 @@
+namespace GasolineTanker
+{
+    public partial class FormTanker : Form
+    {
+        private DrawningTanker _Tanker;
+        public DrawningTanker SelectedTanker { get; private set; }
+        public FormTanker()
+        {
+            InitializeComponent();
+        }
+        /// <summary>
+        /// Ìåòîä ïðîðèñîâêè ìàøèíû
+        /// </summary>
+        private void Draw()
+        {
+            Bitmap bmp = new(pictureBoxTanker.Width, pictureBoxTanker.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _Tanker?.DrawTransport(gr);
+            pictureBoxTanker.Image = bmp;
+        }
+        /// <summary>
+        /// Ìåòîä óñòàíîâêè äàííûõ
+        /// </summary>
+        private void SetData()
+        {
+            Random rnd = new();
+            _Tanker.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTanker.Width, pictureBoxTanker.Height);
+            toolStripStatusSpeed.Text = $"Ñêîðîñòü: {_Tanker.Tanker.Speed}";
+            toolStripStatusWeight.Text = $"Âåñ: {_Tanker.Tanker.Weight}";
+            toolStripStatusLabelBodyColor.Text = $"Öâåò: {_Tanker.Tanker.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;
+            }
+
+            _Tanker = new DrawningTanker(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":
+                    _Tanker?.MoveTransport(Direction.Up);
+                    break;
+                case "buttonDown":
+                    _Tanker?.MoveTransport(Direction.Down);
+                    break;
+                case "buttonLeft":
+                    _Tanker?.MoveTransport(Direction.Left);
+                    break;
+                case "buttonRight":
+                    _Tanker?.MoveTransport(Direction.Right);
+                    break;
+            }
+            Draw();
+        }
+        /// <summary>
+        /// Èçìåíåíèå ðàçìåðîâ ôîðìû
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void pictureBoxTanker_Resize(object sender, EventArgs e)
+        {
+            _Tanker?.ChangeBorders(pictureBoxTanker.Width, pictureBoxTanker.Height);
+            Draw();
+        }
+        /// <summary>
+        /// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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;
+            }
+            _Tanker = new DrawningGasolineTanker(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 buttonSelectTanker_Click(object sender, EventArgs e)
+        {
+            SelectedTanker = _Tanker;
+            DialogResult = DialogResult.OK;
+        }
+    }
+}

GasolineTanker/GasolineTanker/FormTanker.resx

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

GasolineTanker/GasolineTanker/GasolineTanker.csproj

@@ -8,4 +8,19 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

GasolineTanker/GasolineTanker/IDrawningObject.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    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>
+		/// <returns></returns>
+		void MoveObject(Direction direction);
+		/// <summary>
+		/// Отрисовка объекта
+		/// </summary>
+		/// <param name="g"></param>
+		void DrawningObject(Graphics g);
+		/// <summary>
+		/// Получение текущей позиции объекта
+		/// </summary>
+		/// <returns></returns>
+		(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+	}
+}

GasolineTanker/GasolineTanker/MapWithSetTankersGeneric.cs

@@ -0,0 +1,128 @@
+namespace GasolineTanker
+{
+    internal class MapWithSetTankersGeneric<T, U>
+        where T : class, IDrawningObject
+        where U : AbstractMap
+    {
+        private readonly int _pictureWidth;
+        private readonly int _pictureHeight;
+        private readonly int _placeSizeWidth = 230;
+        private readonly int _placeSizeHeight = 130;
+        private readonly SetTankersGeneric<T> _setTankers;
+        private readonly U _map;
+
+        public MapWithSetTankersGeneric(int picWidth, int picHeight, U map)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _setTankers = new SetTankersGeneric<T>(width * height);
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _map = map;
+        }
+
+        public static bool operator +(MapWithSetTankersGeneric<T, U> map, T tanker)
+        {
+            if (map._setTankers.Insert(tanker) >= 0)
+                return true;
+            else return false;
+        }
+        public static bool operator -(MapWithSetTankersGeneric<T, U> map, int position)
+        {
+            if (map._setTankers.Remove(position) != null)
+                return true;
+            else return false;
+        }
+
+        public Bitmap ShowSet()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawTanker(gr);
+            return bmp;
+        }
+        public Bitmap ShowOnMap()
+        {
+            Shaking();
+            for (int i = 0; i < _setTankers.Count; i++)
+            {
+                var Tanker = _setTankers.Get(i);
+                if (Tanker != null)
+                {
+                    return _map.CreateMap(_pictureWidth, _pictureHeight, Tanker);
+                }
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        public Bitmap MoveObject(Direction direction)
+        {
+            if (_map != null)
+            {
+                return _map.MoveObject(direction);
+            }
+            return new(_pictureWidth, _pictureHeight);
+        }
+
+        private void Shaking()
+        {
+            int j = _setTankers.Count - 1;
+            for (int i = 0; i < _setTankers.Count; i++)
+            {
+                if (_setTankers.Get(i) == null)
+                {
+                    for (; j > i; j--)
+                    {
+                        var Tanker = _setTankers.Get(j);
+                        if (Tanker != null)
+                        {
+                            _setTankers.Insert(Tanker, i);
+                            _setTankers.Remove(j);
+                            break;
+                        }
+                    }
+                    if (j <= i)
+                    {
+                        return;
+                    }
+                }
+            }
+        }
+
+        private void DrawBackground(Graphics g)
+        {
+            Brush asphaltColor = new SolidBrush(Color.Gray);
+            g.FillRectangle(asphaltColor, 0, 0, _pictureWidth, _pictureHeight);
+
+            Pen pen = new(Color.Yellow, 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);
+            }
+        }
+        private void DrawTanker(Graphics g)
+        {
+            int xPosition = 10;
+            int yPosition = (_pictureHeight / _placeSizeHeight - 1) * _placeSizeHeight + 10;
+
+            for (int i = 0; i < _setTankers.Count; i++)
+            {
+                _setTankers.Get(i)?.SetObject(xPosition, yPosition, _pictureWidth, _pictureHeight);
+                _setTankers.Get(i)?.DrawningObject(g);
+
+                xPosition += _placeSizeWidth;
+                if (xPosition + _placeSizeWidth > _pictureWidth)
+                {
+                    yPosition -= _placeSizeHeight;
+                    xPosition = 10;
+                }
+            }
+        }
+    }
+}
+

GasolineTanker/GasolineTanker/MineField.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    internal class MineField : AbstractMap
+    {
+        private readonly Brush tankColor = new SolidBrush(Color.WhiteSmoke);
+        private readonly Pen logoPen = new Pen(Color.Yellow, 1);
+        private readonly Brush roadColor = new SolidBrush(Color.DarkGray);
+
+        protected override void DrawBarrierPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, _size_x, _size_y);
+            g.FillEllipse(tankColor, i * _size_x, j * _size_y, _size_x, _size_y);
+            g.DrawEllipse(logoPen, 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[39, 26];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 20)
+            {
+                int x = _random.Next(0, 39);
+                int y = _random.Next(0, 26);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/Program.cs

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

GasolineTanker/GasolineTanker/Properties/Resources.Designer.cs

@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace GasolineTanker.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
+    // с помощью такого средства, как ResGen или Visual Studio.
+    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
+    // с параметром /str или перестройте свой проект VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GasolineTanker.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowDown {
+            get {
+                object obj = ResourceManager.GetObject("arrowDown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowLeft {
+            get {
+                object obj = ResourceManager.GetObject("arrowLeft", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowRight {
+            get {
+                object obj = ResourceManager.GetObject("arrowRight", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowUp {
+            get {
+                object obj = ResourceManager.GetObject("arrowUp", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/Properties/Resources.resx

@@ -117,4 +117,17 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="arrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowDown.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowLeft.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowRight.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowUp.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

GasolineTanker/GasolineTanker/SetTankersGeneric.cs

@@ -0,0 +1,80 @@
+namespace GasolineTanker
+{
+    internal class SetTankersGeneric<T>
+        where T : class
+    {
+        private readonly T[] _places;
+        public int Count => _places.Length;
+
+        public SetTankersGeneric(int count)
+        {
+            _places = new T[count];
+        }
+
+        public int Insert(T tanker)
+        {
+            bool freeSpace = false;
+            int firstFreeElement = -1;
+            for (int i = Count - 1; i >= 0; i--)
+            {
+                if (_places[i] == null)
+                {
+                    freeSpace = true;
+                    firstFreeElement = i;
+                }
+            }
+            if (!freeSpace)
+                return -1;
+
+            for (int i = firstFreeElement - 1; i >= 0; i--)
+            {
+                _places[i + 1] = _places[i];
+            }
+            _places[0] = tanker;
+
+            return 0;
+        }
+        public int Insert(T tanker, int position)
+        {
+            if (_places[position] != null)
+            {
+                bool freeSpace = false;
+                int firstFreeElement = -1;
+                for (int i = Count - 1; i < position; i--)
+                {
+                    if (_places[i] == null)
+                    {
+                        freeSpace = true;
+                        firstFreeElement = i;
+                    }
+                }
+                if (!freeSpace)
+                    return -1;
+
+                for (int i = firstFreeElement - 1; i > position; i--)
+                {
+                    _places[i + 1] = _places[i];
+                }
+            }
+            _places[position] = tanker;
+            return position;
+        }
+        public T Remove(int position)
+        {
+            if (_places[position] != null)
+            {
+                T result = _places[position];
+                _places[position] = null;
+                return result;
+            }
+            else
+                return null;
+        }
+        public T Get(int position)
+        {
+            if (_places[position] != null)
+                return _places[position];
+            else return null;
+        }
+    }
+}

GasolineTanker/GasolineTanker/SimpleMap.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker
+{
+    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, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void DrawRoadPart(Graphics g, int i, int j)
+        {
+            g.FillRectangle(roadColor, i * _size_x, j * _size_y, i * (_size_x + 1), j * (_size_y + 1));
+        }
+        protected override void GenerateMap()
+        {
+            _map = new int[100, 100];
+            _size_x = (float)_width / _map.GetLength(0);
+            _size_y = (float)_height / _map.GetLength(1);
+            int counter = 0;
+            for (int i = 0; i < _map.GetLength(0); ++i)
+            {
+                for (int j = 0; j < _map.GetLength(1); ++j)
+                {
+                    _map[i, j] = _freeRoad;
+                }
+            }
+            while (counter < 50)
+            {
+                int x = _random.Next(0, 100);
+                int y = _random.Next(0, 100);
+                if (_map[x, y] == _freeRoad)
+                {
+                    _map[x, y] = _barrier;
+                    counter++;
+                }
+            }
+        }
+    }
+}