From: Chris Jaekl <chris@ringo.jaekl.net>
Date: Mon, 24 Aug 2015 12:53:18 +0000 (+0900)
Subject: Fix issue with inconsistent formatting of "GPS off" buses.
X-Git-Url: https://jaekl.net/gitweb/?a=commitdiff_plain;h=2dcf5c21337e4b12e56c3520828edfc062ce7338;p=frank.git

Fix issue with inconsistent formatting of "GPS off" buses.
OC Transpo usually reports a bus with no GPS data as having a
"GPS last read" time of (-1) minutes ago.  But sometimes it reports
it as (-2), for reasons that aren't clear (at least, not to me).
The code was applying an "== (-1)" test in one spot, but a "< 0"
test in another; inconsistency is not good, nor is repeating a
conditional test unnecessarily.
---

diff --git a/prod/net/jaekl/frank/Schedule.java b/prod/net/jaekl/frank/Schedule.java
index 8cc4f84..eb8cb2b 100644
--- a/prod/net/jaekl/frank/Schedule.java
+++ b/prod/net/jaekl/frank/Schedule.java
@@ -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 {
diff --git a/test/net/jaekl/frank/ScheduleTest.java b/test/net/jaekl/frank/ScheduleTest.java
index 6c81937..1e1a517 100644
--- a/test/net/jaekl/frank/ScheduleTest.java
+++ b/test/net/jaekl/frank/ScheduleTest.java
@@ -136,6 +136,7 @@ public class ScheduleTest {
 		trip = new TripMock(queryDate);
 		trip.mock_setDest(HURDMAN);
 		trip.mock_setAdjTime(37);
+		trip.mock_setAdjAge(-2);
 		route.mock_addTrip(trip);
 		
 		rsm.mock_addRoute(route);
@@ -176,8 +177,10 @@ public class ScheduleTest {
 		Assert.assertTrue(actual.contains("<TD>" + HURDMAN + "</TD>"));
 		Assert.assertTrue(actual.contains("<TD><SPAN ID=\"in_2\">17m</SPAN></TD>"));
 		
+		Assert.assertTrue(actual.contains("<TR CLASS=\"ghost\">"));
 		Assert.assertTrue(actual.contains("<TD>4</TD>"));
 		Assert.assertTrue(actual.contains("<TD>" + HURDMAN + "</TD>"));
 		Assert.assertTrue(actual.contains("<TD><SPAN ID=\"in_3\">37m</SPAN></TD>"));
+		Assert.assertTrue(actual.contains("<TD>GPS off</TD>"));
 	}
 }