From 0e4164f751eb4168e19ab09ad31ece97292d73cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=B0=D1=82=20=D0=97=D0=B0=D1=80=D0=B3?=
 =?UTF-8?q?=D0=B0=D1=80=D0=BE=D0=B2?= <maratzargarov@mail.ru>
Date: Wed, 16 Nov 2022 09:56:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D0=B5=D1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DoubleDeckerBus/DrawningDoubleDeckerBus.cs         |  2 +-
 DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs   | 10 +---------
 DoubleDeckerBus/DoubleDeckerBus/FormMap.cs             |  3 ++-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs
index bd7a924..065f1b4 100644
--- a/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs
+++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningDoubleDeckerBus.cs
@@ -19,7 +19,7 @@ namespace DoubleDeckerBus
         /// <param name="secondFloor">Признак наличия второго этажа</param>
         /// <param name="line">Признак наличия полосы</param>
         public DrawningDoubleDeckerBus(int speed, float weight, Color bodyColor, Color dopColor, bool secondFloor, bool bodyKit, bool stair) :
-        base(speed, weight, bodyColor, 115, 100)
+        base(speed, weight, bodyColor, 120, 92)
         {
             Bus = new EntityDoubleDeckerBus(speed, weight, bodyColor, dopColor, secondFloor, bodyKit, stair);
         }
diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs
index 906fba3..51a06b5 100644
--- a/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs
+++ b/DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs
@@ -28,15 +28,7 @@ namespace DoubleDeckerBus
         }
         public void DrawningObject(Graphics g)
         {
-            if (_bus == null) return;
-            if (_bus is DrawningDoubleDeckerBus doubleDeckerBus)
-            {
-                doubleDeckerBus.DrawTransport(g);
-            }
-            else
-            {
-                _bus.DrawTransport(g);
-            }
+            _bus.DrawTransport(g);
         }
 
     }
diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs
index ea2921e..94e2deb 100644
--- a/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs
+++ b/DoubleDeckerBus/DoubleDeckerBus/FormMap.cs
@@ -16,7 +16,8 @@ namespace DoubleDeckerBus
         public FormMap()
         {
             InitializeComponent();
-            _abstractMap = new MyMap();
+            _abstractMap = new SimpleMap();
+            comboBoxSelectorMap.Text = "Простая карта";
         }
         /// <summary>
         /// Заполнение информации по объекту