--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2016/03/07 20:40:40	2966
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2016/03/07 20:50:57	2967
@@ -18,6 +18,7 @@
 
 import dk.daoas.daoadresseservice.admin.ServiceConfig;
 import dk.daoas.daoadresseservice.beans.Address;
+import dk.daoas.daoadresseservice.beans.Address.RoutingInfo;
 import dk.daoas.daoadresseservice.beans.AliasBean;
 import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
 import dk.daoas.daoadresseservice.beans.ExtendedBean;
@@ -476,7 +477,7 @@
 
 			boolean covered = false;
 			if (targetAddress.distributor.equals("DAO")) {
-				orgAddress.routingMandag.rute = calculateExtendedDaoRoute(eb, targetAddress);	
+				orgAddress.routingMandag.rute = calculateExtendedDaoRoute(eb, targetAddress.routingMandag);	
 				orgAddress.routingMandag.rute = ruteHelper.getInstance(orgAddress.routingMandag.rute);
 				
 				if (orgAddress.routingMandag.rute != null) {
@@ -486,7 +487,7 @@
 			}
 			
 			if (targetAddress.distributor.equals("BK")) {
-				orgAddress.routingMandag.koreliste = calculateExtendedBkKoreliste(eb, targetAddress);
+				orgAddress.routingMandag.koreliste = calculateExtendedBkKoreliste(eb, targetAddress.routingMandag);
 				orgAddress.routingMandag.koreliste = korelisteHelper.getInstance(orgAddress.routingMandag.koreliste);
 				
 				if (orgAddress.routingMandag.koreliste != null) {
@@ -601,8 +602,8 @@
 	}
 	
 	
-	private String calculateExtendedDaoRoute(ExtendedBean eb, Address targetAddress) {
-		if (targetAddress.routingMandag.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
+	private String calculateExtendedDaoRoute(ExtendedBean eb, RoutingInfo targetRoute) {
+		if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
 			return null;
 		}
 
@@ -610,35 +611,35 @@
 		switch( eb.transport) {
 		case "cykel":
 			if (eb.afstand < 0.151) {
-				return "." + targetAddress.routingMandag.rute;
+				return "." + targetRoute.rute;
 			} else if (eb.afstand < 0.501) {
-				return ".." + targetAddress.routingMandag.rute;
+				return ".." + targetRoute.rute;
 			} else if (eb.afstand < 0.701) {
-				return "..." + targetAddress.routingMandag.rute;
+				return "..." + targetRoute.rute;
 			} else if (eb.afstand < 1.001) {
-				return "...." + targetAddress.routingMandag.rute;
+				return "...." + targetRoute.rute;
 			}
 			break;			
 		case "scooter":
 			if (eb.afstand < 0.151) {
-				return "." + targetAddress.routingMandag.rute;
+				return "." + targetRoute.rute;
 			} else if (eb.afstand < 0.801) {
-				return ".." + targetAddress.routingMandag.rute;
+				return ".." + targetRoute.rute;
 			} else if (eb.afstand < 1.201) {
-				return "..." + targetAddress.routingMandag.rute;
+				return "..." + targetRoute.rute;
 			} else if (eb.afstand < 2.101) {
-				return "...." + targetAddress.routingMandag.rute;
+				return "...." + targetRoute.rute;
 			}
 			break;				
 		case "bil":
 			if (eb.afstand < 0.151) {
-				return "." + targetAddress.routingMandag.rute;
+				return "." + targetRoute.rute;
 			} else if (eb.afstand < 1.001) {
-				return ".." + targetAddress.routingMandag.rute;
+				return ".." + targetRoute.rute;
 			} else if (eb.afstand < 1.601) {
-				return "..." + targetAddress.routingMandag.rute;
+				return "..." + targetRoute.rute;
 			} else if (eb.afstand < 2.601) {
-				return "...." + targetAddress.routingMandag.rute;
+				return "...." + targetRoute.rute;
 			}
 			break;
 		default:
@@ -656,8 +657,8 @@
 	}
 	
 	///////////////////////////////////////////////////////////
-	private String calculateExtendedBkKoreliste(ExtendedBean eb, Address targetAddress) {
-		if (targetAddress.routingMandag.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
+	private String calculateExtendedBkKoreliste(ExtendedBean eb, RoutingInfo targetRoute) {
+		if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
 			return null;
 		}
 		
@@ -667,7 +668,7 @@
 		} else {
 			inject = "..";
 		}
-		return AddressUtils.injectIntoBk(targetAddress.routingMandag.koreliste, inject);
+		return AddressUtils.injectIntoBk(targetRoute.koreliste, inject);
 	}