Лабораторная работа №7

GasolineTanker/GasolineTanker/CollectionGenericObjects/AbstractCompany.cs

@@ -0,0 +1,132 @@
+using GasolineTanker.Drawnings;
+
+namespace GasolineTanker.CollectionGenericObjects;
+
+/// <summary>
+/// Абстракция компании, хранящей коллекцию грузовиков
+/// </summary>
+public abstract class AbstractCompany
+{
+    /// <summary>
+    /// Размер места (ширина)
+    /// </summary>
+    protected readonly int _placeSizeWidth = 250;
+
+    /// <summary>
+    /// Размер места (высота)
+    /// </summary>
+    protected readonly int _placeSizeHeight = 105;
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    protected readonly int _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    protected readonly int _pictureHeight;
+
+    /// <summary>
+    /// Максимальное количество мест
+    /// </summary>
+    protected int _maxCount;
+
+    /// <summary>
+    /// Коллекция грузовиков
+    /// </summary>
+    protected ICollectionGenericObjects<DrawningTanker>? _collection = null;
+
+    /// <summary>
+    /// Вычисление максимального количества элементов, который можно разместить в окне
+    /// </summary>
+
+    private int GetMaxCount
+    {
+        get
+        {
+            double _divisibleOfWidth = _pictureWidth / _placeSizeWidth;
+            double _divisibleOfHeight = _pictureHeight / _placeSizeHeight;
+            double _placesInWidth = Math.Truncate(_divisibleOfWidth);
+            double _placesInHeight = Math.Truncate(_divisibleOfHeight);
+            _maxCount = (int)(_placesInWidth * _placesInHeight);
+            return _maxCount;
+        }
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth">Ширина окна</param>
+    /// <param name="picHeight">Высота окна</param>
+    /// <param name="collection">Коллекция грузовиков</param>
+    public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTanker> collection)
+    {
+        _pictureWidth = picWidth;
+        _pictureHeight = picHeight;
+        _collection = collection;
+        _collection.MaxCount = GetMaxCount;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора сложения для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="tanker">Добавляемый объект</param>
+    /// <returns></returns>
+    public static bool operator +(AbstractCompany company, DrawningTanker tanker)
+    {
+        return company._collection?.Insert(tanker) ?? false;
+    }
+
+    /// <summary>
+    /// Перегрузка оператора удаления для класса
+    /// </summary>
+    /// <param name="company">Компания</param>
+    /// <param name="position">Номер удаляемого объекта</param>
+    /// <returns></returns>
+    public static bool operator -(AbstractCompany company, int position)
+    {
+        return company._collection?.Remove(position) ?? false;
+    }
+
+    /// <summary>
+    /// Получение случайного объекта из коллекции
+    /// </summary>
+    /// <returns></returns>
+    public DrawningTanker? GetRandomObject()
+    {
+        Random rnd = new();
+        return _collection?.Get(rnd.Next(GetMaxCount));
+    }
+
+    /// <summary>
+    /// Вывод всей коллекции
+    /// </summary>
+    /// <returns></returns>
+    public Bitmap? Show()
+    {
+        Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+        Graphics graphics = Graphics.FromImage(bitmap);
+        DrawBackground(graphics);
+
+        SetObjectsPosition();
+        for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+        {
+            DrawningTanker? obj = _collection?.Get(i);
+            obj?.DrawTransport(graphics);
+        }
+        return bitmap;
+    }
+
+    /// <summary>
+    /// Вывод заднего фона
+    /// </summary>
+    /// <param name="g"></param>
+    protected abstract void DrawBackground(Graphics g);
+
+    /// <summary>
+    /// Расстановка объектов
+    /// </summary>
+    protected abstract void SetObjectsPosition();
+}

GasolineTanker/GasolineTanker/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,22 @@
+namespace GasolineTanker.CollectionGenericObjects;
+
+/// <summary>
+/// Тип коллекции
+/// </summary>
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}

GasolineTanker/GasolineTanker/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -0,0 +1,59 @@
+namespace GasolineTanker.CollectionGenericObjects;
+
+/// <summary>
+/// Интерфейс описания действий для набора хранимых объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public interface ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Количество объектов в коллекции
+    /// </summary>
+    int Count { get; }
+
+    /// <summary>
+	/// Установка максимального количества элементов
+	/// </summary>
+	int MaxCount { get; set; }
+
+    /// <summary>
+    /// Добавление объекта в коллекцию
+    /// </summary>
+    /// <param name="obj">Добавляемый объект</param>
+    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+    bool Insert(T obj);
+
+    /// <summary>
+    /// Добавление объекта в коллекцию на конкретную позицию
+    /// </summary>
+    /// <param name="obj">Добавляемый объект</param>
+    /// <param name="position">Позиция</param>
+    /// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
+    bool Insert(T obj, int position);
+
+    /// <summary>
+    /// Удаление объекта из коллекции с конкретной позиции
+    /// </summary>
+    /// <param name="position">Позиция</param>
+    /// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
+    bool Remove(int position);
+
+    /// <summary>
+    /// Получение объекта по позиции
+    /// </summary>
+    /// <param name="position">Позиция</param>
+    /// <returns>Объект</returns>
+    T? Get(int position);
+
+    /// <summary>
+	/// Получение типа коллекции
+	/// </summary>
+	CollectionType GetCollectionType { get; }
+
+    /// <summary>
+    /// Получение объектов коллекции по одному
+    /// </summary>
+    /// <returns>Поэлементый вывод элементов коллекции</returns>
+    IEnumerable<T?> GetItems();
+}

GasolineTanker/GasolineTanker/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,99 @@
+using GasolineTanker.CollectionGenericObjects;
+using GasolineTanker.Exceptions;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
+    private readonly List<T?> _collection;
+
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+
+    public int Count => _collection.Count;
+
+    public int MaxCount
+    {
+        get
+        {
+            return _maxCount;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                _maxCount = value;
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.List;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+
+    public T? Get(int position)
+    {
+        if (position < 0 || position >= _maxCount)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+        return _collection[position];
+    }
+
+    public bool Insert(T obj)
+    {
+        if (Count == _maxCount)
+        {
+            throw new CollectionOverflowException(Count);
+        }
+        _collection.Add(obj);
+        return true;
+    }
+
+    public bool Insert(T obj, int position)
+    {
+        if (Count == _maxCount)
+        {
+            throw new CollectionOverflowException(Count);
+        }
+        if (position < 0 || position >= _maxCount)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+        _collection.Insert(position, obj);
+        return true;
+    }
+
+    public bool Remove(int position)
+    {
+        if (position < 0 || position >= _maxCount)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+        _collection.RemoveAt(position);
+        return true;
+        
+    }
+
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Count; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+}

GasolineTanker/GasolineTanker/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -0,0 +1,136 @@
+using GasolineTanker.Exceptions;
+
+namespace GasolineTanker.CollectionGenericObjects;
+
+/// <summary>
+/// Параметризованный набор объектов
+/// </summary>
+/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
+public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Массив объектов, которые храним
+    /// </summary>
+    private T?[] _collection;
+
+    public int Count => _collection.Length;
+
+    public int MaxCount
+    {
+        get
+        {
+            return _collection.Length;
+        }
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
+
+    public CollectionType GetCollectionType => CollectionType.Massive;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public MassiveGenericObjects()
+    {
+        _collection = Array.Empty<T?>();
+    }
+
+    public T? Get(int position)
+    {
+        if (position < 0 || position >= _collection.Length)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+        return _collection[position];
+    }
+
+    /// <summary>
+    /// Вставка в пустое место
+    /// </summary>
+
+    public bool Insert(T obj)
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            if (_collection[i] == null)
+            {
+                _collection[i] = obj;
+                return true;
+            }
+        }
+        throw new CollectionOverflowException(Count);
+    }
+
+    /// <summary>
+    /// Вставка по позиции
+    /// </summary>
+
+    public bool Insert(T obj, int position)
+    {
+        if (position < 0 || position >= Count)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+
+        if (_collection[position] == null)
+        {
+            _collection[position] = obj;
+            return true;
+        }
+        else
+        {
+            for (int i = position; i < _collection.Length; ++i)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return true;
+                }
+            }
+
+            for (int i = position; i >= 0; --i)
+            {
+                if (_collection[i] == null)
+                {
+                    _collection[i] = obj;
+                    return true;
+                }
+            }
+        }
+        throw new CollectionOverflowException(Count);
+    }
+
+    public bool Remove(int position)
+    {
+        if (position < 0 || position >= Count)
+        {
+            throw new PositionOutOfCollectionException(position);
+        }
+        if (_collection[position] == null)
+        {
+            throw new ObjectNotFoundException(position);
+        }
+        _collection[position] = null;
+        return true;
+    }
+    public IEnumerable<T?> GetItems()
+    {
+        for (int i = 0; i < _collection.Length; ++i)
+        {
+            yield return _collection[i];
+        }
+    }
+}

