Fix issue with inconsistent formatting of "GPS off" buses.

[frank.git] / prod / net / jaekl / frank / Schedule.java

diff --git a/prod/net/jaekl/frank/Schedule.java b/prod/net/jaekl/frank/Schedule.java
index 10616b23007608c5802fb4989ee61dbf8408295e..eb8cb2bce26cee168d800d2baef13770ff96c580 100644 (file)
--- a/prod/net/jaekl/frank/Schedule.java
+++ b/prod/net/jaekl/frank/Schedule.java
@@ -62,7 +62,7 @@ public class Schedule {
            pw.println("    if (remain_delta <= 0) {");
            pw.println("      element.innerHTML = \"----\";");
            pw.println("    } else {");
-           pw.println("      element.innerHTML = (Math.floor(remain_delta / 60)) + \"" + trans(min) + "\";");
+           pw.println("      element.innerHTML = (Math.floor(remain_delta / 60)) + \"" + min + "\";");
            pw.println("    }");
            pw.println("  }");
            pw.println("}");
@@ -107,7 +107,7 @@ public class Schedule {
                        Route route = stopInfo.getRoute(routeIdx);
                        for (int tripIdx = 0; tripIdx < route.getNumTrips(); ++tripIdx) {
                                Trip trip = route.getTrip(tripIdx);
-                               boolean isGhost = ((-1) == trip.getAdjAge());
+                               boolean isGhost = (trip.getAdjAge() < 0);
                                if (isGhost) {
                                        // GPS is off.  This bus may not exist.
                                        pw.println("    <TR CLASS=\"ghost\">");
@@ -125,7 +125,7 @@ public class Schedule {
                                remainArray.append(trip.getAdjTime());
                                remainCount++;
                                
-                               if (trip.getAdjAge() < 0) {
+                               if (isGhost) {
                                        pw.println("      <TD>" + trans(FrankBundle.GPS_OFF) + "</TD>");
                                }
                                else {