Fix module imports; Readd aprs settings.

ogn/commands/database.py

@@ -8,7 +8,7 @@ from ogn.collect.fetchddb import update_ddb_data
 @manager.command
 def init():
     """Initialize the database."""
-    from dbutils import engine
+    from ogn.commands.dbutils import engine
     Base.metadata.create_all(engine)
     print("Done.")
 

ogn/commands/logbook.py

@@ -8,7 +8,7 @@ from sqlalchemy.sql.expression import case, true, false, label
 
 from ogn.model import Flarm, AircraftBeacon, TakeoffLanding
 
-from dbutils import session
+from ogn.commands.dbutils import session
 
 from manager import Manager
 manager = Manager()

ogn/commands/showreceiver.py

@@ -5,7 +5,7 @@ from sqlalchemy import distinct, and_
 
 from ogn.model import ReceiverBeacon
 
-from dbutils import session
+from ogn.commands.dbutils import session
 
 back_24h = datetime.utcnow() - timedelta(days=1)
 receiver_messages_per_24h = 24*60 / 5

ogn/gateway/__init__.py

@@ -1,7 +1,7 @@
 import socket
 from time import time
 
-from ogn import settings
+from ogn.gateway import settings
 from ogn.commands.dbutils import session
 from ogn.aprs_parser import parse_aprs
 

ogn/gateway/settings.py

@@ -0,0 +1,6 @@
+APRS_SERVER_HOST = 'aprs.glidernet.org'
+APRS_SERVER_PORT = 14580
+APRS_USER = 'PyGrabber'
+APRS_PASSCODE = -1  # Read only
+
+APRS_FILTER = "filter r/+50.0000/+10.0000/5000"

tests/test_ognutils.py

@@ -1,5 +1,5 @@
 import unittest
-from ogn.ognutils import get_ddb, get_country_code
+from ogn.utils import get_ddb, get_country_code
 from ogn.model.address_origin import AddressOrigin