GasolineTanker/GasolineTanker/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,236 @@
+using GasolineTanker.Drawnings;
+using GasolineTanker.Exceptions;
+using System.Text;
+
+namespace GasolineTanker.CollectionGenericObjects;
+
+/// <summary>
+/// Класс-хранилище коллекций
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class StorageCollection<T>
+    where T : DrawningTanker
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+
+    /// <summary>
+	/// Ключевое слово, с которого должен начинаться файл
+	/// </summary>
+	private readonly string _collectionKey = "CollectionsStorage";
+
+    /// <summary>
+    /// Разделитель для записи ключа и значения элемента словаря
+    /// </summary>
+    private readonly string _separatorForKeyValue = "|";
+
+    /// <summary>
+    /// Разделитель для записей коллекции данных в файл
+    /// </summary>
+    private readonly string _separatorItems = ";";
+
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+    }
+
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <param name="collectionType">тип коллекции</param>
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+        if (_storages.ContainsKey(name) || name == null)
+        {
+            throw new Exception("Неверное имя коллекции");
+        }
+        if (collectionType == CollectionType.Massive)
+        {
+            _storages.Add(name, new MassiveGenericObjects<T>());
+        }
+        if (collectionType == CollectionType.List)
+        {
+            _storages.Add(name, new ListGenericObjects<T>());
+        }
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+        if (_storages.ContainsKey(name) && name != null)
+        {
+            _storages.Remove(name);
+        }
+    }
+
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            if (_storages.ContainsKey(name) && name != null)
+            {
+                return _storages[name];
+            }
+            return null;
+        }
+    }
+
+    /// <summary>
+	/// Сохранение информации по грузовикам в хранилище в файл
+	/// </summary>
+	/// <param name="filename">Путь и имя файла</param>
+	public void SaveData(string filename)
+    {
+        if (_storages.Count == 0)
+        {
+            throw new Exception("В хранилище отсутствуют коллекции для сохранения");
+        }
+
+        if (File.Exists(filename))
+        {
+            File.Delete(filename);
+        }
+
+        StringBuilder sb = new();
+
+        sb.Append(_collectionKey);
+        foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in _storages)
+        {
+            sb.Append(Environment.NewLine);
+            // не сохраняем пустые коллекции
+            if (value.Value.Count == 0)
+            {
+                continue;
+            }
+
+            sb.Append(value.Key);
+            sb.Append(_separatorForKeyValue);
+            sb.Append(value.Value.GetCollectionType);
+            sb.Append(_separatorForKeyValue);
+            sb.Append(value.Value.MaxCount);
+            sb.Append(_separatorForKeyValue);
+
+            foreach (T? item in value.Value.GetItems())
+            {
+                string data = item?.GetDataForSave() ?? string.Empty;
+                if (string.IsNullOrEmpty(data))
+                {
+                    continue;
+                }
+
+                sb.Append(data);
+                sb.Append(_separatorItems);
+            }
+        }
+
+        using FileStream fs = new(filename, FileMode.Create);
+        byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString());
+        fs.Write(info, 0, info.Length);
+    }
+
+    /// <summary>
+    /// Загрузка информации по грузовикам в хранилище из файла
+    /// </summary>
+    /// <param name="filename">Путь и имя файла</param>
+    public void LoadData(string filename)
+    {
+        if (!File.Exists(filename))
+        {
+            throw new Exception("Файл не существует");
+        }
+
+        string bufferTextFromFile = "";
+        using (FileStream fs = new(filename, FileMode.Open))
+        {
+            byte[] b = new byte[fs.Length];
+            UTF8Encoding temp = new(true);
+            while (fs.Read(b, 0, b.Length) > 0)
+            {
+                bufferTextFromFile += temp.GetString(b);
+            }
+        }
+
+        string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+        if (strs == null || strs.Length == 0)
+        {
+            throw new Exception("В файле нет данных");
+        }
+
+        if (!strs[0].Equals(_collectionKey))
+        {
+            throw new Exception("В файле неверные данные");
+        }
+
+        _storages.Clear();
+        foreach (string data in strs)
+        {
+            string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+            if (record.Length != 4)
+            {
+                continue;
+            }
+
+            CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]);
+            ICollectionGenericObjects<T>? collection = StorageCollection<T>.CreateCollection(collectionType) ??
+                throw new Exception("Не удалось определить тип коллекции:" + record[1]);
+
+            collection.MaxCount = Convert.ToInt32(record[2]);
+
+            string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries);
+            foreach (string elem in set)
+            {
+                if (elem?.CreateDrawningTanker() is T tanker)
+                {
+                    try
+                    {
+                        if (!collection.Insert(tanker))
+                        {
+                            throw new Exception("Объект не удалось добавить в коллекцию: " + record[3]);
+                        }
+                    }
+                    catch (CollectionOverflowException ex)
+                    {
+                        throw new Exception("Коллекция переполнена", ex);
+                    }
+                }
+            }
+
+            _storages.Add(record[0], collection);
+        }
+    }
+
+    /// <summary>
+	/// Создание коллекции по типу
+	/// </summary>
+	/// <param name="collectionType"></param>
+	/// <returns></returns>
+	private static ICollectionGenericObjects<T>? CreateCollection(CollectionType collectionType)
+    {
+        return collectionType switch
+        {
+            CollectionType.Massive => new MassiveGenericObjects<T>(),
+            CollectionType.List => new ListGenericObjects<T>(),
+            _ => null,
+        };
+    }
+}

GasolineTanker/GasolineTanker/CollectionGenericObjects/TankerParkingService.cs

