diff --git a/alembic/versions/104107d119d_receiver_device_to_receiver.py b/alembic/versions/104107d119d_receiver_device_to_receiver.py new file mode 100644 index 0000000..5850b8b --- /dev/null +++ b/alembic/versions/104107d119d_receiver_device_to_receiver.py @@ -0,0 +1,24 @@ +"""receiver_device to receiver + +Revision ID: 104107d119d +Revises: 46bc73c49e0 +Create Date: 2015-11-16 20:07:19.569378 + +""" + +# revision identifiers, used by Alembic. +revision = '104107d119d' +down_revision = '46bc73c49e0' +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.rename_table('receiver_device', 'receiver') + + +def downgrade(): + op.rename_table('receiver', 'receiver_device') diff --git a/alembic/versions/46bc73c49e0_flarm_to_device.py b/alembic/versions/46bc73c49e0_flarm_to_device.py new file mode 100644 index 0000000..48252fe --- /dev/null +++ b/alembic/versions/46bc73c49e0_flarm_to_device.py @@ -0,0 +1,24 @@ +"""flarm to device + +Revision ID: 46bc73c49e0 +Revises: +Create Date: 2015-11-16 19:44:37.934741 + +""" + +# revision identifiers, used by Alembic. +revision = '46bc73c49e0' +down_revision = None +branch_labels = None +depends_on = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + op.rename_table('flarm', 'device') + + +def downgrade(): + op.rename_table('device', 'flarm') diff --git a/ogn/collect/fetchddb.py b/ogn/collect/fetchddb.py index 1007d88..f9c87ce 100644 --- a/ogn/collect/fetchddb.py +++ b/ogn/collect/fetchddb.py @@ -3,7 +3,7 @@ from __future__ import absolute_import from celery.utils.log import get_task_logger from ogn.collect.celery import app -from ogn.model import Flarm +from ogn.model import Device from ogn.utils import get_ddb logger = get_task_logger(__name__) @@ -13,7 +13,7 @@ logger = get_task_logger(__name__) def update_ddb_data(): logger.info("Update ddb data.") - app.session.query(Flarm).delete() + app.session.query(Device).delete() devices = get_ddb() logger.debug("New Devices: %s" % str(devices)) diff --git a/ogn/commands/logbook.py b/ogn/commands/logbook.py index fae6331..7b2484a 100644 --- a/ogn/commands/logbook.py +++ b/ogn/commands/logbook.py @@ -6,7 +6,7 @@ from sqlalchemy.sql import func, null from sqlalchemy import and_, or_, between from sqlalchemy.sql.expression import true, false, label -from ogn.model import Flarm, TakeoffLanding +from ogn.model import Device, TakeoffLanding from ogn.commands.dbutils import session @@ -133,9 +133,9 @@ def show(airport_name, latitude, longitude, altitude): union_query.c.landing, union_query.c.landing_track, union_query.c.duration, - Flarm.registration, - Flarm.aircraft) \ - .outerjoin(Flarm, union_query.c.address == Flarm.address) \ + Device.registration, + Device.aircraft) \ + .outerjoin(Device, union_query.c.address == Device.address) \ .order_by(union_query.c.reftime) print('--- Logbook (%s) ---' % airport_name) diff --git a/ogn/commands/showreceiver.py b/ogn/commands/showreceiver.py index 1b798b3..e5f088a 100644 --- a/ogn/commands/showreceiver.py +++ b/ogn/commands/showreceiver.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from sqlalchemy.sql import func from sqlalchemy import distinct, and_ -from ogn.model import ReceiverBeacon, ReceiverDevice +from ogn.model import ReceiverBeacon, Receiver from ogn.commands.dbutils import session @@ -22,9 +22,9 @@ def list_all(): group_by(ReceiverBeacon.name).\ subquery() - query = session.query(ReceiverDevice, sq.c.messages_count).\ - filter(ReceiverDevice.name == sq.c.name).\ - order_by(ReceiverDevice.name) + query = session.query(Receiver, sq.c.messages_count).\ + filter(Receiver.name == sq.c.name).\ + order_by(Receiver.name) print('--- Receivers ---') for [receiver, messages_count] in query.all(): diff --git a/ogn/model/__init__.py b/ogn/model/__init__.py index 33fd5fe..3d975f3 100644 --- a/ogn/model/__init__.py +++ b/ogn/model/__init__.py @@ -2,8 +2,8 @@ from .address_origin import AddressOrigin from .aircraft_type import AircraftType from .base import Base from .beacon import Beacon -from .flarm import Flarm +from .device import Device from .aircraft_beacon import AircraftBeacon from .receiver_beacon import ReceiverBeacon -from .receiver_device import ReceiverDevice +from .receiver import Receiver from .takeoff_landing import TakeoffLanding diff --git a/ogn/model/flarm.py b/ogn/model/device.py similarity index 88% rename from ogn/model/flarm.py rename to ogn/model/device.py index 2229977..8e97f74 100644 --- a/ogn/model/flarm.py +++ b/ogn/model/device.py @@ -3,8 +3,8 @@ from sqlalchemy import Column, Integer, String, Unicode, Boolean, SmallInteger from .base import Base -class Flarm(Base): - __tablename__ = 'flarm' +class Device(Base): + __tablename__ = 'device' id = Column(Integer, primary_key=True) address_type = None @@ -21,7 +21,7 @@ class Flarm(Base): address_origin = Column(SmallInteger) def __repr__(self): - return "" % ( + return "" % ( self.address_type, self.address, self.name, diff --git a/ogn/model/receiver_device.py b/ogn/model/receiver.py similarity index 86% rename from ogn/model/receiver_device.py rename to ogn/model/receiver.py index 4b824cf..5683a43 100644 --- a/ogn/model/receiver_device.py +++ b/ogn/model/receiver.py @@ -3,8 +3,8 @@ from sqlalchemy import Column, String, Integer, Float, DateTime from .base import Base -class ReceiverDevice(Base): - __tablename__ = "receiver_device" +class Receiver(Base): + __tablename__ = "receiver" id = Column(Integer, primary_key=True) name = Column(String(9)) diff --git a/ogn/utils.py b/ogn/utils.py index bd8048e..030beca 100644 --- a/ogn/utils.py +++ b/ogn/utils.py @@ -3,7 +3,7 @@ import csv from io import StringIO from math import sin, cos, asin, atan2, sqrt, pi -from .model import Flarm, AddressOrigin +from .model import Device, AddressOrigin from geopy.geocoders import Nominatim @@ -27,7 +27,7 @@ def get_ddb(csvfile=None): devices = list() for row in data: - flarm = Flarm() + flarm = Device() flarm.address_type = row[0] flarm.address = row[1] flarm.aircraft = row[2]