--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java	2015/02/27 10:38:50	2399
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressUtils.java	2015/02/27 11:40:08	2403
@@ -19,21 +19,50 @@
 		}
 	}
 	
+	public static char fjernAccentTegn(char c) {
+		switch (c) {
+		case 'é':
+			return 'e';
+		case 'è':
+			return 'e';
+			
+		case 'û':
+			return 'u';
+		case 'ü':
+			return 'u';
+			
+		case 'ö':
+			return 'o';
+		case 'ô':
+			return 'o';
+
+		case 'ä':
+			return 'a';
+		case 'â':
+			return 'a';
+			
+		case 'ñ':
+			return 'n';			
+				
+		default:
+			return c;
+		}		
+	}
+	
 	public static String vaskVejnavn(String indVejnavn) {
-		String out = indVejnavn.toLowerCase();
-		out = out.replace(" ", "");
-		out = out.replace(".", "");
-		out = out.replace(",", "");
-		out = out.replace("-", "");
-		out = out.replace("/", "");
-		out = out.replace("\\", ""); 
-		out = out.replace("'", "");
-		out = out.replace(";", "");
-		out = out.replace(":", "");
-		out = out.replace("´", "");
+		StringBuilder sb = new StringBuilder();
+		char chars[] = indVejnavn.toCharArray();
 		
+		for (char c: chars) {			
+			if ( Character.isAlphabetic(c)) {
+				c = Character.toLowerCase(c);
+				c = fjernAccentTegn(c);
+				
+				sb.append( c );
+			}
+		}		
 		
-		return out;
+		return sb.toString();
 	}
 	
 	public static String injectIntoBk(String bkrute, String injected) {