@@ -0,0 +1,54 @@
+using GasolineTanker.Drawnings;
+
+namespace GasolineTanker.CollectionGenericObjects;
+
+/// <summary>
+/// Реализация абстрактной компании - стоянки 
+/// </summary>
+public class TankerParkingService : AbstractCompany
+{
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="picWidth"></param>
+    /// <param name="picHeight"></param>
+    /// <param name="collection"></param>
+    public TankerParkingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTanker> collection) : base(picWidth, picHeight, collection)
+    {
+    }
+    /// <summary>
+    /// Разметка фона
+    /// </summary>
+    protected override void DrawBackground(Graphics g)
+    {
+        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>
+    protected override void SetObjectsPosition()
+    {
+        for (int i = 0; i < _collection?.Count; i++)
+        {
+            DrawningTanker? tanker = _collection.Get(i);
+
+            if (tanker != null)
+            {
+                int width = _pictureWidth / _placeSizeWidth;
+                tanker.SetPictureSize(_pictureWidth, _pictureHeight);
+                tanker.SetPosition(i % width * _placeSizeWidth, i / width * _placeSizeHeight + 10);
+
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/Drawnings/DirectionType.cs

@@ -0,0 +1,32 @@
+namespace GasolineTanker.Drawnings;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum DirectionType
+{
+    /// <summary>
+	/// Неизвестное направление
+	/// </summary>
+	Unknow = -1,
+
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

GasolineTanker/GasolineTanker/Drawnings/DrawningGasolineTanker.cs

@@ -0,0 +1,62 @@
+using GasolineTanker.Entities;
+
+namespace GasolineTanker.Drawnings;
+
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningGasolineTanker : DrawningTanker
+{   
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автомобиля</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="signalBeacon">Признак наличия сигнального маячка</param>
+    /// <param name="cistern">Признак наличия цистерны</param>
+
+    public DrawningGasolineTanker(int speed, double weight, Color bodyColor, Color additionalColor, bool signalBeacon, bool cistern) : base(130, 90)
+    {
+        EntityTanker = new EntityGasolineTanker(speed, weight, bodyColor, additionalColor, signalBeacon, cistern);
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="tanker">Класс-сущность</param>
+    public DrawningGasolineTanker(EntityTanker tanker) : base(130, 90)
+    {
+        EntityTanker = tanker;
+    }
+
+    public override void DrawTransport(Graphics g)
+    {
+        if (EntityTanker == null || EntityTanker is not EntityGasolineTanker gasolineTanker || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new SolidBrush(gasolineTanker.AdditionalColor);
+
+        // Цистерна
+
+        if (gasolineTanker.Cistern)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 10, 90, 40);
+            g.FillRectangle(additionalBrush, _startPosX.Value + 55, _startPosY.Value + 5, 10, 5);
+        }
+
+        // Сигнальный маячок
+
+        if (gasolineTanker.SignalBeacon)
+        {
+            g.FillRectangle(additionalBrush, _startPosX.Value + 120, _startPosY.Value, 10, 10);
+        }
+        _startPosY += 10;
+        base.DrawTransport(g);
+        _startPosY -= 10;
+    }
+}

GasolineTanker/GasolineTanker/Drawnings/DrawningTanker.cs

@@ -0,0 +1,243 @@
+using GasolineTanker.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker.Drawnings;
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningTanker
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityTanker? EntityTanker { get; protected set; }
+
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+
+    /// <summary>
+    /// Левая координата прорисовки грузовика
+    /// </summary>
+    protected int? _startPosX;
+
+    /// <summary>
+    /// Верхняя кооридната прорисовки грузовика
+    /// </summary>
+    protected int? _startPosY;
+
+    /// <summary>
+    /// Ширина прорисовки грузовика
+    /// </summary>
+    private readonly int _drawningTankerWidth = 130;
+
+    /// <summary>
+    /// Высота прорисовки грузовика
+    /// </summary>
+    private readonly int _drawningTankerHeight = 80;
+
+    /// <summary>
+	/// Координата X объекта
+	/// </summary>
+	public int? GetPosX => _startPosX;
+
+    /// <summary>
+    /// Координата Y объекта
+    /// </summary>
+    public int? GetPosY => _startPosY;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    public int GetWidth => _drawningTankerWidth;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    public int GetHeight => _drawningTankerHeight;
+
+    /// <summary>
+    ///  Пустой конструктор
+    /// </summary>
+    private DrawningTanker()
+    {
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автомобиля</param>
+    /// <param name="bodyColor">Основной цвет</param>
+
+    public DrawningTanker(int speed, double weight, Color bodyColor) : this()
+    {
+        EntityTanker = new EntityTanker(speed, weight, bodyColor);
+    }
+
+    /// <summary>
+	/// Конструктор
+	/// </summary>
+	/// <param name="tanker">Класс-сущность</param>
+	public DrawningTanker(EntityTanker tanker) : this()
+    {
+        EntityTanker = tanker;   
+    }
+
+    /// <summary>
+    /// Конструктор для наследников
+    /// </summary>
+    /// <param name="drawningTankerWidth">Ширина грузовика</param>
+    /// <param name="drawningTankerHeight">Высота грузовика</param>
+
+    protected DrawningTanker(int drawningTankerWidth, int drawningTankerHeight) : this()
+    {
+        _drawningTankerWidth= drawningTankerWidth;
+        _drawningTankerHeight= drawningTankerHeight;
+    }
+
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+
+    public bool SetPictureSize(int width, int height)
+    {
+        if (width >= _drawningTankerWidth && height >= _drawningTankerHeight)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            return true;
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+
+        int endOfDrawingWidth = x + _drawningTankerWidth;
+        int endOfDrawingHeight = y + _drawningTankerHeight;
+
+        _startPosX = x;
+        _startPosY = y;
+        if (endOfDrawingWidth > _pictureWidth)
+        {
+            _startPosX = x - (endOfDrawingWidth - _pictureWidth);
+        }
+        if (endOfDrawingHeight > _pictureHeight)
+        {
+            _startPosY = y - (endOfDrawingHeight - _pictureHeight);
+        }
+    }
+
+    /// <summary>
+	/// Изменение направления перемещения
+	/// </summary>
+	/// <param name="direction">Направление</param>
+	/// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
+	public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityTanker == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return false;
+        }
+
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityTanker.Step > 0)
+                {
+                    _startPosX -= (int)EntityTanker.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityTanker.Step > 0)
+                {
+                    _startPosY -= (int)EntityTanker.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + _drawningTankerWidth + EntityTanker.Step < _pictureWidth)
+                {
+                    _startPosX += (int)EntityTanker.Step;
+                }
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + _drawningTankerHeight + EntityTanker.Step < _pictureHeight)
+                {
+                    _startPosY += (int)EntityTanker.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+
+    public virtual void DrawTransport(Graphics g)
+    {
+        if (EntityTanker == null || !_startPosX.HasValue || !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+
+        // Границы бензовоза
+
+        g.DrawRectangle(pen, _startPosX.Value + 95, _startPosY.Value + 5, 25, 25);
+        g.DrawRectangle(pen, _startPosX.Value + 90, _startPosY.Value, 40, 40);
+        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 40, 130, 15);
+
+        // Колеса
+
+        Brush brBlack = new SolidBrush(Color.Black);
+        g.FillEllipse(brBlack, _startPosX.Value + 105, _startPosY.Value + 55, 25, 25);
+        g.FillEllipse(brBlack, _startPosX.Value + 5, _startPosY.Value + 55, 25, 25);
+        g.FillEllipse(brBlack, _startPosX.Value + 30, _startPosY.Value + 55, 25, 25);
+
+        // Кузов
+
+        Brush br = new SolidBrush(EntityTanker.BodyColor);
+        g.FillRectangle(br, _startPosX.Value + 91, _startPosY.Value + 1, 39, 39);
+        g.FillRectangle(br, _startPosX.Value + 1, _startPosY.Value + 41, 129, 14);
+
+        // Стекло
+
+        Brush brBlue = new SolidBrush(Color.LightBlue);
+        g.FillRectangle(brBlue, _startPosX.Value + 95, _startPosY.Value + 5, 25, 25);
+    }
+}

GasolineTanker/GasolineTanker/Drawnings/ExtentionDrawningTanker.cs

@@ -0,0 +1,54 @@
+using GasolineTanker.Entities;
+
+namespace GasolineTanker.Drawnings;
+
+/// <summary>
+/// Расширение для класса EntityCar
+/// </summary>
+public static class ExtentionDrawningTanker
+{
+    /// <summary>
+    /// Разделитель для записи информации по объекту в файл
+    /// </summary>
+    private static readonly string _separatorForObject = ":";
+
+    /// <summary>
+    /// Создание объекта из строки
+    /// </summary>
+    /// <param name="info">Строка с данными для создания объекта</param>
+    /// <returns>Объект</returns>
+    public static DrawningTanker? CreateDrawningTanker(this string info)
+    {
+        string[] strs = info.Split(_separatorForObject);
+        EntityTanker? tanker = EntityGasolineTanker.CreateEntityGasolineTanker(strs);
+        if (tanker != null)
+        {
+            return new DrawningGasolineTanker(tanker);
+        }
+
+        tanker = EntityTanker.CreateEntityTanker(strs);
+        if (tanker != null)
+        {
+            return new DrawningTanker(tanker);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Получение данных для сохранения в файл
+    /// </summary>
+    /// <param name="drawningTanker">Сохраняемый объект</param>
+    /// <returns>Строка с данными по объекту</returns>
+    public static string GetDataForSave(this DrawningTanker drawningTanker)
+    {
+        string[]? array = drawningTanker?.EntityTanker?.GetStringRepresentation();
+
+        if (array == null)
+        {
+            return string.Empty;
+        }
+
+        return string.Join(_separatorForObject, array);
+    }
+}

GasolineTanker/GasolineTanker/Entities/EntityGasolineTanker.cs

@@ -0,0 +1,66 @@
+namespace GasolineTanker.Entities;
+
+/// <summary>
+/// Класс-сущность "Бензовоз"
+/// </summary>
+
+public class EntityGasolineTanker : EntityTanker
+{
+    /// <summary>
+	/// Дополнительный цвет (для опциональных элементов)
+	/// </summary>
+    public Color AdditionalColor { get; private set; }
+
+    /// <summary>
+	/// Признак (опция) наличия сигнального маячка
+	/// </summary>
+	public bool SignalBeacon { get; private set; }
+
+    /// <summary>
+	/// Признак (опция) наличия цистерны
+	/// </summary>
+	public bool Cistern { get; private set; }
+
+    /// <summary>
+    /// Инициализация полей объекта-класса бензовоза
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автомобиля</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="signalBeacon">Признак наличия сигнального маячка</param>
+    /// <param name="cistern">Признак наличия цистерны</param>
+
+    public EntityGasolineTanker(int speed, double weight, Color bodyColor, Color additionalColor, bool signalBeacon, bool cistern) : base(speed, weight, bodyColor)
+    {
+        AdditionalColor = additionalColor;
+        SignalBeacon = signalBeacon;
+        Cistern = cistern;
+    }
+
+    public void SetAdditionalColor(Color color)
+    {
+        AdditionalColor = color;
+    }
+
+    public override string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityGasolineTanker), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, SignalBeacon.ToString(), Cistern.ToString() };
+    }
+
+    /// <summary>
+	/// Создание объекта из массива строк
+	/// </summary>
+	/// <param name="strs"></param>
+	/// <returns></returns>
+	public static EntityGasolineTanker? CreateEntityGasolineTanker(string[] strs)
+    {
+        if (strs.Length != 7 || strs[0] != nameof(EntityGasolineTanker))
+        {
+            return null;
+        }
+
+        return new EntityGasolineTanker(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]),
+             Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]));
+    }
+}

GasolineTanker/GasolineTanker/Entities/EntityTanker.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GasolineTanker.Entities;
+
+/// <summary>
+/// Класс-сущность "Грузовик"
+/// </summary>
+public class EntityTanker
+{
+    /// <summary>
+    /// Скорость
+    /// </summary>
+    public int Speed { get; protected set; }
+
+    /// <summary>
+    /// Вес
+    /// </summary>
+    public double Weight { get; protected set; }
+
+    /// <summary>
+    /// Основной цвет
+    /// </summary>
+    public Color BodyColor { get; protected set; }
+
+    /// <summary>
+	/// Шаг перемещения автомобиля
+	/// </summary>
+    public double Step => Speed * 100 / Weight;
+
+    /// <summary>
+    /// Конструктор сущности
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес автомобиля</param>
+    /// <param name="bodyColor">Основной цвет</param> 
+
+    public EntityTanker(int speed, double weight, Color bodyColor)
+    {
+        Speed = speed;
+        Weight = weight;
+        BodyColor = bodyColor;
+    }
+
+    public void SetBodyColor(Color bodyColor)
+    {
+        BodyColor = bodyColor;
+    }
+
+    /// <summary>
+	/// Получение строк со значениями свойств объекта класса-сущности
+	/// </summary>
+	/// <returns></returns>
+	public virtual string[] GetStringRepresentation()
+    {
+        return new[] { nameof(EntityTanker), Speed.ToString(), Weight.ToString(), BodyColor.Name };
+    }
+
+    /// <summary>
+    /// Создание объекта из массива строк
+    /// </summary>
+    /// <param name="strs"></param>
+    /// <returns></returns>
+    public static EntityTanker? CreateEntityTanker(string[] strs)
+    {
+        if (strs.Length != 4 || strs[0] != nameof(EntityTanker))
+        {
+            return null;
+        }
+
+        return new EntityTanker(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]));
+    }
+}

