Improvements to non Uni-Link routes, and BusRoutesView display.

1 files changed, 9 insertions, 13 deletions

diff --git a/src/net/cbaines/suma/Stop.java b/src/net/cbaines/suma/Stop.java
index 7947bed..b2452bd 100644
--- a/src/net/cbaines/suma/Stop.java
+++ b/src/net/cbaines/suma/Stop.java
@@ -31,16 +31,10 @@ import android.text.format.DateUtils;
  */
 public class Stop {
 
-    public static final String ID_FIELD_NAME = "id";
-    public static final String BUS_FIELD_NAME = "bus";
-    public static final String BUS_STOP_FIELD_NAME = "busStop";
-    public static final String ARIVAL_TIME_FIELD_NAME = "arivalTime";
-    public static final String FETCH_TIME_FIELD_NAME = "timeOfFetch";
-
-    /**
-     * A generated id for the bus
-     */
-    int id;
+    // public static final String BUS_FIELD_NAME = "bus";
+    // public static final String BUS_STOP_FIELD_NAME = "busStop";
+    // public static final String ARIVAL_TIME_FIELD_NAME = "arivalTime";
+    // public static final String FETCH_TIME_FIELD_NAME = "timeOfFetch";
 
     /**
      * The Bus stopping at the stop
@@ -68,6 +62,11 @@ public class Stop {
     boolean live;
 
     /**
+     * Assumed to be the number of seconds since this data was fetched from the ROMANSE system?
+     */
+    int age;
+
+    /**
      * 
      * @param bus
      * @param busStop
@@ -101,7 +100,6 @@ public class Stop {
 	result = prime * result + ((arivalTime == null) ? 0 : arivalTime.hashCode());
 	result = prime * result + ((bus == null) ? 0 : bus.hashCode());
 	result = prime * result + ((busStop == null) ? 0 : busStop.hashCode());
-	result = prime * result + id;
 	return result;
     }
 
@@ -138,8 +136,6 @@ public class Stop {
 		return false;
 	} else if (!busStop.equals(other.busStop))
 	    return false;
-	if (id != other.id)
-	    return false;
 	return true;
     }