--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressManager.java 2016/02/13 13:16:34 2946 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/fileupload/AddressManager.java 2016/03/31 08:17:44 2995 @@ -1,4 +1,4 @@ -package dk.daoas.adressevedligehold; +package dk.daoas.adressevedligehold.fileupload; 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.DatabaseCoverageUpdate; +import dk.daoas.adressevedligehold.fileupload.AddressSourceEntry.EntryType; 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 { @@ -232,9 +229,10 @@ private void visitSingle(AddressSourceEntry entry) { TreeMap> 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; }