--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/26 16:49:12	2849
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/01/28 13:36:37	2867
@@ -233,15 +233,17 @@
 			createFromEntry(entry); // if we get here there was no match - so we need to create it
 			return;
 		}
-		
+		boolean found = false;
 		for (Address addr : litraList) {
 			if (addr.husnrbogstav.equals(entry.litra) ) {
 				updateAddress(addr, entry);
-				return; //Done for now - no need to look at the rest of the list
+				found = true; // 1 visit should be enough but as long as there's duplicates on gadeid+husnr+litra we will visit them all
+				//when the issue with duplicates is resolved this should be reverted to a return or break
 			}
 		}
-		
-		createFromEntry(entry); // if we get here there was no match - so we need to create it
+		if (found == false) {
+			createFromEntry(entry); // if we get here there was no match - so we need to create it
+		}
 	}
 	
 	private void visitRange(AddressSourceEntry entry) {
@@ -444,7 +446,7 @@
 		
 		
 		
-		addr.visited = true;
+		//addr.visited = true;
 		if (addr.state == AddressState.NOT_CHANGED) {
 			if (addr.distributor == null) {
 				addr.state = AddressState.OPENED;
@@ -469,6 +471,16 @@
 		if (entry.husnr == 999) {
 			return;
 		}
+		if (entry.kommunekode == 0 || entry.vejkode == 0) {
+			return;
+		}
+		if (entry.kommunekode < 100) {
+			return;
+		}
+		if (Short.parseShort(Integer.toString(entry.gadeid).substring(0, 4)) != entry.postnr) {
+			return; //gadeid / postnr mismatch
+		}
+		
 		
 		
 		System.out.println("Opretter adresse ud fra " + entry);
@@ -484,7 +496,7 @@
 		a.husnr = entry.husnr;
 		a.husnrbogstav = entry.litra;
 		a.postnr = entry.postnr;
-		a.visited = true;
+		//a.visited = true;
 		
 		if (entry.ugedage.mandag) {
 			a.ruteMandag = entry.rute;
@@ -583,7 +595,9 @@
 			break;
 		case "NS":
 			bane = 204;
-			break;			
+			break;
+		default:
+			throw new RuntimeException("Ukendt distributor" + a.distributor); //Silence findBugs
 		}
 		
 		if (bane == null) {