--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/coveragefileupload/AddressManager.java 2016/09/09 08:58:41 3110 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/coveragefileupload/AddressManager.java 2016/09/09 09:26:55 3111 @@ -38,7 +38,7 @@ Map unknownStreets = new TreeMap(); - Map dbkBaneMap = new TreeMap(); + Map dbkBaneMap = new TreeMap(); public AddressManager() throws SQLException { DatabaseCoverageUpdate db = new DatabaseCoverageUpdate(); @@ -59,8 +59,8 @@ Short husnr = shortHelper.getInstance( a.husnr ); TreeMap> gade = searchStructure.get( gadeid ); - if (a.dbkBane > 0 && a.postnr<=4999) { - Short bane = dbkBaneMap.get(a.postnr); + if (a.dbkBane != null && a.dbkBane.length() > 0 && a.postnr<=4999) { + String bane = dbkBaneMap.get(a.postnr); if (bane == null) { dbkBaneMap.put(a.postnr, a.dbkBane); } @@ -611,7 +611,7 @@ List daoBane205 = Arrays.asList( new Short[] {7,10,11,12,12,14,15,16,18,19,20} ); - Short bane = null; + String bane = null; switch (a.distributor) { case "BK": @@ -622,11 +622,11 @@ try { short first2 = Short.parseShort( koreliste.substring(0,2) ); if ( daoBane205.contains(first2) ) { - bane = 205; + bane = "205"; } else if (first2 >= 24 && first2<=30) { - bane = 201; + bane = "201"; } else { - bane = 202; + bane = "202"; } } catch (NumberFormatException e) { throw new RuntimeException("Error parsing koreliste '" + koreliste + "' for " + a); @@ -634,10 +634,10 @@ break; case "FD": - bane = 200; + bane = "200"; break; case "NS": - bane = 204; + bane = "204"; break; default: throw new RuntimeException("Ukendt distributor: " + a.distributor); //Silence findBugs