Clean up utils into own submodules

mslib/mscolab/mscolab.py

@@ -37,7 +37,8 @@
 from mslib.mscolab.seed import seed_data, add_user, add_all_users_default_project,\
     add_all_users_to_all_projects, delete_user
 from mslib.mscolab.utils import create_files
-from mslib.utils import setup_logging, Worker, Updater
+from mslib.utils import setup_logging
+from mslib.msui.mss_qt import Worker, Updater
 
 
 def handle_start(args):

mslib/msui/_tests/test_updater.py

@@ -29,7 +29,7 @@
 from PyQt5 import QtWidgets, QtTest
 
 from mslib.msui.updater import UpdaterUI, Updater
-from mslib.utils import Worker
+from mslib.msui.mss_qt import Worker
 
 
 def no_conda(args=None, **named_args):
@@ -91,7 +91,7 @@ def teardown(self):
 
     @mock.patch("subprocess.Popen", new=SubprocessDifferentVersionMock)
     @mock.patch("subprocess.run", new=SubprocessDifferentVersionMock)
-    @mock.patch("mslib.utils.Worker.create", create_mock)
+    @mock.patch("mslib.msui.mss_qt.Worker.create", create_mock)
     def test_update_recognised(self):
         self.updater.run()
 
@@ -105,7 +105,7 @@ def test_update_recognised(self):
 
     @mock.patch("subprocess.Popen", new=SubprocessSameMock)
     @mock.patch("subprocess.run", new=SubprocessSameMock)
-    @mock.patch("mslib.utils.Worker.create", create_mock)
+    @mock.patch("mslib.msui.mss_qt.Worker.create", create_mock)
     def test_no_update(self):
         self.updater.run()
         assert self.status == "Your MSS is up to date."
@@ -114,7 +114,7 @@ def test_no_update(self):
 
     @mock.patch("subprocess.Popen", new=SubprocessDifferentVersionMock)
     @mock.patch("subprocess.run", new=SubprocessDifferentVersionMock)
-    @mock.patch("mslib.utils.Worker.create", create_mock)
+    @mock.patch("mslib.msui.mss_qt.Worker.create", create_mock)
     def test_update_failed(self):
         self.updater.run()
         assert self.updater.new_version == "999.999.999"
@@ -126,7 +126,7 @@ def test_update_failed(self):
 
     @mock.patch("subprocess.Popen", new=no_conda)
     @mock.patch("subprocess.run", new=no_conda)
-    @mock.patch("mslib.utils.Worker.create", create_mock)
+    @mock.patch("mslib.msui.mss_qt.Worker.create", create_mock)
     def test_no_conda(self):
         self.updater.run()
         assert self.updater.new_version is None and self.updater.old_version is None
@@ -135,7 +135,7 @@ def test_no_conda(self):
 
     @mock.patch("subprocess.Popen", new=no_conda)
     @mock.patch("subprocess.run", new=no_conda)
-    @mock.patch("mslib.utils.Worker.create", create_mock)
+    @mock.patch("mslib.msui.mss_qt.Worker.create", create_mock)
     def test_exception(self):
         self.updater.new_version = "999.999.999"
         self.updater.old_version = "999.999.999"
@@ -146,7 +146,7 @@ def test_exception(self):
     @mock.patch("subprocess.Popen", new=SubprocessSameMock)
     @mock.patch("subprocess.run", new=SubprocessSameMock)
     @mock.patch("PyQt5.QtWidgets.QMessageBox.information", return_value=QtWidgets.QMessageBox.Yes)
-    @mock.patch("mslib.utils.Worker.create", create_mock)
+    @mock.patch("mslib.msui.mss_qt.Worker.create", create_mock)
     def test_ui(self, mock):
         ui = UpdaterUI()
         ui.updater.on_update_available.emit("", "")

mslib/msui/airdata_dockwidget.py

@@ -27,7 +27,8 @@
 import pycountry
 from mslib.msui.mss_qt import ui_airdata_dockwidget as ui
 from PyQt5 import QtWidgets, QtCore
-from mslib.utils import save_settings_qsettings, load_settings_qsettings, _airspace_cache, update_airspace, get_airports
+from mslib.utils.config import save_settings_qsettings, load_settings_qsettings
+from mslib.utils.airdata import _airspace_cache, update_airspace, get_airports
 
 
 class AirdataDockwidget(QtWidgets.QWidget, ui.Ui_AirdataDockwidget):

mslib/msui/editor.py

@@ -30,12 +30,11 @@
 import logging
 import json
 