GasolineTanker/GasolineTanker/Exceptions/CollectionOverflowException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace GasolineTanker.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку переполнения коллекции
+/// </summary>
+[Serializable]
+internal class CollectionOverflowException : ApplicationException
+{
+    public CollectionOverflowException(int count) : base("В коллекции превышено допустимое количество: " + count) { }
+
+    public CollectionOverflowException() : base() { }
+
+    public CollectionOverflowException(string message) : base(message) { }
+
+    public CollectionOverflowException(string message, Exception exception) : base(message, exception) { }
+
+    protected CollectionOverflowException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

GasolineTanker/GasolineTanker/Exceptions/ObjectNotFoundException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace GasolineTanker.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку, что по указанной позиции нет элемента
+/// </summary>
+[Serializable]
+internal class ObjectNotFoundException : ApplicationException
+{
+    public ObjectNotFoundException(int i) : base("Не найден объект по позиции " + i) { }
+
+    public ObjectNotFoundException() : base() { }
+
+    public ObjectNotFoundException(string message) : base(message) { }
+
+    public ObjectNotFoundException(string message, Exception exception) : base(message, exception) { }
+
+    protected ObjectNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

GasolineTanker/GasolineTanker/Exceptions/PositionOutOfCollectionException.cs

@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace GasolineTanker.Exceptions;
+
+/// <summary>
+/// Класс, описывающий ошибку выхода за границы коллекции
+/// </summary>
+[Serializable]
+internal class PositionOutOfCollectionException : ApplicationException
+{
+    public PositionOutOfCollectionException(int i) : base("Выход за границы коллекции. Позиция " + i) { }
+
+    public PositionOutOfCollectionException() : base() { }
+
+    public PositionOutOfCollectionException(string message) : base(message) { }
+
+    public PositionOutOfCollectionException(string message, Exception exception) : base(message, exception) { }
+
+    protected PositionOutOfCollectionException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
+}

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/FormGasolineTanker.Designer.cs

@@ -0,0 +1,147 @@
+namespace GasolineTanker
+{
+    partial class FormGasolineTanker
+    {
+        /// <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()
+        {
+            pictureBoxGasolineTanker = new PictureBox();
+            buttonRight = new Button();
+            buttonDown = new Button();
+            buttonUp = new Button();
+            buttonLeft = new Button();
+            comboBoxStrategy = new ComboBox();
+            buttonStrategyStep = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxGasolineTanker).BeginInit();
+            SuspendLayout();
+            // 
+            // pictureBoxGasolineTanker
+            // 
+            pictureBoxGasolineTanker.Dock = DockStyle.Fill;
+            pictureBoxGasolineTanker.Location = new Point(0, 0);
+            pictureBoxGasolineTanker.Name = "pictureBoxGasolineTanker";
+            pictureBoxGasolineTanker.Size = new Size(972, 537);
+            pictureBoxGasolineTanker.TabIndex = 0;
+            pictureBoxGasolineTanker.TabStop = false;
+            // 
+            // buttonRight
+            // 
+            buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonRight.BackgroundImage = Properties.Resources.arrowRight;
+            buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonRight.Location = new Point(911, 484);
+            buttonRight.Name = "buttonRight";
+            buttonRight.Size = new Size(35, 35);
+            buttonRight.TabIndex = 2;
+            buttonRight.UseVisualStyleBackColor = true;
+            buttonRight.Click += ButtonMove_Click;
+            // 
+            // buttonDown
+            // 
+            buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonDown.BackgroundImage = Properties.Resources.arrowDown;
+            buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonDown.Location = new Point(870, 484);
+            buttonDown.Name = "buttonDown";
+            buttonDown.Size = new Size(35, 35);
+            buttonDown.TabIndex = 3;
+            buttonDown.UseVisualStyleBackColor = true;
+            buttonDown.Click += ButtonMove_Click;
+            // 
+            // buttonUp
+            // 
+            buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonUp.BackgroundImage = Properties.Resources.arrowUp;
+            buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonUp.Location = new Point(870, 443);
+            buttonUp.Name = "buttonUp";
+            buttonUp.Size = new Size(35, 35);
+            buttonUp.TabIndex = 4;
+            buttonUp.UseVisualStyleBackColor = true;
+            buttonUp.Click += ButtonMove_Click;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
+            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonLeft.Location = new Point(829, 484);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(35, 35);
+            buttonLeft.TabIndex = 5;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
+            // 
+            // comboBoxStrategy
+            // 
+            comboBoxStrategy.AccessibleRole = AccessibleRole.Sound;
+            comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxStrategy.FormattingEnabled = true;
+            comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" });
+            comboBoxStrategy.Location = new Point(839, 12);
+            comboBoxStrategy.Name = "comboBoxStrategy";
+            comboBoxStrategy.Size = new Size(121, 23);
+            comboBoxStrategy.TabIndex = 7;
+            // 
+            // buttonStrategyStep
+            // 
+            buttonStrategyStep.Location = new Point(885, 41);
+            buttonStrategyStep.Name = "buttonStrategyStep";
+            buttonStrategyStep.Size = new Size(75, 23);
+            buttonStrategyStep.TabIndex = 8;
+            buttonStrategyStep.Text = "Шаг";
+            buttonStrategyStep.UseVisualStyleBackColor = true;
+            buttonStrategyStep.Click += ButtonStrategyStep_Click;
+            // 
+            // FormGasolineTanker
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(972, 537);
+            Controls.Add(buttonStrategyStep);
+            Controls.Add(comboBoxStrategy);
+            Controls.Add(buttonLeft);
+            Controls.Add(buttonUp);
+            Controls.Add(buttonDown);
+            Controls.Add(buttonRight);
+            Controls.Add(pictureBoxGasolineTanker);
+            Name = "FormGasolineTanker";
+            Text = "Бензовоз";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxGasolineTanker).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxGasolineTanker;
+        private Button buttonRight;
+        private Button buttonDown;
+        private Button buttonUp;
+        private Button buttonLeft;
+        private ComboBox comboBoxStrategy;
+        private Button buttonStrategyStep;
+    }
+}

GasolineTanker/GasolineTanker/FormGasolineTanker.cs

@@ -0,0 +1,145 @@
+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 System.Windows.Forms.VisualStyles;
+using GasolineTanker.Drawnings;
+using GasolineTanker.MovementStrategy;
+
+namespace GasolineTanker
+{
+    public partial class FormGasolineTanker : Form
+    {
+        private DrawningTanker? _drawningTanker;
+
+        /// <summary>
+        /// Стратегия перемещения
+        /// </summary>
+        private AbstractStrategy? _strategy;
+
+        /// <summary>
+        /// Получение объекта 
+        /// </summary>
+        public DrawningTanker SetTanker
+        {
+            set
+            {
+                _drawningTanker = value;
+                _drawningTanker.SetPictureSize(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+                Draw();
+            }
+        }
+
+        /// <summary>
+        /// Конструктор формы
+        /// </summary>
+
+        public FormGasolineTanker()
+        {
+            InitializeComponent();
+            _strategy = null;
+        }
+
+        /// <summary>
+        /// Метод прорисовки машины
+        /// </summary>
+        private void Draw()
+        {
+            if (_drawningTanker == null)
+            {
+                return;
+            }
+
+            Bitmap bmp = new(pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningTanker.DrawTransport(gr);
+            pictureBoxGasolineTanker.Image = bmp;
+        }         
+
+        /// <summary>
+        /// Перемещение объекта по форме (нажатие кнопок навигации)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawningTanker == null)
+            {
+                return;
+            }
+
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch (name)
+            {
+                case "buttonUp":
+                    result = _drawningTanker.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    result = _drawningTanker.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    result = _drawningTanker.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    result = _drawningTanker.MoveTransport(DirectionType.Right);
+                    break;
+            }
+
+            if (result)
+            {
+                Draw();
+            }
+        }
+
+        /// <summary>
+        /// Обработка нажатия кнопки "Шаг"
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ButtonStrategyStep_Click(object sender, EventArgs e)
+        {
+            if (_drawningTanker == null)
+            {
+                return;
+            }
+
+            if (comboBoxStrategy.Enabled)
+            {
+                _strategy = comboBoxStrategy.SelectedIndex switch
+                {
+                    0 => new MoveToCenter(),
+                    1 => new MoveToBorder(),
+                    _ => null,
+                };
+                if (_strategy == null)
+                {
+                    return;
+                }
+                _strategy.SetData(new MoveableTanker(_drawningTanker), pictureBoxGasolineTanker.Width, pictureBoxGasolineTanker.Height);
+            }
+
+            if (_strategy == null)
+            {
+                return;
+            }
+
+            comboBoxStrategy.Enabled = false;
+            _strategy.MakeStep();
+            Draw();
+
+            if (_strategy.GetStatus() == StrategyStatus.Finish)
+            {
+                comboBoxStrategy.Enabled = true;
+                _strategy = null;
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/FormTankerCollection.Designer.cs

@@ -0,0 +1,342 @@
+namespace GasolineTanker
+{
+    partial class FormTankerCollection
+    {
+        /// <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()
+        {
+            groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddTanker = new Button();
+            maskedTextBoxPosition = new MaskedTextBox();
+            buttonRefresh = new Button();
+            buttonRemoveTanker = new Button();
+            buttonGoToCheck = new Button();
+            buttonCreateCompany = new Button();
+            panelStorage = new Panel();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
+            comboBoxSelectorCompany = new ComboBox();
+            pictureBox = new PictureBox();
+            menuStrip = new MenuStrip();
+            fileToolStripMenuItem = new ToolStripMenuItem();
+            saveToolStripMenuItem = new ToolStripMenuItem();
+            loadToolStripMenuItem = new ToolStripMenuItem();
+            saveFileDialog = new SaveFileDialog();
+            openFileDialog = new OpenFileDialog();
+            groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+            menuStrip.SuspendLayout();
+            SuspendLayout();
+            // 
+            // groupBoxTools
+            // 
+            groupBoxTools.Controls.Add(panelCompanyTools);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
+            groupBoxTools.Controls.Add(panelStorage);
+            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+            groupBoxTools.Dock = DockStyle.Right;
+            groupBoxTools.Location = new Point(874, 24);
+            groupBoxTools.Name = "groupBoxTools";
+            groupBoxTools.Size = new Size(179, 531);
+            groupBoxTools.TabIndex = 0;
+            groupBoxTools.TabStop = false;
+            groupBoxTools.Text = "Инструменты";
+            // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddTanker);
+            panelCompanyTools.Controls.Add(maskedTextBoxPosition);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(buttonRemoveTanker);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(14, 331);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(159, 196);
+            panelCompanyTools.TabIndex = 9;
+            // 
+            // buttonAddTanker
+            // 
+            buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddTanker.Location = new Point(10, 3);
+            buttonAddTanker.Name = "buttonAddTanker";
+            buttonAddTanker.Size = new Size(144, 35);
+            buttonAddTanker.TabIndex = 1;
+            buttonAddTanker.Text = "Добавление грузовика";
+            buttonAddTanker.UseVisualStyleBackColor = true;
+            buttonAddTanker.Click += ButtonAddTanker_Click;
+            // 
+            // maskedTextBoxPosition
+            // 
+            maskedTextBoxPosition.Location = new Point(8, 44);
+            maskedTextBoxPosition.Mask = "00";
+            maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+            maskedTextBoxPosition.Size = new Size(151, 23);
+            maskedTextBoxPosition.TabIndex = 3;
+            maskedTextBoxPosition.ValidatingType = typeof(int);
+            // 
+            // buttonRefresh
+            // 
+            buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRefresh.Location = new Point(8, 147);
+            buttonRefresh.Name = "buttonRefresh";
+            buttonRefresh.Size = new Size(143, 33);
+            buttonRefresh.TabIndex = 6;
+            buttonRefresh.Text = "Обновить";
+            buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += ButtonRefresh_Click;
+            // 
+            // buttonRemoveTanker
+            // 
+            buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonRemoveTanker.Location = new Point(10, 73);
+            buttonRemoveTanker.Name = "buttonRemoveTanker";
+            buttonRemoveTanker.Size = new Size(143, 31);
+            buttonRemoveTanker.TabIndex = 4;
+            buttonRemoveTanker.Text = "Удаление грузовика";
+            buttonRemoveTanker.UseVisualStyleBackColor = true;
+            buttonRemoveTanker.Click += ButtonRemoveTanker_Click;
+            // 
+            // buttonGoToCheck
+            // 
+            buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonGoToCheck.Location = new Point(10, 110);
+            buttonGoToCheck.Name = "buttonGoToCheck";
+            buttonGoToCheck.Size = new Size(141, 31);
+            buttonGoToCheck.TabIndex = 5;
+            buttonGoToCheck.Text = "Отправить на проверку";
+            buttonGoToCheck.UseVisualStyleBackColor = true;
+            buttonGoToCheck.Click += ButtonGoToCheck_Click;
+            // 
+            // buttonCreateCompany
+            // 
+            buttonCreateCompany.Location = new Point(14, 302);
+            buttonCreateCompany.Name = "buttonCreateCompany";
+            buttonCreateCompany.Size = new Size(159, 23);
+            buttonCreateCompany.TabIndex = 8;
+            buttonCreateCompany.Text = "Создать компанию";
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += ButtonCreateCompany_Click;
+            // 
+            // panelStorage
+            // 
+            panelStorage.Controls.Add(buttonCollectionDel);
+            panelStorage.Controls.Add(listBoxCollection);
+            panelStorage.Controls.Add(buttonCollectionAdd);
+            panelStorage.Controls.Add(radioButtonList);
+            panelStorage.Controls.Add(radioButtonMassive);
+            panelStorage.Controls.Add(textBoxCollectionName);
+            panelStorage.Controls.Add(labelCollectionName);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 19);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(173, 248);
+            panelStorage.TabIndex = 7;
+            // 
+            // buttonCollectionDel
+            // 
+            buttonCollectionDel.Location = new Point(11, 211);
+            buttonCollectionDel.Name = "buttonCollectionDel";
+            buttonCollectionDel.Size = new Size(159, 23);
+            buttonCollectionDel.TabIndex = 6;
+            buttonCollectionDel.Text = "Удалить коллекцию";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += ButtonCollectionDel_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(13, 111);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(157, 94);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(11, 82);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(159, 23);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += ButtonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(86, 57);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(13, 57);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(11, 28);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(159, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(29, 10);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(122, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции";
+            // 
+            // comboBoxSelectorCompany
+            // 
+            comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxSelectorCompany.FormattingEnabled = true;
+            comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+            comboBoxSelectorCompany.Location = new Point(18, 273);
+            comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+            comboBoxSelectorCompany.Size = new Size(151, 23);
+            comboBoxSelectorCompany.TabIndex = 0;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+            // 
+            // pictureBox
+            // 
+            pictureBox.Dock = DockStyle.Fill;
+            pictureBox.Location = new Point(0, 24);
+            pictureBox.Name = "pictureBox";
+            pictureBox.Size = new Size(874, 531);
+            pictureBox.TabIndex = 1;
+            pictureBox.TabStop = false;
+            // 
+            // menuStrip
+            // 
+            menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(1053, 24);
+            menuStrip.TabIndex = 2;
+            menuStrip.Text = "menuStrip";
+            // 
+            // fileToolStripMenuItem
+            // 
+            fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
+            fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            fileToolStripMenuItem.Size = new Size(48, 20);
+            fileToolStripMenuItem.Text = "Файл";
+            // 
+            // saveToolStripMenuItem
+            // 
+            saveToolStripMenuItem.Name = "saveToolStripMenuItem";
+            saveToolStripMenuItem.Size = new Size(141, 22);
+            saveToolStripMenuItem.Text = "Сохранение";
+            saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+            // 
+            // loadToolStripMenuItem
+            // 
+            loadToolStripMenuItem.Name = "loadToolStripMenuItem";
+            loadToolStripMenuItem.Size = new Size(141, 22);
+            loadToolStripMenuItem.Text = "Загрузка";
+            loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+            // 
+            // saveFileDialog
+            // 
+            saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            openFileDialog.Filter = "txt file | *.txt";
+            // 
+            // FormTankerCollection
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(1053, 555);
+            Controls.Add(pictureBox);
+            Controls.Add(groupBoxTools);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
+            Name = "FormTankerCollection";
+            Text = "Коллекция грузовиков";
+            groupBoxTools.ResumeLayout(false);
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private GroupBox groupBoxTools;
+        private ComboBox comboBoxSelectorCompany;
+        private Button buttonAddTanker;
+        private PictureBox pictureBox;
+        private MaskedTextBox maskedTextBoxPosition;
+        private Button buttonRemoveTanker;
+        private Button buttonRefresh;
+        private Button buttonGoToCheck;
+        private Panel panelStorage;
+        private Label labelCollectionName;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private RadioButton radioButtonList;
+        private Button buttonCreateCompany;
+        private Panel panelCompanyTools;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem fileToolStripMenuItem;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
+    }
+}

GasolineTanker/GasolineTanker/FormTankerCollection.cs

@@ -0,0 +1,316 @@
+using GasolineTanker.CollectionGenericObjects;
+using GasolineTanker.Drawnings;
+using GasolineTanker.Entities;
+using Microsoft.Extensions.Logging;
+using System.Windows.Forms;
+
+namespace GasolineTanker;
+
+/// <summary>
+/// Форма работы с компанией и ее коллекцией
+/// </summary>
+public partial class FormTankerCollection : Form
+{
+    /// <summary>
+	/// Хранилише коллекций
+	/// </summary>
+	private readonly StorageCollection<DrawningTanker> _storageCollection;
+
+    /// <summary>
+    /// Компания
+    /// </summary>
+    private AbstractCompany? _company = null;
+
+    /// <summary>
+	/// Логер
+	/// </summary>
+	private readonly ILogger _logger;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormTankerCollection(ILogger<FormTankerCollection> logger)
+    {
+        InitializeComponent();
+        _storageCollection = new();
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Выбор компании
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    {
+        panelCompanyTools.Enabled = false;
+    }
+
+    /// <summary>
+    /// Добавление грузовика
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonAddTanker_Click(object sender, EventArgs e)
+    {
+        FormTankerConfig form = new();
+        form.AddEvent(SetTanker);
+        form.Show();
+    }
+
+    /// <summary>
+	/// Добавление грузовика в коллекцию
+	/// </summary>
+	/// <param name="tanker"></param>
+	private void SetTanker(DrawningTanker? tanker)
+    {
+        if (_company == null || tanker == null)
+        {
+            return;
+        }
+
+        try 
+        {
+            if (_company + tanker)
+            {
+                MessageBox.Show("Объект добавлен");
+                pictureBox.Image = _company.Show();                
+                _logger.LogInformation("Добавлен объект: {tanker}", tanker.GetDataForSave());
+            }            
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// Удаление объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRemoveTanker_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+        {
+            return;
+        }
+
+        if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+        {
+            return;
+        }
+
+        int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+        try
+        {
+            if (_company - pos)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBox.Image = _company.Show();
+                _logger.LogInformation("Удален объект с индексом: {pos}", pos);
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message);
+            _logger.LogError("Ошибка: {Message}", ex.Message);
+        }
+    }
+
+    /// <summary>
+    /// Передача объекта в другую форму
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonGoToCheck_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        DrawningTanker? tanker = null;
+        int counter = 100;
+        while (tanker == null)
+        {
+            tanker = _company.GetRandomObject();
+            counter--;
+            if (counter <= 0)
+            {
+                break;
+            }
+        }
+
+        if (tanker == null)
+        {
+            return;
+        }
+
+        FormGasolineTanker form = new()
+        {
+            SetTanker = tanker
+        };
+        form.ShowDialog();
+    }
+
+    /// <summary>
+    /// Перерисовка коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonRefresh_Click(object sender, EventArgs e)
+    {
+        if (_company == null)
+        {
+            return;
+        }
+
+        pictureBox.Image = _company.Show();
+    }
+
+    /// <summary>
+	/// Добавление коллекции
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+	private void ButtonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
+    }
+
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void ButtonCollectionDel_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex == -1)
+        {
+            MessageBox.Show("Коллекция для удаления не выбрана");
+            return;
+        }
+        if (MessageBox.Show($"Удалить коллекцию {listBoxCollection.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+        {
+            _storageCollection.DelCollection(listBoxCollection.SelectedItem?.ToString() ?? string.Empty);
+            MessageBox.Show("Коллекция удалена");
+            RerfreshListBoxItems();
+        }
+    }
+
+    /// <summary>
+	/// Обновление списка в listBoxCollection
+	/// </summary>
+	private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+
+    }
+
+    /// <summary>
+	/// Создание компании
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+	private void ButtonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+
+        ICollectionGenericObjects<DrawningTanker>? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new TankerParkingService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
+
+    /// <summary>
+	/// Обработка нажатия "Сохранение"
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+
+    private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (saveFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.SaveData(saveFileDialog.FileName);
+                MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Сохранение в файл: {filename}", saveFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+    }
+
+    /// <summary>
+	/// Обработка нажатия "Загрузка"
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+
+    private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        if (openFileDialog.ShowDialog() == DialogResult.OK)
+        {
+            try
+            {
+                _storageCollection.LoadData(openFileDialog.FileName);
+                MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                _logger.LogInformation("Загрузка из файла: {filename}", openFileDialog.FileName);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                _logger.LogError("Ошибка: {Message}", ex.Message);
+            }
+        }
+        RerfreshListBoxItems();
+    }
+}

GasolineTanker/GasolineTanker/FormTankerCollection.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>126, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>261, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>37</value>
+  </metadata>
+</root>

GasolineTanker/GasolineTanker/FormTankerConfig.Designer.cs

@@ -0,0 +1,357 @@
+namespace GasolineTanker
+{
+    partial class FormTankerConfig
+    {
+        /// <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()
+        {
+            groupBoxConfig = new GroupBox();
+            groupBoxColors = new GroupBox();
+            panelWhite = new Panel();
+            panelPurple = new Panel();
+            panelGrey = new Panel();
+            panelBlack = new Panel();
+            panelYellow = new Panel();
+            panelBlue = new Panel();
+            panelGreen = new Panel();
+            panelRed = new Panel();
+            checkBoxCistern = new CheckBox();
+            checkBoxSignalBeacon = new CheckBox();
+            numericUpDownWeight = new NumericUpDown();
+            labelWeight = new Label();
+            numericUpDownSpeed = new NumericUpDown();
+            labelSpeed = new Label();
+            labelModifiedObject = new Label();
+            labelSimpleObject = new Label();
+            buttonAdd = new Button();
+            buttonCancel = new Button();
+            panelObject = new Panel();
+            labelAdditionalColor = new Label();
+            labelBodyColor = new Label();
+            pictureBoxObject = new PictureBox();
+            groupBoxConfig.SuspendLayout();
+            groupBoxColors.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit();
+            panelObject.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit();
+            SuspendLayout();
+            // 
+            // groupBoxConfig
+            // 
+            groupBoxConfig.Controls.Add(groupBoxColors);
+            groupBoxConfig.Controls.Add(checkBoxCistern);
+            groupBoxConfig.Controls.Add(checkBoxSignalBeacon);
+            groupBoxConfig.Controls.Add(numericUpDownWeight);
+            groupBoxConfig.Controls.Add(labelWeight);
+            groupBoxConfig.Controls.Add(numericUpDownSpeed);
+            groupBoxConfig.Controls.Add(labelSpeed);
+            groupBoxConfig.Controls.Add(labelModifiedObject);
+            groupBoxConfig.Controls.Add(labelSimpleObject);
+            groupBoxConfig.Dock = DockStyle.Left;
+            groupBoxConfig.Location = new Point(0, 0);
+            groupBoxConfig.Name = "groupBoxConfig";
+            groupBoxConfig.Size = new Size(527, 240);
+            groupBoxConfig.TabIndex = 0;
+            groupBoxConfig.TabStop = false;
+            groupBoxConfig.Text = "Параметры";
+            // 
+            // groupBoxColors
+            // 
+            groupBoxColors.Controls.Add(panelWhite);
+            groupBoxColors.Controls.Add(panelPurple);
+            groupBoxColors.Controls.Add(panelGrey);
+            groupBoxColors.Controls.Add(panelBlack);
+            groupBoxColors.Controls.Add(panelYellow);
+            groupBoxColors.Controls.Add(panelBlue);
+            groupBoxColors.Controls.Add(panelGreen);
+            groupBoxColors.Controls.Add(panelRed);
+            groupBoxColors.Location = new Point(287, 22);
+            groupBoxColors.Name = "groupBoxColors";
+            groupBoxColors.Size = new Size(226, 106);
+            groupBoxColors.TabIndex = 8;
+            groupBoxColors.TabStop = false;
+            groupBoxColors.Text = "Цвета";
+            // 
+            // panelWhite
+            // 
+            panelWhite.BackColor = Color.White;
+            panelWhite.Location = new Point(6, 67);
+            panelWhite.Name = "panelWhite";
+            panelWhite.Size = new Size(33, 33);
+            panelWhite.TabIndex = 7;
+            // 
+            // panelPurple
+            // 
+            panelPurple.BackColor = Color.Purple;
+            panelPurple.Location = new Point(175, 67);
+            panelPurple.Name = "panelPurple";
+            panelPurple.Size = new Size(33, 33);
+            panelPurple.TabIndex = 6;
+            // 
+            // panelGrey
+            // 
+            panelGrey.BackColor = Color.Gray;
+            panelGrey.Location = new Point(58, 67);
+            panelGrey.Name = "panelGrey";
+            panelGrey.Size = new Size(33, 33);
+            panelGrey.TabIndex = 5;
+            // 
+            // panelBlack
+            // 
+            panelBlack.BackColor = Color.Black;
+            panelBlack.Location = new Point(116, 67);
+            panelBlack.Name = "panelBlack";
+            panelBlack.Size = new Size(33, 33);
+            panelBlack.TabIndex = 4;
+            // 
+            // panelYellow
+            // 
+            panelYellow.BackColor = Color.Yellow;
+            panelYellow.Location = new Point(175, 22);
+            panelYellow.Name = "panelYellow";
+            panelYellow.Size = new Size(33, 33);
+            panelYellow.TabIndex = 3;
+            // 
+            // panelBlue
+            // 
+            panelBlue.BackColor = Color.Blue;
+            panelBlue.Location = new Point(116, 22);
+            panelBlue.Name = "panelBlue";
+            panelBlue.Size = new Size(33, 33);
+            panelBlue.TabIndex = 2;
+            // 
+            // panelGreen
+            // 
+            panelGreen.BackColor = Color.Green;
+            panelGreen.Location = new Point(58, 22);
+            panelGreen.Name = "panelGreen";
+            panelGreen.Size = new Size(33, 33);
+            panelGreen.TabIndex = 1;
+            // 
+            // panelRed
+            // 
+            panelRed.BackColor = Color.Red;
+            panelRed.Location = new Point(6, 22);
+            panelRed.Name = "panelRed";
+            panelRed.Size = new Size(33, 33);
+            panelRed.TabIndex = 0;
+            // 
+            // checkBoxCistern
+            // 
+            checkBoxCistern.AutoSize = true;
+            checkBoxCistern.Location = new Point(12, 165);
+            checkBoxCistern.Name = "checkBoxCistern";
+            checkBoxCistern.Size = new Size(180, 19);
+            checkBoxCistern.TabIndex = 7;
+            checkBoxCistern.Text = "Признак наличия цистерны";
+            checkBoxCistern.UseVisualStyleBackColor = true;
+            // 
+            // checkBoxSignalBeacon
+            // 
+            checkBoxSignalBeacon.AutoSize = true;
+            checkBoxSignalBeacon.Location = new Point(12, 132);
+            checkBoxSignalBeacon.Name = "checkBoxSignalBeacon";
+            checkBoxSignalBeacon.Size = new Size(239, 19);
+            checkBoxSignalBeacon.TabIndex = 6;
+            checkBoxSignalBeacon.Text = "Признак наличия сигнального маячка";
+            checkBoxSignalBeacon.UseVisualStyleBackColor = true;
+            // 
+            // numericUpDownWeight
+            // 
+            numericUpDownWeight.Location = new Point(80, 87);
+            numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownWeight.Name = "numericUpDownWeight";
+            numericUpDownWeight.Size = new Size(85, 23);
+            numericUpDownWeight.TabIndex = 5;
+            numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelWeight
+            // 
+            labelWeight.AutoSize = true;
+            labelWeight.Location = new Point(12, 87);
+            labelWeight.Name = "labelWeight";
+            labelWeight.Size = new Size(29, 15);
+            labelWeight.TabIndex = 4;
+            labelWeight.Text = "Вес:";
+            // 
+            // numericUpDownSpeed
+            // 
+            numericUpDownSpeed.Location = new Point(80, 51);
+            numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
+            numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 });
+            numericUpDownSpeed.Name = "numericUpDownSpeed";
+            numericUpDownSpeed.Size = new Size(85, 23);
+            numericUpDownSpeed.TabIndex = 3;
+            numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 });
+            // 
+            // labelSpeed
+            // 
+            labelSpeed.AutoSize = true;
+            labelSpeed.Location = new Point(12, 51);
+            labelSpeed.Name = "labelSpeed";
+            labelSpeed.Size = new Size(62, 15);
+            labelSpeed.TabIndex = 2;
+            labelSpeed.Text = "Скорость:";
+            // 
+            // labelModifiedObject
+            // 
+            labelModifiedObject.BorderStyle = BorderStyle.FixedSingle;
+            labelModifiedObject.Location = new Point(403, 146);
+            labelModifiedObject.Name = "labelModifiedObject";
+            labelModifiedObject.Size = new Size(110, 38);
+            labelModifiedObject.TabIndex = 1;
+            labelModifiedObject.Text = "Продвинутый";
+            labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelModifiedObject.MouseDown += labelObject_MouseDown;
+            // 
+            // labelSimpleObject
+            // 
+            labelSimpleObject.BorderStyle = BorderStyle.FixedSingle;
+            labelSimpleObject.Location = new Point(287, 146);
+            labelSimpleObject.Name = "labelSimpleObject";
+            labelSimpleObject.Size = new Size(110, 38);
+            labelSimpleObject.TabIndex = 0;
+            labelSimpleObject.Text = "Простой";
+            labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter;
+            labelSimpleObject.MouseDown += labelObject_MouseDown;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(549, 187);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(106, 41);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
+            // buttonCancel
+            // 
+            buttonCancel.Location = new Point(676, 187);
+            buttonCancel.Name = "buttonCancel";
+            buttonCancel.Size = new Size(106, 41);
+            buttonCancel.TabIndex = 3;
+            buttonCancel.Text = "Отмена";
+            buttonCancel.UseVisualStyleBackColor = true;
+            // 
+            // panelObject
+            // 
+            panelObject.AllowDrop = true;
+            panelObject.Controls.Add(labelAdditionalColor);
+            panelObject.Controls.Add(labelBodyColor);
+            panelObject.Controls.Add(pictureBoxObject);
+            panelObject.Location = new Point(533, 10);
+            panelObject.Name = "panelObject";
+            panelObject.Size = new Size(265, 171);
+            panelObject.TabIndex = 4;
+            panelObject.DragDrop += PanelObject_DragDrop;
+            panelObject.DragEnter += PanelObject_DragEnter;
+            // 
+            // labelAdditionalColor
+            // 
+            labelAdditionalColor.AllowDrop = true;
+            labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
+            labelAdditionalColor.Location = new Point(143, 12);
+            labelAdditionalColor.Name = "labelAdditionalColor";
+            labelAdditionalColor.Size = new Size(106, 26);
+            labelAdditionalColor.TabIndex = 11;
+            labelAdditionalColor.Text = "Доп. цвет";
+            labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop;
+            labelAdditionalColor.DragEnter += labelColor_DragEnter;
+            // 
+            // labelBodyColor
+            // 
+            labelBodyColor.AllowDrop = true;
+            labelBodyColor.BorderStyle = BorderStyle.FixedSingle;
+            labelBodyColor.Location = new Point(16, 12);
+            labelBodyColor.Name = "labelBodyColor";
+            labelBodyColor.Size = new Size(106, 26);
+            labelBodyColor.TabIndex = 10;
+            labelBodyColor.Text = "Цвет";
+            labelBodyColor.TextAlign = ContentAlignment.MiddleCenter;
+            labelBodyColor.DragDrop += labelBodyColor_DragDrop;
+            labelBodyColor.DragEnter += labelColor_DragEnter;
+            // 
+            // pictureBoxObject
+            // 
+            pictureBoxObject.Location = new Point(16, 41);
+            pictureBoxObject.Name = "pictureBoxObject";
+            pictureBoxObject.Size = new Size(233, 127);
+            pictureBoxObject.TabIndex = 9;
+            pictureBoxObject.TabStop = false;
+            // 
+            // FormTankerConfig
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(809, 240);
+            Controls.Add(panelObject);
+            Controls.Add(buttonCancel);
+            Controls.Add(buttonAdd);
+            Controls.Add(groupBoxConfig);
+            Name = "FormTankerConfig";
+            Text = "Создание объекта";
+            groupBoxConfig.ResumeLayout(false);
+            groupBoxConfig.PerformLayout();
+            groupBoxColors.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit();
+            ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit();
+            panelObject.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private GroupBox groupBoxConfig;
+        private Label labelSimpleObject;
+        private Label labelModifiedObject;
+        private NumericUpDown numericUpDownSpeed;
+        private Label labelSpeed;
+        private NumericUpDown numericUpDownWeight;
+        private Label labelWeight;
+        private CheckBox checkBoxSignalBeacon;
+        private CheckBox checkBoxCistern;
+        private GroupBox groupBoxColors;
+        private Panel panelRed;
+        private Panel panelGreen;
+        private Panel panelYellow;
+        private Panel panelBlue;
+        private Panel panelWhite;
+        private Panel panelPurple;
+        private Panel panelGrey;
+        private Panel panelBlack;
+        private Button buttonAdd;
+        private Button buttonCancel;
+        private Panel panelObject;
+        private PictureBox pictureBoxObject;
+        private Label labelAdditionalColor;
+        private Label labelBodyColor;
+    }
+}

GasolineTanker/GasolineTanker/FormTankerConfig.cs

@@ -0,0 +1,199 @@
+using GasolineTanker.Drawnings;
+using GasolineTanker.Entities;
+
+namespace GasolineTanker;
+
+/// <summary>
+/// Форма конфигурации объекта
+/// </summary>
+public partial class FormTankerConfig : Form
+{
+    /// <summary>
+	/// Объект - прорисовка грузовика
+	/// </summary>
+	private DrawningTanker? _tanker;
+
+    /// <summary>
+	/// Событие
+	/// </summary>
+
+    private event Action<DrawningTanker>? EventAddTanker;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public FormTankerConfig()
+    {
+        InitializeComponent();
+        panelRed.MouseDown += Panel_MouseDown;
+        panelGreen.MouseDown += Panel_MouseDown;
+        panelBlue.MouseDown += Panel_MouseDown;
+        panelYellow.MouseDown += Panel_MouseDown;
+        panelWhite.MouseDown += Panel_MouseDown;
+        panelGrey.MouseDown += Panel_MouseDown;
+        panelBlack.MouseDown += Panel_MouseDown;
+        panelPurple.MouseDown += Panel_MouseDown;
+
+        buttonCancel.Click += (sender, e) => Close();       
+    }    
+
+    /// <summary>
+	/// Прорисовка объекта
+	/// </summary>
+	private void DrawObject()
+    {
+        Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
+        Graphics gr = Graphics.FromImage(bmp);
+        _tanker?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
+        _tanker?.SetPosition(15, 15);
+        _tanker?.DrawTransport(gr);
+        pictureBoxObject.Image = bmp;
+    }
+
+    /// <summary>
+	/// Передаем информацию при нажатии на Label
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+
+    private void labelObject_MouseDown(object sender, MouseEventArgs e)
+    {
+        var label = sender as Label;
+        label?.DoDragDrop(label.Name, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+	/// Проверка получаемой информации (ее типа на соответствие требуемому)
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+
+    private void PanelObject_DragEnter(object sender, DragEventArgs e)
+    {
+        if (e.Data?.GetDataPresent(DataFormats.Text) ?? false)
+        {
+            e.Effect = DragDropEffects.Copy;
+        }
+        else
+        {
+            e.Effect = DragDropEffects.None;
+        }
+    }
+
+    /// <summary>
+	/// Действия при приеме перетаскиваемой информации
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+    private void PanelObject_DragDrop(object sender, DragEventArgs e)
+    {
+        switch (e.Data?.GetData(DataFormats.Text)?.ToString())
+        {
+            case "labelSimpleObject":
+                _tanker = new DrawningTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White);
+                break;
+            case "labelModifiedObject":
+                _tanker = new DrawningGasolineTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White,
+                    Color.Black, checkBoxSignalBeacon.Checked, checkBoxCistern.Checked);
+                break;
+        }
+        DrawObject();
+    }
+
+    /// <summary>
+	/// Передаем информацию при нажатии на Panel
+	/// </summary>
+	/// <param name="sender"></param>
+	/// <param name="e"></param>
+
+    private void Panel_MouseDown(object? sender, MouseEventArgs e)
+    {
+        var panel = sender as Panel;
+        panel?.DoDragDrop(panel.BackColor, DragDropEffects.Move | DragDropEffects.Copy);
+    }
+
+    /// <summary>
+    /// Проверка получаемой информации (ее типа на соответствие требуемому)
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void labelColor_DragEnter(object? sender, DragEventArgs e)
+    {
+        if (e.Data?.GetDataPresent(typeof(Color)) ?? false)
+        {
+            e.Effect = DragDropEffects.Copy;
+        }
+        else
+        {
+            e.Effect = DragDropEffects.None;
+        }
+    }
+
+    /// <summary>
+    /// Перекраска базового цвета
+    /// </summary>
+    private void labelBodyColor_DragDrop(object? sender, DragEventArgs e)
+    {
+        if (_tanker == null)
+        {
+            return;
+        }
+        _tanker.EntityTanker?.SetBodyColor((Color)e.Data?.GetData(typeof(Color)));
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Перекраска дополнительного цвета
+    /// </summary>
+
+    private void labelAdditionalColor_DragDrop(object? sender, DragEventArgs e)
+    {
+        if (_tanker == null)
+        {
+            return;
+        }
+
+        Color addColor = (Color)e.Data?.GetData(typeof(Color));
+        if (_tanker is DrawningGasolineTanker)
+        {
+            EntityGasolineTanker? _gasolineTanker = _tanker.EntityTanker as EntityGasolineTanker;
+            _gasolineTanker?.SetAdditionalColor(addColor);
+        }
+        else
+        {
+            MessageBox.Show("Нельзя задать доп. цвет обычному объекту");
+        }
+        DrawObject();
+    }
+
+    /// <summary>
+    /// Добавление события
+    /// </summary>
+    /// <param name="ev">Привязанный метод</param>
+    public void AddEvent(Action<DrawningTanker> ev)
+    {
+        if (EventAddTanker == null)
+        {
+            EventAddTanker = ev;
+        }
+        else
+        {
+            EventAddTanker += ev;
+        }
+    }
+
+    /// <summary>
+    /// Передача объекта
+    /// </summary>
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+
+    private void ButtonAdd_Click(object sender, EventArgs e)
+    {
+        if (_tanker != null)
+        {
+            EventAddTanker?.Invoke(_tanker);
+            Close();
+        }
+    }
+}

GasolineTanker/GasolineTanker/FormTankerConfig.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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/GasolineTanker.csproj

@@ -8,4 +8,31 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

GasolineTanker/GasolineTanker/MovementStrategy/AbstractStrategy.cs

@@ -0,0 +1,139 @@
+namespace GasolineTanker.MovementStrategy;
+
+/// <summary>
+/// Класс-стратегия перемещения объекта
+/// </summary>
+public abstract class AbstractStrategy
+{
+    /// <summary>
+    /// Перемещаемый объект
+    /// </summary>
+    private IMoveableObject? _moveableObject;
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    private StrategyStatus _state = StrategyStatus.NotInit;
+
+    /// <summary>
+    /// Ширина поля
+    /// </summary>
+    protected int FieldWidth { get; private set; }
+
+    /// <summary>
+    /// Высота поля
+    /// </summary>
+    protected int FieldHeight { get; private set; }
+
+    /// <summary>
+    /// Статус перемещения
+    /// </summary>
+    public StrategyStatus GetStatus() { return _state; }
+
+    /// <summary>
+    /// Установка данных
+    /// </summary>
+    /// <param name="moveableObject">Перемещаемый объект</param>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    public void SetData(IMoveableObject moveableObject, int width, int height)
+    {
+        if (moveableObject == null)
+        {
+            _state = StrategyStatus.NotInit;
+            return;
+        }
+
+        _state = StrategyStatus.InProgress;
+        _moveableObject = moveableObject;
+        FieldWidth = width;
+        FieldHeight = height;
+    }
+
+    /// <summary>
+    /// Шаг перемещения
+    /// </summary>
+    public void MakeStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return;
+        }
+
+        if (IsTargetDestinaion())
+        {
+            _state = StrategyStatus.Finish;
+            return;
+        }
+
+        MoveToTarget();
+    }
+
+    /// <summary>
+    /// Перемещение влево
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveLeft() => MoveTo(MovementDirection.Left);
+
+    /// <summary>
+    /// Перемещение вправо
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveRight() => MoveTo(MovementDirection.Right);
+
+    /// <summary>
+    /// Перемещение вверх
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveUp() => MoveTo(MovementDirection.Up);
+
+    /// <summary>
+    /// Перемещение вниз
+    /// </summary>
+    /// <returns>Результат перемещения (true - удалось переместиться, false - неудача)</returns>
+    protected bool MoveDown() => MoveTo(MovementDirection.Down);
+
+    /// <summary>
+    /// Параметры объекта
+    /// </summary>
+    protected ObjectParameters? GetObjectParameters => _moveableObject?.GetObjectPosition;
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    /// <returns></returns>
+    protected int? GetStep()
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return null;
+        }
+        return _moveableObject?.GetStep;
+    }
+
+    /// <summary>
+    /// Перемещение к цели
+    /// </summary>
+    protected abstract void MoveToTarget();
+
+    /// <summary>
+    /// Достигнута ли цель
+    /// </summary>
+    /// <returns></returns>
+    protected abstract bool IsTargetDestinaion();
+
+    /// <summary>
+    /// Попытка перемещения в требуемом направлении
+    /// </summary>
+    /// <param name="movementDirection">Направление</param>
+    /// <returns>Результат попытки (true - удалось переместиться, false - неудача)</returns>
+    private bool MoveTo(MovementDirection movementDirection)
+    {
+        if (_state != StrategyStatus.InProgress)
+        {
+            return false;
+        }
+
+        return _moveableObject?.TryMoveObject(movementDirection) ?? false;
+    }
+}

