--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java	2015/02/12 17:37:09	2272
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java	2015/02/13 07:36:49	2273
@@ -97,13 +97,15 @@
 		if (i>=len) //THN tilføjelse
 			return result;
 		
-		if (Character.isAlphabetic(indAdresse.charAt(i)) &&
-				(i+1 == len || Character.isAlphabetic(indAdresse.charAt(i+1)) == false
-						) 
+		if (Character.isAlphabetic(indAdresse.charAt(i) )) {			
+			if ( (i+1 == len || 
+					(Character.isAlphabetic(indAdresse.charAt(i+1)) == false && indAdresse.charAt(i+1) != '.')
+					) 
 				) {
-			result.litra = "" + indAdresse.charAt(i);
-			result.litra = result.litra.toUpperCase();
-			i++;
+				result.litra = "" + indAdresse.charAt(i);
+				result.litra = result.litra.toUpperCase();
+				i++;
+			}
 		}
 		
 
@@ -191,7 +193,7 @@
 		}
 		
 		// saml resten op (kan gøres smartere med en substr)
-		result.resten = indAdresse.substring(i);
+		result.resten = indAdresse.substring(i).trim();
 		
 		return result; 
 	}