-from mslib.msui.mss_qt import get_open_filename, get_save_filename
+from mslib.msui.mss_qt import get_open_filename, get_save_filename, show_popup
 from mslib.msui.mss_qt import ui_configuration_editor_window as ui_conf
 from PyQt5 import QtWidgets, QtCore, QtGui
 from mslib.msui.constants import MSS_SETTINGS
 from mslib.msui.icons import icons
-from mslib.utils import show_popup
 from mslib.utils.config import MissionSupportSystemDefaultConfig as mss_default
 from mslib.utils.config import config_loader, dict_raise_on_duplicates_empty, merge_data
 

mslib/msui/flighttrack.py

@@ -44,10 +44,11 @@
 
 from PyQt5 import QtGui, QtCore, QtWidgets
 
-from mslib import utils, __version__
+from mslib import __version__
 from mslib.utils.units import units
-from mslib.utils import thermolib, find_location, save_settings_qsettings, load_settings_qsettings
-from mslib.utils.config import config_loader
+from mslib.utils.coordinate import find_location, path_points, get_distance
+from mslib.utils import thermolib
+from mslib.utils.config import config_loader, save_settings_qsettings, load_settings_qsettings
 from mslib.utils.config import MissionSupportSystemDefaultConfig as mss_default
 from mslib.msui.mss_qt import variant_to_string, variant_to_float
 from mslib.msui.performance_settings import DEFAULT_PERFORMANCE
@@ -255,7 +256,7 @@ def intermediate_points(self, numpoints=101, connection="greatcircle"):
         Returns lats, lons.
         """
         path = [[wp.lat, wp.lon, wp.utc_time] for wp in self.waypoints]
-        return utils.path_points(
+        return path_points(
             path, numpoints=numpoints, connection=connection)
 
     def headerData(self, section, orientation, role=QtCore.Qt.DisplayRole):
@@ -487,8 +488,8 @@ def get_duration_fuel(flightlevel0, flightlevel1, distance, weight, lastleg):
                 wp1.ascent_rate = 0
             else:
                 wp0 = waypoints[pos - 1]
-                wp1.distance_to_prev = utils.get_distance((wp0.lat, wp0.lon),
-                                                          (wp1.lat, wp1.lon))
+                wp1.distance_to_prev = get_distance((wp0.lat, wp0.lon),
+                                                    (wp1.lat, wp1.lon))
 
                 last = (pos - 1 == rows)
                 time, fuel = get_duration_fuel(
@@ -508,8 +509,8 @@ def get_duration_fuel(flightlevel0, flightlevel1, distance, weight, lastleg):
         # Update the distance of the following waypoint as well.
         if pos < len(waypoints) - 1:
             wp2 = waypoints[pos + 1]
-            wp2.distance_to_prev = utils.get_distance((wp1.lat, wp1.lon),
-                                                      (wp2.lat, wp2.lon))
+            wp2.distance_to_prev = get_distance((wp1.lat, wp1.lon),
+                                                (wp2.lat, wp2.lon))
             if wp2.leg_time != 0:
                 wp2.ascent_rate = int((wp2.flightlevel - wp1.flightlevel) * 100 / (wp2.leg_time / 60))
             else:

mslib/msui/hexagon_dockwidget.py

@@ -30,7 +30,7 @@
 from PyQt5 import QtWidgets
 from mslib.msui.mss_qt import ui_hexagon_dockwidget as ui
 from mslib.msui import flighttrack as ft
-from mslib.utils import rotate_point
+from mslib.utils.coordinate import rotate_point
 from mslib.utils.config import config_loader
 
 

mslib/msui/kmloverlay_dockwidget.py

@@ -35,7 +35,7 @@
 from mslib.msui.mss_qt import get_open_filenames, get_save_filename
 from mslib.msui.mss_qt import ui_kmloverlay_dockwidget as ui
 from PyQt5 import QtGui, QtWidgets, QtCore
-from mslib.utils import save_settings_qsettings, load_settings_qsettings
+from mslib.utils.config import save_settings_qsettings, load_settings_qsettings
 
 
 class KMLPatch(object):

mslib/msui/linearview.py

@@ -25,8 +25,7 @@
     limitations under the License.
 """
 
-from mslib.utils import save_settings_qsettings, load_settings_qsettings
-from mslib.utils.config import config_loader
+from mslib.utils.config import config_loader, save_settings_qsettings, load_settings_qsettings
 from PyQt5 import QtGui, QtWidgets
 from mslib.msui.mss_qt import ui_linearview_window as ui
 from mslib.msui.mss_qt import ui_linearview_options as ui_opt

mslib/msui/mpl_map.py

@@ -49,7 +49,7 @@
     import pyproj
 
 from mslib.msui import mpl_pathinteractor as mpl_pi
