From fb7914a1ce60fda76cd32fe7e9dfc2134ed6409d Mon Sep 17 00:00:00 2001 From: LAX18 Development Date: Mon, 8 Feb 2021 19:58:43 -0500 Subject: [PATCH] Improvements for Device --- css/style.css | 25 ++++++++++---- gmap.html | 27 +++++++++++---- js/flightinfo.js | 88 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 102 insertions(+), 38 deletions(-) diff --git a/css/style.css b/css/style.css index c983e94..15cbbcd 100644 --- a/css/style.css +++ b/css/style.css @@ -48,9 +48,16 @@ div#map_container { } div#subtab_buttons { - position: absolute; - bottom: 70px; - width: 100% + position: fixed; + bottom: 0px; + width: 100%; + padding: 2px; + z-index: 1; + background: white; +} + +.subtab_button { + width: 25%; } div#atc_radio { @@ -105,14 +112,14 @@ img#message_rate img#cpu_usage { } div#subtab_buttons>button { - margin: auto; - width: 32%; + width: 28%; + margin-left: 10px; } div#subtab_buttons { position: absolute; - bottom: 0px; - right: 0px; + bottom: 5px; + width: 100%; } div#map_canvas { @@ -173,6 +180,10 @@ div#sidebar_container { vertical-align: middle; } +#radar_aircraft_tab { + overflow: hidden; +} + #info_button { position: absolute; right: 10px; diff --git a/gmap.html b/gmap.html index e28eff0..288031b 100644 --- a/gmap.html +++ b/gmap.html @@ -399,28 +399,43 @@

()

+ + + + + + + - - - + + + + + + + + + + +
Engine TypeEngine CountPlane AgePlane Status
Engine TypeEngine CountPlane StatusRollout DateFirst Flight
- - -
diff --git a/js/flightinfo.js b/js/flightinfo.js index 41bb04f..9b2c3db 100644 --- a/js/flightinfo.js +++ b/js/flightinfo.js @@ -22,12 +22,20 @@ function updateFlightTab() { getPlaneImage(data) $.getJSON('json/airplanes.json', function(aircraft_information) { var aircraft = aircraft_information[data.aircraft.iataCode] - console.log(aircraft) + document.getElementById("aircraft_name").innerHTML = aircraft.productionLine document.getElementById("aircraft_modelcode").innerHTML = aircraft.modelCode document.getElementById("aircraft_engine").innerHTML = aircraft.enginesType document.getElementById("aircraft_engine_count").innerHTML = aircraft.enginesCount - document.getElementById("aircraft_status").innerHTML = aircraft.planeStatus + document.getElementById("aircraft_status").innerHTML = toTitleCase(aircraft.planeStatus) + document.getElementById("aircraft_age").innerHTML = aircraft.planeAge + if (aircraft.rolloutDate) { + document.getElementById("aircraft_rollout_date").innerHTML = DateTime.fromISO(aircraft.rolloutDate).toLocaleString("DATE_SHORT") + } + if (aircraft.firstFlight) { + document.getElementById("aircraft_first_flight").innerHTML = DateTime.fromISO(aircraft.firstFlight).toLocaleString("DATE_SHORT") + } + }); flight_info[SelectedPlane] = data }); @@ -53,29 +61,59 @@ function getFlightProgress(flightdata) { document.getElementById("flight_arrival_time").innerHTML = "" document.getElementById("flight_remaining_time").innerHTML = "N/A" } else { - var departure_time = DateTime.fromISO(data.departure.estimatedTime) - document.getElementById("flight_depart_time").innerHTML = departure_time.toLocaleString(DateTime.DATETIME_MED) - var arrival_time = DateTime.fromISO(data.arrival.scheduledTime) - document.getElementById("flight_arrival_time").innerHTML = arrival_time.toLocaleString(DateTime.DATETIME_MED) - var transit_time = arrival_time.diff(departure_time, ["days", "hours", "minutes"]) - transit_time = transit_time.toObject() - if (transit_time.days != 0) { - document.getElementById("flight_transit_time").innerHTML = transit_time.days + "D " + transit_time.hours + "H " + transit_time.minutes + "M" - } else { - document.getElementById("flight_transit_time").innerHTML = transit_time.hours + "H " + transit_time.minutes + "M" - } - var current_time = DateTime.local(); - var time_remaining = arrival_time.diff(current_time, ["days", "hours", "minutes", "seconds"]) - time_remaining = time_remaining.toObject() - if (time_remaining.days != 0) { - document.getElementById("flight_remaining_time").innerHTML = time_remaining.days + "D " + time_remaining.hours + "H " + time_remaining.minutes + "M" - } else { - document.getElementById("flight_remaining_time").innerHTML = time_remaining.hours + "H " + time_remaining.minutes + "M" - } - document.getElementById("radar_flight_info").style.display = "block" - document.getElementById("radar_flight_loading").style.display = "none" - flight_info[SelectedPlane].schedule = data - getTripProgress(arrival_time, departure_time) + $.getJSON('json/world_airports.json', function(world_airports) { + arrival_timezone = world_airports[data.arrival.icaoCode].tz + departure_timezone = world_airports[data.departure.icaoCode].tz + + if (data.departure.actualTime) { + departure_time = DateTime.fromISO(data.departure.actualTime, { + zone: departure_timezone + }); + } else if (data.departure.estimatedTime) { + departure_time = DateTime.fromISO(data.departure.estimatedTime, { + zone: departure_timezone + }); + } else if (data.departure.scheduledTime) { + departure_time = DateTime.fromISO(data.departure.scheduledTime, { + zone: departure_timezone + }); + } + if (data.arrival.actualTime) { + arrival_time = DateTime.fromISO(data.arrival.actualTime, { + zone: arrival_timezone + }); + } else if (data.arrival.estimatedTime) { + arrival_time = DateTime.fromISO(data.arrival.estimatedTime, { + zone: arrival_timezone + }); + } else if (data.arrival.scheduledTime) { + arrival_time = DateTime.fromISO(data.arrival.scheduledTime, { + zone: arrival_timezone + }); + } + document.getElementById("flight_depart_time").innerHTML = departure_time.toLocaleString(DateTime.DATETIME_MED) + document.getElementById("flight_arrival_time").innerHTML = arrival_time.toLocaleString(DateTime.DATETIME_MED) + var transit_time = arrival_time.diff(departure_time, ["days", "hours", "minutes"]) + transit_time = transit_time.toObject() + if (transit_time.days != 0) { + document.getElementById("flight_transit_time").innerHTML = transit_time.days + "D " + transit_time.hours + "H " + transit_time.minutes + "M" + } else { + document.getElementById("flight_transit_time").innerHTML = transit_time.hours + "H " + transit_time.minutes + "M" + } + var current_time = DateTime.local(); + var time_remaining = arrival_time.diff(current_time, ["days", "hours", "minutes", "seconds"]) + time_remaining = time_remaining.toObject() + if (time_remaining.days != 0) { + document.getElementById("flight_remaining_time").innerHTML = time_remaining.days + "D " + time_remaining.hours + "H " + time_remaining.minutes + "M" + } else { + document.getElementById("flight_remaining_time").innerHTML = time_remaining.hours + "H " + time_remaining.minutes + "M" + } + document.getElementById("radar_flight_info").style.display = "block" + document.getElementById("radar_flight_loading").style.display = "none" + flight_info[SelectedPlane].schedule = data + getTripProgress(arrival_time, departure_time) + }); + } } }