--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressSourceNS.java	2016/02/12 09:55:14	2933
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/coveragefileupload/AddressSourceNS.java	2016/04/26 17:37:56	3022
@@ -1,4 +1,4 @@
-package dk.daoas.adressevedligehold;
+package dk.daoas.adressevedligehold.coveragefileupload;
 
 import java.io.IOException;
 import java.util.List;
@@ -8,7 +8,7 @@
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Splitter;
 
-import dk.daoas.adressevedligehold.AddressSourceEntry.EntryType;
+import dk.daoas.adressevedligehold.coveragefileupload.AddressSourceEntry.EntryType;
 
 public class AddressSourceNS extends AbstractAddressSource {
 	
@@ -35,7 +35,6 @@
 		super.validatNoHeaderLine(22, ',');
 	}
 
-	//TODO: Skal csv parsning klares med Apache Commons CSV ?
 
 	@Override
 	public AddressSourceEntry getNextEntry() throws IOException {
@@ -65,7 +64,7 @@
 		//stednavn = parts.get(2);
 		//ukendtt = parts.get(3);
 		entry.postnr = Short.parseShort( parts.get(4) );
-		entry.rute = dirigeringsCache.getInstance( parts.get(5) );
+		entry.rute = parts.get(5);
 		entry.husnr = Short.parseShort( parts.get(6) );
 		entry.litra = parts.get(7);
 		entry.tilHusnr = Short.parseShort( parts.get(8) );
@@ -76,45 +75,52 @@
 		//distributor = parts.get(13)
 		//inspektorkode = parts.get(21)
 		
+		if (entry.tilLitra.equals("")) {
+			entry.tilLitra = "Z"; // hvis der ikke er angivet en slut litra, så dækker de alle litra kombinationer
+		}
+		
 		switch (nextUgedag) {		
 		case MANDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(14) );
+			entry.koreliste = parts.get(14);
 			entry.ugedage = EntryUgedage.MAN;
 			nextUgedag = NextUgedag.TIRSDAG;
 			break;
 		case TIRSDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(15) );
+			entry.koreliste = parts.get(15);
 			entry.ugedage = EntryUgedage.TIR;
 			nextUgedag = NextUgedag.ONSDAG;
 			break;
 		case ONSDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(16) );
+			entry.koreliste = parts.get(16);
 			entry.ugedage = EntryUgedage.ONS;
 			nextUgedag = NextUgedag.TORSDAG;
 			break;
 		case TORSDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(17) );
+			entry.koreliste = parts.get(17);
 			entry.ugedage = EntryUgedage.TOR;
 			nextUgedag = NextUgedag.FREDAG;
 			break;
 		case FREDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(18) );
+			entry.koreliste = parts.get(18);
 			entry.ugedage = EntryUgedage.FRE;
 			nextUgedag = NextUgedag.LORDAG;
 			break;
 		case LORDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(19) );
+			entry.koreliste = parts.get(19);
 			entry.ugedage = EntryUgedage.LOR;
 			nextUgedag = NextUgedag.SONDAG;
 			break;
 		case SONDAG:
-			entry.koreliste = dirigeringsCache.getInstance( parts.get(20) );
+			entry.koreliste = parts.get(20);
 			entry.ugedage = EntryUgedage.SON;
 			nextUgedag = NextUgedag.MANDAG;
 			break;
 		default:
 			throw new IOException("Ukendt ugedag:" + nextUgedag);
 		}
+		
+		entry.rute = dirigeringsCache.getInstance(entry.rute);
+		entry.koreliste = dirigeringsCache.getInstance(entry.koreliste);
 
 		
 		lineCount++;
@@ -126,5 +132,10 @@
 	public String getDistributor() {
 		return "NS";
 	}
+	
+	@Override
+	public boolean calculateDistances() {
+		return false; //NS skal IKKE beregne afstande
+	}
 
 }