-from mslib.utils import get_airports, get_airspaces
+from mslib.utils.airdata import get_airports, get_airspaces
 
 
 OPENAIP_NOTICE = "Airspace data used comes from openAIP.\n" \

mslib/msui/mpl_pathinteractor.py

@@ -52,7 +52,7 @@
 import matplotlib.patches as mpatches
 from PyQt5 import QtCore, QtWidgets
 
-from mslib.utils import get_distance, find_location, path_points, latlon_points
+from mslib.utils.coordinate import get_distance, find_location, path_points, latlon_points
 from mslib.utils.units import units
 from mslib.utils.thermolib import pressure2flightlevel
 from mslib.msui import flighttrack as ft

mslib/msui/mpl_qtwidget.py

@@ -43,7 +43,8 @@
 import matplotlib.backend_bases
 from PyQt5 import QtCore, QtWidgets, QtGui
 
-from mslib.utils import thermolib, FatalUserError, convert_pressure_to_vertical_axis_measure
+from mslib.utils.thermolib import convert_pressure_to_vertical_axis_measure
+from mslib.utils import thermolib, FatalUserError
 from mslib.utils.config import config_loader
 from mslib.utils.units import units
 from mslib.msui import mpl_pathinteractor as mpl_pi

mslib/msui/mscolab.py

@@ -50,15 +50,14 @@
 from mslib.msui import socket_control as sc
 
 from PyQt5 import QtCore, QtGui, QtWidgets
-from mslib.msui.mss_qt import get_open_filename, get_save_filename
+from mslib.msui.mss_qt import get_open_filename, get_save_filename, dropEvent, dragEnterEvent, show_popup
 from mslib.msui.mss_qt import ui_mscolab_help_dialog as msc_help_dialog
 from mslib.msui.mss_qt import ui_add_project_dialog as add_project_ui
 from mslib.msui.mss_qt import ui_mscolab_merge_waypoints_dialog as merge_wp_ui
 from mslib.msui.mss_qt import ui_mscolab_connect_dialog as ui_conn
 from mslib.msui.mss_qt import ui_mscolab_profile_dialog as ui_profile
-from mslib.utils import load_settings_qsettings, save_settings_qsettings, dropEvent, dragEnterEvent, show_popup
 from mslib.msui import constants
-from mslib.utils.config import config_loader
+from mslib.utils.config import config_loader, load_settings_qsettings, save_settings_qsettings
 
 
 class MSColab_ConnectDialog(QtWidgets.QDialog, ui_conn.Ui_MSColabConnectDialog):

mslib/msui/mscolab_admin_window.py

@@ -31,7 +31,7 @@
 
 from PyQt5 import QtCore, QtWidgets
 from mslib.msui.qt5 import ui_mscolab_admin_window as ui
-from mslib.utils import show_popup
+from mslib.msui.mss_qt import show_popup
 from mslib.utils.config import config_loader
 
 

mslib/msui/mscolab_project.py

@@ -34,9 +34,8 @@
 
 from mslib.mscolab.models import MessageType
 from PyQt5 import QtCore, QtGui, QtWidgets
-from mslib.msui.mss_qt import get_open_filename, get_save_filename
+from mslib.msui.mss_qt import get_open_filename, get_save_filename, show_popup
 from mslib.msui.qt5 import ui_mscolab_project_window as ui
-from mslib.utils import show_popup
 from mslib.utils.config import config_loader
 
 

mslib/msui/mscolab_version_history.py

@@ -34,8 +34,9 @@
 from mslib.msui.flighttrack import WaypointsTableModel
 from PyQt5 import QtCore, QtWidgets, QtGui
 from mslib.msui.qt5 import ui_mscolab_version_history as ui
-from mslib.utils import show_popup, utc_to_local_datetime
+from mslib.msui.mss_qt import show_popup
 from mslib.utils.config import config_loader
+from mslib.utils.time import utc_to_local_datetime
 
 
 class MSColabVersionHistory(QtWidgets.QMainWindow, ui.Ui_MscolabVersionHistory):

mslib/msui/mss_pyui.py

@@ -54,10 +54,10 @@
 from mslib.msui import wms_control
 from mslib.msui import mscolab
 from mslib.msui.updater import UpdaterUI
-from mslib.utils import setup_logging, Worker, Updater
+from mslib.utils import setup_logging
 from mslib.plugins.io.csv import load_from_csv, save_to_csv
 from mslib.msui.icons import icons, python_powered
-from mslib.msui.mss_qt import get_open_filename, get_save_filename
+from mslib.msui.mss_qt import get_open_filename, get_save_filename, Worker, Updater
 from mslib.utils.config import read_config_file, config_loader
 from PyQt5 import QtGui, QtCore, QtWidgets, QtTest