Skip to content

Commit

Permalink
Updating #20 based on comment from Claas
Browse files Browse the repository at this point in the history
  • Loading branch information
tomarnepedersen committed Jan 11, 2024
1 parent fc9d6e8 commit 98bb5ae
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions src/trafficgen/check_land_crossing.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

from global_land_mask import globe

from .marine_system_simulator import flat2llh
from .types import Position
from .utils import calculate_position_at_certain_time, deg_2_rad, rad_2_deg
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


def path_crosses_land(
Expand Down
6 changes: 3 additions & 3 deletions src/trafficgen/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import click
import click_log

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
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

logger = logging.getLogger(__name__)
_ = click_log.basic_config(logger)
Expand Down
8 changes: 4 additions & 4 deletions src/trafficgen/encounter.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

import numpy as np

from .check_land_crossing import path_crosses_land
from .marine_system_simulator import flat2llh
from .types import (
from trafficgen.check_land_crossing import path_crosses_land
from trafficgen.marine_system_simulator import flat2llh
from trafficgen.types import (
EncounterRelativeSpeed,
EncounterSettings,
EncounterType,
Expand All @@ -20,7 +20,7 @@
Ship,
TargetShip,
)
from .utils import (
from trafficgen.utils import (
calculate_position_at_certain_time,
convert_angle_minus_180_to_180_to_0_to_360,
deg_2_rad,
Expand Down
6 changes: 3 additions & 3 deletions src/trafficgen/ship_traffic_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
from pathlib import Path
from typing import List, Union

from .encounter import (
from trafficgen.encounter import (
generate_encounter,
update_position_data_own_ship,
)
from .read_files import (
from trafficgen.read_files import (
read_encounter_settings_file,
read_own_ship_file,
read_situation_files,
read_target_ship_files,
)
from .types import Encounter, EncounterSettings, Ship, Situation, TargetShip
from trafficgen.types import Encounter, EncounterSettings, Ship, Situation, TargetShip


def generate_traffic_situations(
Expand Down

0 comments on commit 98bb5ae

Please sign in to comment.