From 76e7a9bb3f9773ad0dfdadb4e621ae6f53edfb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Gru=CC=88ndger?= <kammermark@gmx.de>
Date: Fri, 4 Jan 2019 12:19:27 +0100
Subject: [PATCH] Fixed live.glidernet.org backend

---
 ogn/backend/liveglidernet.py   | 5 +++--
 tests/backend/test_backends.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ogn/backend/liveglidernet.py b/ogn/backend/liveglidernet.py
index 3bff4b5..2ae132d 100644
--- a/ogn/backend/liveglidernet.py
+++ b/ogn/backend/liveglidernet.py
@@ -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))) \
         .filter(Device.lastseen > observation_start) \
         .filter(Device.lastseen == AircraftBeacon.timestamp) \
-        .filter(Device.id == AircraftBeacon.device_id)
+        .filter(Device.id == AircraftBeacon.device_id) \
+        .order_by(AircraftBeacon.timestamp)
 
     lines = list()
     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,
                              competition,
                              registration,
-                             aircraft_beacon.altitude,
+                             int(aircraft_beacon.altitude),
                              utc_to_local(aircraft_beacon.timestamp).strftime("%H:%M:%S"),
                              elapsed_seconds,
                              int(aircraft_beacon.track),
diff --git a/tests/backend/test_backends.py b/tests/backend/test_backends.py
index 49dee33..06312cd 100644
--- a/tests/backend/test_backends.py
+++ b/tests/backend/test_backends.py
@@ -100,8 +100,8 @@ class TestDB(unittest.TestCase, XmlTestMixin):
         # Check the complete document
         expected = """<?xml version="1.0" encoding="UTF-8"?>
         <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.8258833,11.4636167,Hi,D-4711,209,10:00:02,3,123,55,-0.4,1,Koenigsdf,DD4711,xxDD4711"/>
         </markers>
         """.encode(encoding='utf-8')