From ecd073e31def6a6373dd124aa924aa5dba9aa46e Mon Sep 17 00:00:00 2001
From: walterroach <37820425+walterroach@users.noreply.github.com>
Date: Mon, 16 Nov 2020 22:01:49 -0600
Subject: [PATCH] typing and comment cleanup

---
 gen/armor.py                        |  7 +++----
 qt_ui/widgets/map/QLiberationMap.py | 10 +++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gen/armor.py b/gen/armor.py
index 8c6c6d6b..0e504021 100644
--- a/gen/armor.py
+++ b/gen/armor.py
@@ -460,7 +460,7 @@ class GroundConflictGenerator:
 
     def get_valid_position_for_group(self, conflict_position, isplayer, combat_width, distance_from_frontline):
         i = 0
-        while i < 1000: # 25 attempt for valid position
+        while i < 1000:
             heading_diff = -90 if isplayer else 90
             shifted = conflict_position[0].point_from_heading(self.conflict.heading,
                                                      random.randint((int)(-combat_width / 2), (int)(combat_width / 2)))
@@ -468,9 +468,8 @@ class GroundConflictGenerator:
 
             if self.conflict.theater.is_on_land(final_position):
                 return final_position
-            else:
-                i = i + 1
-                continue
+            i += 1
+            continue
         return None
 
     def _generate_group(self, side: Country, unit: VehicleType, count: int, at: Point, move_formation: PointAction = PointAction.OffRoad, heading=0):
diff --git a/qt_ui/widgets/map/QLiberationMap.py b/qt_ui/widgets/map/QLiberationMap.py
index b113eb17..04e2d5d6 100644
--- a/qt_ui/widgets/map/QLiberationMap.py
+++ b/qt_ui/widgets/map/QLiberationMap.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 import datetime
 import logging
 import math
-from typing import List, Optional, Tuple
+from typing import Iterable, List, Optional, Tuple, Iterator
 
 from PySide2.QtCore import QPointF, Qt
 from PySide2.QtGui import (
@@ -47,18 +47,18 @@ from theater.theatergroundobject import (
     TheaterGroundObject,
 )
 
-def binomial(i, n):
+def binomial(i: int, n: int) -> float:
     """Binomial coefficient"""
     return math.factorial(n) / float(
         math.factorial(i) * math.factorial(n - i))
 
 
-def bernstein(t, i, n):
+def bernstein(t: float, i: int, n: int) -> float:
     """Bernstein polynom"""
     return binomial(i, n) * (t ** i) * ((1 - t) ** (n - i))
 
 
-def bezier(t, points):
+def bezier(t: float, points: Iterable[Tuple[float, float]]) -> Tuple[float, float]:
     """Calculate coordinate of a point in the bezier curve"""
     n = len(points) - 1
     x = y = 0
@@ -69,7 +69,7 @@ def bezier(t, points):
     return x, y
 
 
-def bezier_curve_range(n, points):
+def bezier_curve_range(n: int, points: Iterable[Tuple[float, float]]) -> Iterator[Tuple[float, float]]:
     """Range of points in a curve bezier"""
     for i in range(n):
         t = i / float(n - 1)