--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/01/19 10:01:00 2820 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/01/19 10:02:51 2821 @@ -459,21 +459,21 @@ boolean covered = false; if (targetAddress.distributor.equals("DAO")) { - orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); - orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); + orgAddress.ruteMandag = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); + orgAddress.ruteMandag = ruteHelper.getInstance(orgAddress.ruteMandag); - if (orgAddress.rute != null) { - orgAddress.koreliste = targetAddress.koreliste; + if (orgAddress.ruteMandag != null) { + orgAddress.korelisteMandag = targetAddress.korelisteMandag; covered = true; } } if (targetAddress.distributor.equals("BK")) { - orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); - orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); + orgAddress.korelisteMandag = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); + orgAddress.korelisteMandag = korelisteHelper.getInstance(orgAddress.korelisteMandag); - if (orgAddress.koreliste != null) { - orgAddress.rute = targetAddress.rute; + if (orgAddress.korelisteMandag != null) { + orgAddress.ruteMandag = targetAddress.ruteMandag; covered = true; } } @@ -519,8 +519,8 @@ } addr.daekningsType = DaekningsType.DAEKNING_100PCT; - addr.rute = bean.rute; - addr.koreliste = bean.koreliste; + addr.ruteMandag = bean.rute; + addr.korelisteMandag = bean.koreliste; addr.dbkBane = bean.dbkBane; addr.distributor = bean.distributor; } @@ -579,7 +579,7 @@ private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { - if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel + if (targetAddress.ruteMandag == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel return null; } @@ -587,35 +587,35 @@ switch( eb.transport) { case "cykel": if (eb.afstand < 0.151) { - return "." + targetAddress.rute; + return "." + targetAddress.ruteMandag; } else if (eb.afstand < 0.501) { - return ".." + targetAddress.rute; + return ".." + targetAddress.ruteMandag; } else if (eb.afstand < 0.701) { - return "..." + targetAddress.rute; + return "..." + targetAddress.ruteMandag; } else if (eb.afstand < 1.001) { - return "...." + targetAddress.rute; + return "...." + targetAddress.ruteMandag; } break; case "scooter": if (eb.afstand < 0.151) { - return "." + targetAddress.rute; + return "." + targetAddress.ruteMandag; } else if (eb.afstand < 0.801) { - return ".." + targetAddress.rute; + return ".." + targetAddress.ruteMandag; } else if (eb.afstand < 1.201) { - return "..." + targetAddress.rute; + return "..." + targetAddress.ruteMandag; } else if (eb.afstand < 2.101) { - return "...." + targetAddress.rute; + return "...." + targetAddress.ruteMandag; } break; case "bil": if (eb.afstand < 0.151) { - return "." + targetAddress.rute; + return "." + targetAddress.ruteMandag; } else if (eb.afstand < 1.001) { - return ".." + targetAddress.rute; + return ".." + targetAddress.ruteMandag; } else if (eb.afstand < 1.601) { - return "..." + targetAddress.rute; + return "..." + targetAddress.ruteMandag; } else if (eb.afstand < 2.601) { - return "...." + targetAddress.rute; + return "...." + targetAddress.ruteMandag; } break; default: @@ -654,7 +654,7 @@ } else { inject = ".."; } - return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); + return AddressUtils.injectIntoBk(targetAddress.korelisteMandag, inject); }