GasolineTanker/GasolineTanker/MovementStrategy/IMoveableObject.cs

@@ -0,0 +1,24 @@
+namespace GasolineTanker.MovementStrategy;
+
+/// <summary>
+/// Интерфейс для работы с перемещаемым объектом
+/// </summary>
+public interface IMoveableObject
+{
+    /// <summary>
+    /// Получение координаты объекта
+    /// </summary>
+    ObjectParameters? GetObjectPosition { get; }
+
+    /// <summary>
+    /// Шаг объекта
+    /// </summary>
+    int GetStep { get; }
+
+    /// <summary>
+    /// Попытка переместить объект в указанном направлении
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - объект перемещен, false - перемещение невозможно</returns>
+    bool TryMoveObject(MovementDirection direction);
+}

GasolineTanker/GasolineTanker/MovementStrategy/MoveToBorder.cs

@@ -0,0 +1,42 @@
+namespace GasolineTanker.MovementStrategy;
+
+public class MoveToBorder : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = FieldWidth;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = FieldHeight;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveDown();
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/MovementStrategy/MoveToCenter.cs

@@ -0,0 +1,51 @@
+namespace GasolineTanker.MovementStrategy;
+
+internal class MoveToCenter : AbstractStrategy
+{
+    protected override bool IsTargetDestinaion()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return false;
+        }
+
+        return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 &&
+            objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2;
+    }
+
+    protected override void MoveToTarget()
+    {
+        ObjectParameters? objParams = GetObjectParameters;
+        if (objParams == null)
+        {
+            return;
+        }
+
+        int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2;
+        if (Math.Abs(diffX) > GetStep())
+        {
+            if (diffX > 0)
+            {
+                MoveLeft();
+            }
+            else
+            {
+                MoveRight();
+            }
+        }
+
+        int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2;
+        if (Math.Abs(diffY) > GetStep())
+        {
+            if (diffY > 0)
+            {
+                MoveUp();
+            }
+            else
+            {
+                MoveDown();
+            }
+        }
+    }
+}

