From 5dc2f23dc022d7d085d252a2abb8280df1ec5060 Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Tue, 3 Sep 2024 15:19:54 -0600
Subject: [PATCH] rename

---
 {feeder-mqtt => feeder}/README.md             |  0
 {feeder-mqtt => feeder}/lib/__init__.py       |  0
 {feeder-mqtt => feeder}/lib/cddis_fetch.py    |  0
 {feeder-mqtt => feeder}/lib/tecmap.py         | 21 ++++++++++---------
 {feeder-mqtt => feeder}/main.py               |  2 +-
 {feeder-mqtt => feeder}/requirements.txt      |  0
 .../space-weather-feeder.service              |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename {feeder-mqtt => feeder}/README.md (100%)
 rename {feeder-mqtt => feeder}/lib/__init__.py (100%)
 rename {feeder-mqtt => feeder}/lib/cddis_fetch.py (100%)
 rename {feeder-mqtt => feeder}/lib/tecmap.py (82%)
 rename {feeder-mqtt => feeder}/main.py (99%)
 rename {feeder-mqtt => feeder}/requirements.txt (100%)
 rename {feeder-mqtt => feeder}/space-weather-feeder.service (81%)

diff --git a/feeder-mqtt/README.md b/feeder/README.md
similarity index 100%
rename from feeder-mqtt/README.md
rename to feeder/README.md
diff --git a/feeder-mqtt/lib/__init__.py b/feeder/lib/__init__.py
similarity index 100%
rename from feeder-mqtt/lib/__init__.py
rename to feeder/lib/__init__.py
diff --git a/feeder-mqtt/lib/cddis_fetch.py b/feeder/lib/cddis_fetch.py
similarity index 100%
rename from feeder-mqtt/lib/cddis_fetch.py
rename to feeder/lib/cddis_fetch.py
diff --git a/feeder-mqtt/lib/tecmap.py b/feeder/lib/tecmap.py
similarity index 82%
rename from feeder-mqtt/lib/tecmap.py
rename to feeder/lib/tecmap.py
index 9aba974..9487ee5 100644
--- a/feeder-mqtt/lib/tecmap.py
+++ b/feeder/lib/tecmap.py
@@ -4,6 +4,7 @@ from datetime import datetime
 import cartopy.crs as ccrs
 import matplotlib.pyplot as plt
 import numpy as np
+from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 """
 https://github.com/daniestevez/jupyter_notebooks/blob/master/IONEX.ipynb
@@ -52,17 +53,17 @@ def plot_tec_map(tecmap, lon_range: list, lat_range: list):
     h = plt.imshow(tecmap_ranged, cmap='viridis', vmin=0, vmax=100, extent=(lon_range[0], lon_range[1], lat_range[0], lat_range[1]), transform=proj)
 
     # Make graph pretty
-    # ax.coastlines()
-    # plt.title('VTEC map')
-    # divider = make_axes_locatable(ax)
-    # ax_cb = divider.new_horizontal(size='5%', pad=0.1, axes_class=plt.Axes)
-    # f.add_axes(ax_cb)
-    # cb = plt.colorbar(h, cax=ax_cb)
-    # plt.rc('text', usetex=True)
-    # cb.set_label('TECU ($10^{16} \\mathrm{el}/\\mathrm{m}^2$)')
-    # plt.show()
+    ax.coastlines()
+    plt.title('VTEC map')
+    divider = make_axes_locatable(ax)
+    ax_cb = divider.new_horizontal(size='5%', pad=0.1, axes_class=plt.Axes)
+    f.add_axes(ax_cb)
+    cb = plt.colorbar(h, cax=ax_cb)
+    plt.rc('text', usetex=True)
+    cb.set_label('TECU ($10^{16} \\mathrm{el}/\\mathrm{m}^2$)')
+    plt.show()
 
     # Deallocate
     plt.close()
 
-    return tecmap_ranged
+    return tecmap_ranged, plt
diff --git a/feeder-mqtt/main.py b/feeder/main.py
similarity index 99%
rename from feeder-mqtt/main.py
rename to feeder/main.py
index 314cd75..20d73bf 100644
--- a/feeder-mqtt/main.py
+++ b/feeder/main.py
@@ -84,7 +84,7 @@ def update_cache():
         for tecmap, epoch in get_tecmaps(ionex_data):
             parsed_dt = parse_ionex_datetime(epoch)
             if parsed_dt.hour == utc_hr:
-                avg_tec = np.mean(plot_tec_map(tecmap, [float(LON_RANGE_MIN), float(LON_RANGE_MAX)], [float(LAT_RANGE_MIN), float(LAT_RANGE_MAX)]))
+                avg_tec = np.mean(plot_tec_map(tecmap, [float(LON_RANGE_MIN), float(LON_RANGE_MAX)], [float(LAT_RANGE_MIN), float(LAT_RANGE_MAX)])[0])
                 logging.info(f'Data timestamp: {parsed_dt.isoformat()}')
                 break
         latest = round(avg_tec, 1)
diff --git a/feeder-mqtt/requirements.txt b/feeder/requirements.txt
similarity index 100%
rename from feeder-mqtt/requirements.txt
rename to feeder/requirements.txt
diff --git a/feeder-mqtt/space-weather-feeder.service b/feeder/space-weather-feeder.service
similarity index 81%
rename from feeder-mqtt/space-weather-feeder.service
rename to feeder/space-weather-feeder.service
index 446db74..cb2b14c 100644
--- a/feeder-mqtt/space-weather-feeder.service
+++ b/feeder/space-weather-feeder.service
@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 User=homeassistant
 EnvironmentFile=/etc/secrets/space-weather
-ExecStart=/srv/space-weather/ha-noaa-space-weather/venv/bin/python /srv/space-weather/ha-noaa-space-weather/feeder-mqtt/main.py
+ExecStart=/srv/space-weather/ha-noaa-space-weather/venv/bin/python /srv/space-weather/ha-noaa-space-weather/feeder/main.py
 Restart=on-failure
 RestartSec=5s