mirror
/
ogn-python
kopia lustrzana https://github.com/glidernet/ogn-python
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed live.glidernet.org backend

pull/68/head
Konstantin Gründger 2019-01-04 12:19:27 +01:00
rodzic c815b8a251
commit 76e7a9bb3f
2 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ogn/backend/liveglidernet.py
Wyświetl plik

@ -50,7 +50,8 @@ def lxml(session, show_offline=False, lat_max=90, lat_min=-90, lon_max=180, lon_
between(func.ST_X(AircraftBeacon.location_wkt), lon_min, lon_max))) \ between(func.ST_X(AircraftBeacon.location_wkt), lon_min, lon_max))) \
.filter(Device.lastseen > observation_start) \ .filter(Device.lastseen > observation_start) \
.filter(Device.lastseen == AircraftBeacon.timestamp) \ .filter(Device.lastseen == AircraftBeacon.timestamp) \
.filter(Device.id == AircraftBeacon.device_id) .filter(Device.id == AircraftBeacon.device_id) \
.order_by(AircraftBeacon.timestamp)
lines = list() lines = list()
lines.append('<?xml version="1.0" encoding="UTF-8"?>') lines.append('<?xml version="1.0" encoding="UTF-8"?>')
@ -90,7 +91,7 @@ def lxml(session, show_offline=False, lat_max=90, lat_min=-90, lon_max=180, lon_
aircraft_beacon.location.longitude, aircraft_beacon.location.longitude,
competition, competition,
registration, registration,
aircraft_beacon.altitude, int(aircraft_beacon.altitude),
utc_to_local(aircraft_beacon.timestamp).strftime("%H:%M:%S"), utc_to_local(aircraft_beacon.timestamp).strftime("%H:%M:%S"),
elapsed_seconds, elapsed_seconds,
int(aircraft_beacon.track), int(aircraft_beacon.track),

2
tests/backend/test_backends.py
Wyświetl plik

@ -100,8 +100,8 @@ class TestDB(unittest.TestCase, XmlTestMixin):
# Check the complete document # Check the complete document
expected = """<?xml version="1.0" encoding="UTF-8"?> expected = """<?xml version="1.0" encoding="UTF-8"?>
<markers> <markers>
<m a="47.8258833,11.4636167,Hi,D-4711,209,10:00:02,3,123,55,-0.4,1,Koenigsdf,DD4711,xxDD4711"/>
<m a="47.8280667,11.4726500,_15,xxDD0815,543,09:56:00,245,270,77,-1.5,8,Bene,0,xxDD0815"/> <m a="47.8280667,11.4726500,_15,xxDD0815,543,09:56:00,245,270,77,-1.5,8,Bene,0,xxDD0815"/>
<m a="47.8258833,11.4636167,Hi,D-4711,209,10:00:02,3,123,55,-0.4,1,Koenigsdf,DD4711,xxDD4711"/>
</markers> </markers>
""".encode(encoding='utf-8') """.encode(encoding='utf-8')