GasolineTanker/GasolineTanker/MovementStrategy/MoveableTanker.cs

@@ -0,0 +1,64 @@
+using GasolineTanker.Drawnings;
+
+namespace GasolineTanker.MovementStrategy;
+
+/// <summary>
+/// Класс-реализация IMoveableObject с использованием DrawningTanker
+/// </summary>
+public class MoveableTanker : IMoveableObject
+{
+    /// <summary>
+    /// Поле-объект класса DrawningTanker или его наследника
+    /// </summary>
+    private readonly DrawningTanker? _tanker = null;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="tanker">Объект класса DrawningTanker</param>
+    public MoveableTanker(DrawningTanker tanker)
+    {
+        _tanker = tanker;
+    }
+
+    public ObjectParameters? GetObjectPosition
+    {
+        get
+        {
+            if (_tanker == null || _tanker.EntityTanker == null || !_tanker.GetPosX.HasValue || !_tanker.GetPosY.HasValue)
+            {
+                return null;
+            }
+            return new ObjectParameters(_tanker.GetPosX.Value, _tanker.GetPosY.Value, _tanker.GetWidth, _tanker.GetHeight);
+        }
+    }
+
+    public int GetStep => (int)(_tanker?.EntityTanker?.Step ?? 0);
+
+    public bool TryMoveObject(MovementDirection direction)
+    {
+        if (_tanker == null || _tanker.EntityTanker == null)
+        {
+            return false;
+        }
+
+        return _tanker.MoveTransport(GetDirectionType(direction));
+    }
+
+    /// <summary>
+    /// Конвертация из MovementDirection в DirectionType
+    /// </summary>
+    /// <param name="direction">MovementDirection</param>
+    /// <returns>DirectionType</returns>
+    private static DirectionType GetDirectionType(MovementDirection direction)
+    {
+        return direction switch
+        {
+            MovementDirection.Left => DirectionType.Left,
+            MovementDirection.Right => DirectionType.Right,
+            MovementDirection.Up => DirectionType.Up,
+            MovementDirection.Down => DirectionType.Down,
+            _ => DirectionType.Unknow,
+        };
+    }
+}

