kopia lustrzana https://github.com/glidernet/ogn-python
Renamed Flarm to Device
rodzic
38a8c6b7ca
commit
82b03f991a
|
@ -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')
|
|
@ -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))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -2,7 +2,7 @@ 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
|
||||
|
|
|
@ -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 "<Flarm: %s,%s,%s,%s,%s,%s,%s,%s,%s,%s>" % (
|
||||
return "<Device: %s,%s,%s,%s,%s,%s,%s,%s,%s,%s>" % (
|
||||
self.address_type,
|
||||
self.address,
|
||||
self.name,
|
|
@ -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]
|
||||
|
|
Ładowanie…
Reference in New Issue