Cosmetics

ogn/aprs_parser.py

@@ -1,6 +1,4 @@
-from .model.beacon import Beacon
+from .model import Beacon, Position, Receiver
-from .model.position import Position
-from .model.receiver import Receiver
 
 
 def parse_aprs(text):

ogn/db.py

@@ -1,10 +1,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from ogn.model.base import Base
+from .model import Base, Position, Receiver, Flarm
-from ogn.model.position import Position
-from ogn.model.receiver import Receiver
-from ogn.model.flarm import Flarm
 
 
 # prepare db

ogn/db_utils.py

@@ -1,8 +1,7 @@
 from urllib.request import urlopen
 
 from .db import session
-from .model.address_origin import AddressOrigin
+from .model import AddressOrigin, Flarm
-from .model.flarm import Flarm
 
 
 def get_devices_from_ddb():

ogn/model/__init__.py

@@ -1 +1,7 @@
-
+from .address_origin import AddressOrigin
+from .aircraft_type import AircraftType
+from .base import Base
+from .beacon import Beacon
+from .flarm import Flarm
+from .position import Position
+from .receiver import Receiver

ogn/ognproceed.py

@@ -3,7 +3,8 @@ from time import time
 
 from ogn import db_utils
 from ogn import settings
-from ogn.aprs_parser import *
+from ogn.aprs_parser import parse_aprs
+from .model import Position, Receiver
 
 
 def proceed():