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
/// Признак наличия второго этажа
/// Признак наличия полосы
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 = "Простая карта";
}
///
/// Заполнение информации по объекту