GasolineTanker/GasolineTanker/MovementStrategy/MovementDirection.cs

@@ -0,0 +1,27 @@
+namespace GasolineTanker.MovementStrategy;
+
+/// <summary>
+/// Направление перемещения
+/// </summary>
+public enum MovementDirection
+{
+    /// <summary>
+    /// Вверх
+    /// </summary>
+    Up = 1,
+
+    /// <summary>
+    /// Вниз
+    /// </summary>
+    Down = 2,
+
+    /// <summary>
+    /// Влево
+    /// </summary>
+    Left = 3,
+
+    /// <summary>
+    /// Вправо
+    /// </summary>
+    Right = 4
+}

GasolineTanker/GasolineTanker/MovementStrategy/ObjectParameters.cs

@@ -0,0 +1,72 @@
+namespace GasolineTanker.MovementStrategy;
+
+/// <summary>
+/// Параметры-координаты объекта
+/// </summary>
+public class ObjectParameters
+{
+    /// <summary>
+    /// Координата X
+    /// </summary>
+    private readonly int _x;
+
+    /// <summary>
+    /// Координата Y
+    /// </summary>
+    private readonly int _y;
+
+    /// <summary>
+    /// Ширина объекта
+    /// </summary>
+    private readonly int _width;
+
+    /// <summary>
+    /// Высота объекта
+    /// </summary>
+    private readonly int _height;
+
+    /// <summary>
+    /// Левая граница
+    /// </summary>
+    public int LeftBorder => _x;
+
+    /// <summary>
+    /// Верхняя граница
+    /// </summary>
+    public int TopBorder => _y;
+
+    /// <summary>
+    /// Правая граница
+    /// </summary>
+    public int RightBorder => _x + _width;
+
+    /// <summary>
+    /// Нижняя граница
+    /// </summary>
+    public int DownBorder => _y + _height;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleHorizontal => _x + _width / 2;
+
+    /// <summary>
+    /// Середина объекта
+    /// </summary>
+    public int ObjectMiddleVertical => _y + _height / 2;
+
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    /// <param name="width">Ширина объекта</param>
+    /// <param name="height">Высота объекта</param>
+    public ObjectParameters(int x, int y, int width, int height)
+    {
+        _x = x;
+        _y = y;
+        _width = width;
+        _height = height;
+    }
+}

