Merge pull request #52 from UMDBPP/develop

minor import fixes

client/cli.py

@@ -8,7 +8,6 @@
 from dateutil.parser import parse as parse_date
 
 from client import DEFAULT_INTERVAL_SECONDS
-from client.gui import PacketRavenGUI
 from client.retrieve import retrieve_packets
 from packetraven.connections import APRSDatabaseTable, APRSfi, APRSis, PacketGeoJSON, RawAPRSTextFile, SerialTNC
 from packetraven.predicts import PredictionAPIURL, PredictionError, get_predictions
@@ -201,6 +200,8 @@ def main():
         }
 
     if using_gui:
+        from client.gui import PacketRavenGUI
+
         PacketRavenGUI(
             callsigns,
             start_date,
@@ -304,7 +305,9 @@ def main():
                     database_kwargs['database_password'] = database_password
 
                 database = APRSDatabaseTable(
-                    **database_kwargs, **ssh_tunnel_kwargs, callsigns=callsigns
+                    **{key.replace('database_', ''): value
+                       for key, value in database_kwargs.items()},
+                    **ssh_tunnel_kwargs, callsigns=callsigns
                 )
                 LOGGER.info(f'connected to {database.location}')
                 connections.append(database)

packetraven/model.py

@@ -2,6 +2,7 @@
 
 # `dh/dt` based on historical flight data
 FREEFALL_DESCENT_RATE = lambda altitude: -5.8e-08 * altitude ** 2 - 6.001
+# TODO: propagate uncertainty
 FREEFALL_DESCENT_RATE_UNCERTAINTY = lambda altitude: 0.2 * FREEFALL_DESCENT_RATE(altitude)
 
 # integration of `(1/(dh/dt)) dh` based on historical flight data