--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java	2016/02/13 06:29:18	2940
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/coveragefileupload/AddressManager.java	2016/04/26 17:37:56	3022
@@ -1,4 +1,4 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.coveragefileupload;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -11,20 +11,17 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
 import dk.daoas.adressevedligehold.beans.Address;
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
-import dk.daoas.adressevedligehold.db.DatabaseLayerImplementation;
+import dk.daoas.adressevedligehold.coveragefileupload.AddressSourceEntry.EntryType;
+import dk.daoas.adressevedligehold.db.DatabaseCoverageUpdate;
 import dk.daoas.adressevedligehold.tasks.TaskLogger;
 import dk.daoas.adressevedligehold.util.DeduplicateHelper;
 import dk.daoas.adressevedligehold.util.MiscUtils;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
 /*
- * TODO: håndtering af entry dupletter ! (+ rapportering af dem)
-
-
- 
+ *  
  */
 
 public class AddressManager {
@@ -44,7 +41,7 @@
 	Map<Short,Short> dbkBaneMap = new TreeMap<Short,Short>();
 	
 	public AddressManager() throws SQLException {
-		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
 		searchStructure = new TreeMap<Integer, TreeMap<Short, ArrayList<Address>> >();
 		
@@ -210,7 +207,7 @@
 			}
 		}
 		
-		DatabaseLayerImplementation db = new DatabaseLayerImplementation();
+		DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
 		
 		db.updateAddresses(updates);
 		db.saveNewAddresses(inserts);
@@ -232,9 +229,10 @@
 	private void visitSingle(AddressSourceEntry entry) {
 		TreeMap<Short, ArrayList<Address>> gade = searchStructure.get( entry.gadeid );
 		if (gade == null) {
+			/* No need to register unknown streets, since we create all entries that we can
 			if (! unknownStreets.containsKey(entry.gadeid)) {
 				unknownStreets.put(entry.gadeid, entry.vejnavn);				
-			}
+			}*/
 			
 			createFromEntry(entry); // if we get here there was no match - so we need to create it
 			return;
@@ -503,7 +501,7 @@
 			return;
 		}
 		
-		if (entry.husnr == 999) {
+		if (entry.husnr == 999 || entry.husnr == 998) { //frasorter de to højest gyldige husnr - det er typisk special adresser
 			return;
 		}
 		
@@ -525,6 +523,10 @@
 			return;
 		}
 		
+		if (entry.vejkode > 9999) {
+			return;
+		}
+		
 		if (entry.gadeid == 0) {
 			return;
 		}