Working on #20. Removed cyclic import

src/trafficgen/__init__.py

@@ -1,81 +1,5 @@
-"""Top-level package for Traffic Generator."""
-from .ship_traffic_generator import generate_traffic_situations
+"""
+Top-level package for Traffic Generator.
 
-from .marine_system_simulator import flat2llh
-from .marine_system_simulator import llh2flat
-from .marine_system_simulator import ssa
-
-from .check_land_crossing import path_crosses_land
-
-from .write_traffic_situation_to_file import write_traffic_situations_to_json_file
-
-from .encounter import generate_encounter
-from .encounter import check_encounter_evolvement
-from .encounter import find_start_position_target_ship
-from .encounter import assign_future_position_to_target_ship
-from .encounter import determine_colreg
-from .encounter import calculate_relative_bearing
-from .encounter import calculate_ship_course
-from .encounter import assign_vector_time
-from .encounter import assign_speed_to_target_ship
-from .encounter import assign_beta
-from .encounter import update_position_data_target_ship
-from .encounter import update_position_data_own_ship
-from .encounter import decide_target_ship
-
-from .plot_traffic_situation import plot_traffic_situations
-from .plot_traffic_situation import plot_specific_traffic_situation
-
-from .read_files import read_situation_files
-from .read_files import read_own_ship_file
-from .read_files import read_target_ship_files
-from .read_files import read_encounter_settings_file
-
-
-from .utils import knot_2_m_pr_min
-from .utils import m_pr_min_2_knot
-from .utils import m2nm
-from .utils import nm_2_m
-from .utils import deg_2_rad
-from .utils import rad_2_deg
-from .utils import convert_angle_minus_180_to_180_to_0_to_360
-from .utils import convert_angle_0_to_360_to_minus_180_to_180
-from .utils import calculate_position_at_certain_time
-
-
-__all__ = [
-    "knot_2_m_pr_min",
-    "m_pr_min_2_knot",
-    "m2nm",
-    "nm_2_m",
-    "deg_2_rad",
-    "rad_2_deg",
-    "convert_angle_minus_180_to_180_to_0_to_360",
-    "convert_angle_0_to_360_to_minus_180_to_180",
-    "calculate_position_at_certain_time",
-    "flat2llh",
-    "llh2flat",
-    "ssa",
-    "path_crosses_land",
-    "write_traffic_situations_to_json_file",
-    "generate_encounter",
-    "check_encounter_evolvement",
-    "find_start_position_target_ship",
-    "assign_future_position_to_target_ship",
-    "determine_colreg",
-    "calculate_relative_bearing",
-    "calculate_ship_course",
-    "assign_vector_time",
-    "assign_speed_to_target_ship",
-    "assign_beta",
-    "generate_traffic_situations",
-    "update_position_data_own_ship",
-    "update_position_data_target_ship",
-    "decide_target_ship",
-    "read_situation_files",
-    "read_own_ship_file",
-    "read_target_ship_files",
-    "read_encounter_settings_file",
-    "plot_traffic_situations",
-    "plot_specific_traffic_situation",
-]
+Nothing exposed at the moment, but will be done if needed.
+"""

src/trafficgen/check_land_crossing.py

@@ -4,9 +4,9 @@
 
 from global_land_mask import globe
 
-from trafficgen.marine_system_simulator import flat2llh
-from trafficgen.types import Position
-from trafficgen.utils import calculate_position_at_certain_time, deg_2_rad, rad_2_deg
+from .marine_system_simulator import flat2llh
+from .types import Position
+from .utils import calculate_position_at_certain_time, deg_2_rad, rad_2_deg
 
 
 def path_crosses_land(

src/trafficgen/cli.py

@@ -12,9 +12,9 @@
 import click
 import click_log
 
-from trafficgen.plot_traffic_situation import plot_specific_traffic_situation, plot_traffic_situations
-from trafficgen.ship_traffic_generator import generate_traffic_situations
-from trafficgen.write_traffic_situation_to_file import write_traffic_situations_to_json_file
+from .plot_traffic_situation import plot_specific_traffic_situation, plot_traffic_situations
+from .ship_traffic_generator import generate_traffic_situations
+from .write_traffic_situation_to_file import write_traffic_situations_to_json_file
 
 logger = logging.getLogger(__name__)
 _ = click_log.basic_config(logger)

src/trafficgen/encounter.py

@@ -9,9 +9,9 @@
 
 import numpy as np
 
-from trafficgen.check_land_crossing import path_crosses_land
-from trafficgen.marine_system_simulator import flat2llh
-from trafficgen.types import (
+from .check_land_crossing import path_crosses_land
+from .marine_system_simulator import flat2llh
+from .types import (
     EncounterRelativeSpeed,
     EncounterSettings,
     EncounterType,
@@ -20,7 +20,7 @@
     Ship,
     TargetShip,
 )
-from trafficgen.utils import (
+from .utils import (
     calculate_position_at_certain_time,
     convert_angle_minus_180_to_180_to_0_to_360,
     deg_2_rad,

src/trafficgen/plot_traffic_situation.py

@@ -9,9 +9,9 @@
 from folium import Map, Polygon
 from matplotlib.patches import Circle
 
-from trafficgen.marine_system_simulator import flat2llh
-from trafficgen.types import Position, Ship, Situation, TargetShip
-from trafficgen.utils import deg_2_rad, knot_2_m_pr_min, m2nm, rad_2_deg
+from .marine_system_simulator import flat2llh
+from .types import Position, Ship, Situation, TargetShip
+from .utils import deg_2_rad, knot_2_m_pr_min, m2nm, rad_2_deg
 
 
 def calculate_vector_arrow(

src/trafficgen/read_files.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import List
 
-from trafficgen.types import EncounterSettings, Ship, Situation, TargetShip
+from .types import EncounterSettings, Ship, Situation, TargetShip
 
 
 def read_situation_files(situation_folder: Path) -> List[Situation]:

src/trafficgen/ship_traffic_generator.py

@@ -3,17 +3,17 @@
 from pathlib import Path
 from typing import List, Union
 
-from trafficgen.encounter import (
+from .encounter import (
     generate_encounter,
     update_position_data_own_ship,
 )
-from trafficgen.read_files import (
+from .read_files import (
     read_encounter_settings_file,
     read_own_ship_file,
     read_situation_files,
     read_target_ship_files,
 )
-from trafficgen.types import Encounter, EncounterSettings, Ship, Situation, TargetShip
+from .types import Encounter, EncounterSettings, Ship, Situation, TargetShip
 
 
 def generate_traffic_situations(

src/trafficgen/utils.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from trafficgen.types import Position
+from .types import Position
 
 
 def m_pr_min_2_knot(speed_in_m_pr_min: float) -> float:

src/trafficgen/write_traffic_situation_to_file.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import List
 
-from trafficgen.types import Situation
+from .types import Situation
 
 
 def write_traffic_situations_to_json_file(situations: List[Situation], write_folder: Path):