From 7aec8c20b70910839225f307ff573c26e4012007 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Mon, 12 Mar 2012 12:25:36 +0100
Subject: [PATCH] use location id as unique short name as a last resort

---
 enabler/src/de/schildbach/pte/dto/Location.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/enabler/src/de/schildbach/pte/dto/Location.java b/enabler/src/de/schildbach/pte/dto/Location.java
index f8cb35da..0a7871d0 100644
--- a/enabler/src/de/schildbach/pte/dto/Location.java
+++ b/enabler/src/de/schildbach/pte/dto/Location.java
@@ -96,8 +96,12 @@ public final class Location implements Serializable
 	{
 		if ("Hauptbahnhof".equals(name) || "Hbf".equals(name) || "Bahnhof".equals(name) || "Dorf".equals(name) || "Kirche".equals(name))
 			return place + ", " + name;
-		else
+		else if (name != null)
 			return name;
+		else if (hasId())
+			return Integer.toString(id);
+		else
+			return null;
 	}
 
 	@Override