pull/52/head
Konstantin Gründger 2016-06-02 19:53:53 +02:00
rodzic 894cf3183b
commit cb28d56cea
4 zmienionych plików z 61 dodań i 65 usunięć

Wyświetl plik

@ -49,8 +49,7 @@ def show(airport_name, utc_delta_hours=0, date=None):
sq = session.query(
TakeoffLanding.device_id,
func.lag(TakeoffLanding.device_id)
.over(
order_by=and_(func.date(TakeoffLanding.timestamp+utc_timedelta),
.over(order_by=and_(func.date(TakeoffLanding.timestamp + utc_timedelta),
TakeoffLanding.device_id,
TakeoffLanding.timestamp + utc_timedelta))
.label('device_id_prev'),
@ -164,8 +163,7 @@ def show(airport_name, utc_delta_hours=0, date=None):
.filter(sq.c.airport_id == airport.id)
# unite all
union_query = complete_flight_query.union(
split_start_query,
union_query = complete_flight_query.union(split_start_query,
split_landing_query,
only_landings_query,
only_starts_query) \
@ -174,8 +172,7 @@ def show(airport_name, utc_delta_hours=0, date=None):
# get aircraft and airport informations and sort all entries by the reference time
takeoff_airport = aliased(Airport, name='takeoff_airport')
landing_airport = aliased(Airport, name='landing_airport')
logbook_query = session.query(
union_query.c.reftime,
logbook_query = session.query(union_query.c.reftime,
union_query.c.takeoff,
union_query.c.takeoff_track,
takeoff_airport,

Wyświetl plik

@ -1,6 +1,5 @@
from sqlalchemy import Boolean, Column, Float, Integer, DateTime, ForeignKey
from sqlalchemy.orm import relationship
from geoalchemy2.types import Geometry
from geoalchemy2.shape import to_shape
from .base import Base