Merge branch 'dev' into dev-rdf

Conflicts:
	src/net/cbaines/suma/BuildingActivity.java

1 files changed, 7 insertions, 3 deletions

diff --git a/src/net/cbaines/suma/Bus.java b/src/net/cbaines/suma/Bus.java
index d8d96f3..b36dd89 100644
--- a/src/net/cbaines/suma/Bus.java
+++ b/src/net/cbaines/suma/Bus.java
@@ -53,13 +53,13 @@ public class Bus {
     /**
      * The direction which the bus is travelling.
      */
-    @DatabaseField(canBeNull = false)
+    @DatabaseField(canBeNull = true)
     String direction;
 
     /**
      * The destination the bus is travelling towards.
      */
-    @DatabaseField(canBeNull = false, foreign = true)
+    @DatabaseField(canBeNull = true, foreign = true)
     BusStop destination;
 
     Bus() {
@@ -98,7 +98,11 @@ public class Bus {
     }
 
     String getName() {
-	return route.code + direction;
+	if (direction != null) {
+	    return route.code + direction;
+	} else {
+	    return route.code;
+	}
     }
 
     @Override