GasolineTanker/GasolineTanker/MovementStrategy/StrategyStatus.cs

@@ -0,0 +1,22 @@
+namespace GasolineTanker.MovementStrategy;
+
+/// <summary>
+/// Статус выполнения операции перемещения
+/// </summary>
+public enum StrategyStatus
+{
+    /// <summary>
+    /// Все готово к началу
+    /// </summary>
+    NotInit,
+
+    /// <summary>
+    /// Выполняется
+    /// </summary>
+    InProgress,
+
+    /// <summary>
+    /// Завершено
+    /// </summary>
+    Finish
+}

GasolineTanker/GasolineTanker/Program.cs

@@ -1,3 +1,7 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Extensions.Logging;
+
 namespace GasolineTanker
 {
     internal static class Program
@@ -11,7 +15,25 @@ 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());
+
+            ServiceCollection services = new();
+            ConfigureServices(services);
+            using ServiceProvider serviceProvider = services.BuildServiceProvider();
+            Application.Run(serviceProvider.GetRequiredService<FormTankerCollection>());
+        }
+
+        /// <summary>
+		/// Configuration of DI service
+		/// </summary>
+		/// <param name="services"></param>
+		private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddSingleton<FormTankerCollection>()
+                    .AddLogging(option =>
+                    {
+                        option.SetMinimumLevel(LogLevel.Information);
+                        option.AddNLog("nlog.config");
+                    });
         }
     }
 }

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

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <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>
+  <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/nlog.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        autoReload="true" internalLogLevel="Info">
+
+		<targets>
+			<target xsi:type="File" name="tofile" fileName="carlog-${shortdate}.log" />
+		</targets>
+
+		<rules>
+			<logger name="*" minlevel="Debug" writeTo="tofile" />
+		</rules>
+	</nlog>
+</configuration>