Merge branch 'master' into 'pi_features'

# Conflicts:
#   server.py

templates/static/js/DataRequests.js

@@ -2,22 +2,21 @@ $(document).ready(function () {
 
     const interval = setInterval(function () {
         updateData($('#station_1'))
-        updateData($('#station_2'))
     }, 5000);
+    const interval2 = setInterval(function () {
+        updateData($('#station_2'))
+    }, 6000);
 
     function updateData(station) {
 
         $.ajax({
             type: "POST",
-            //the url where you want to sent the userName and password to
             url: '/mta_data',
             contentType: "application/json",
             dataType: "json",
             async: true,
-            //json object to sent to the authentication url
             data: JSON.stringify({"station": station.find('.station-name:first').get(0).innerText}, null, '\t'),
             success: function (data, text) {
-                // console.log(data)
                 updateStation(station, data)
             },
             error: function (request, status, error) {
@@ -27,32 +26,58 @@ $(document).ready(function () {
     }
 
     function updateStation(station, data) {
-        //get first item
         updateDirections(station, data, "North");
         updateDirections(station, data, "South");
     }
 
     function updateDirections(station, data, direction) {
-        // console.log(direction)
-        // console.log(".card:".concat(direction === "North" ? "first" : "last"))
         n = data[direction]
-        // console.log(data[direction])
         list_items = station.find(".card:".concat(direction === "North" ? "first" : "last")).find(".station-info")
         var i = 0;
         for (var train in n) {
-            // console.log(train)
-            // console.log(list_items)
             updateLineItem(list_items.get(i), n[train], train)
             i = i + 1
         }
+        if (i < 3) {
+            console.log("Only 2 items updated")
+            for (let remainingIndex = i; remainingIndex < 3; remainingIndex++) {
+                updateLineItem(list_items.get(i), "No Trains Available", "N/A")
+            }
+        }
     }
 
     function updateLineItem(listItem, times, train) {
-        // console.log(times)
-        $(listItem).find("img").attr("src", "/static/images/lines/" + train + ".svg")
-        $(listItem).find("h1").text(times.sort(function (a, b) {
-            return a - b;
-        }).join(", "));
+        var timeString;
+        if (typeof times === 'string' || times instanceof String) {
+            timeString = times;
+        } else {
+            timeString = times.sort(function (a, b) {
+                return a - b;
+            }).join(", ");
+        }
+        $(listItem).find("h1").text(timeString);
+        if (imageExists("/static/images/lines/" + train + ".svg")) {
+
+            $(listItem).show()
+            $(listItem).find("img").attr("src", "/static/images/lines/" + train + ".svg")
+        } else if (train === "N/A"){
+            console.log("Route Is NA - Disabling Route")
+            console.log($(listItem))
+            $(listItem).hide()
+        }
+
+
+    }
+
+    function imageExists(image_url) {
+
+        var http = new XMLHttpRequest();
+
+        http.open('HEAD', image_url, false);
+        http.send();
+
+        return http.status != 404;
+
     }
 });