448 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
449 |
|
|
450 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
451 |
if (orgAddress == null) |
if (orgAddress == null) { |
452 |
continue; |
continue; |
453 |
|
} |
454 |
|
|
455 |
/*if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
/*if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
456 |
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
473 |
continue; |
continue; |
474 |
} |
} |
475 |
|
|
|
orgAddress.extTarget = targetAddress; |
|
|
orgAddress.extAfstand = eb.afstand; |
|
476 |
|
|
477 |
boolean covered = false; |
|
478 |
|
short modifyCounter = 0; |
479 |
|
|
480 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
481 |
orgAddress.routingMandag.rute = calculateExtendedDaoRoute(eb, targetAddress.routingMandag); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, korelisteHelper); |
482 |
orgAddress.routingMandag.rute = ruteHelper.getInstance(orgAddress.routingMandag.rute); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, korelisteHelper); |
483 |
|
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, korelisteHelper); |
484 |
if (orgAddress.routingMandag.rute != null) { |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, korelisteHelper); |
485 |
orgAddress.routingMandag.koreliste = targetAddress.routingMandag.koreliste; |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, korelisteHelper); |
486 |
covered = true; |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, korelisteHelper); |
487 |
} |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); |
488 |
} |
} |
489 |
|
|
490 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
491 |
orgAddress.routingMandag.koreliste = calculateExtendedBkKoreliste(eb, targetAddress.routingMandag); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, korelisteHelper); |
492 |
orgAddress.routingMandag.koreliste = korelisteHelper.getInstance(orgAddress.routingMandag.koreliste); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, korelisteHelper); |
493 |
|
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, korelisteHelper); |
494 |
if (orgAddress.routingMandag.koreliste != null) { |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, korelisteHelper); |
495 |
orgAddress.routingMandag.rute = targetAddress.routingMandag.rute; |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, korelisteHelper); |
496 |
covered = true; |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, korelisteHelper); |
497 |
} |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); |
498 |
} |
} |
499 |
|
|
500 |
if (covered) { //Kopier resten af felterne |
if (modifyCounter > 0) { |
501 |
|
orgAddress.extTarget = targetAddress; |
502 |
|
orgAddress.extAfstand = eb.afstand; |
503 |
|
} |
504 |
|
|
505 |
|
if (modifyCounter>0 && orgAddress.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { //Kopier resten af felterne |
506 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
507 |
orgAddress.dbkBane = targetAddress.dbkBane; |
orgAddress.dbkBane = targetAddress.dbkBane; |
508 |
|
|
541 |
} |
} |
542 |
|
|
543 |
short modifyCounter = 0; |
short modifyCounter = 0; |
544 |
modifyCounter += update100PctRouting(bean, addr.routingMandag); |
modifyCounter += updateRouting100Pct(bean, addr.routingMandag); |
545 |
modifyCounter += update100PctRouting(bean, addr.routingTirsdag); |
modifyCounter += updateRouting100Pct(bean, addr.routingTirsdag); |
546 |
modifyCounter += update100PctRouting(bean, addr.routingOnsdag); |
modifyCounter += updateRouting100Pct(bean, addr.routingOnsdag); |
547 |
modifyCounter += update100PctRouting(bean, addr.routingTorsdag); |
modifyCounter += updateRouting100Pct(bean, addr.routingTorsdag); |
548 |
modifyCounter += update100PctRouting(bean, addr.routingFredag); |
modifyCounter += updateRouting100Pct(bean, addr.routingFredag); |
549 |
modifyCounter += update100PctRouting(bean, addr.routingLordag); |
modifyCounter += updateRouting100Pct(bean, addr.routingLordag); |
550 |
modifyCounter += update100PctRouting(bean, addr.routingSondag); |
modifyCounter += updateRouting100Pct(bean, addr.routingSondag); |
551 |
|
|
552 |
|
|
553 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) { |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) { |
604 |
|
|
605 |
} |
} |
606 |
|
|
607 |
public short update100PctRouting(HundredePctBean bean, RoutingInfo routing) { |
public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> korelisteHelper) { |
608 |
|
if (source.rute != null) { |
609 |
|
return 0; |
610 |
|
} |
611 |
|
|
612 |
|
source.koreliste = calculateExtendedBkKoreliste(bean, target); |
613 |
|
source.koreliste = korelisteHelper.getInstance(source.koreliste); |
614 |
|
|
615 |
|
if (source.koreliste != null) { |
616 |
|
source.rute = target.rute; |
617 |
|
return 1; |
618 |
|
} else { |
619 |
|
return 0; |
620 |
|
} |
621 |
|
} |
622 |
|
|
623 |
|
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> korelisteHelper) { |
624 |
|
if (source.rute != null) { |
625 |
|
return 0; |
626 |
|
} |
627 |
|
|
628 |
|
source.rute = calculateExtendedDaoRoute(bean, target); |
629 |
|
source.rute = korelisteHelper.getInstance(source.rute); |
630 |
|
|
631 |
|
if (source.rute != null) { |
632 |
|
source.koreliste = target.koreliste; |
633 |
|
return 1; |
634 |
|
} else { |
635 |
|
return 0; |
636 |
|
} |
637 |
|
|
638 |
|
} |
639 |
|
|
640 |
|
public short updateRouting100Pct(HundredePctBean bean, RoutingInfo routing) { |
641 |
if (routing.rute == null) { |
if (routing.rute == null) { |
642 |
routing.rute = bean.rute; |
routing.rute = bean.rute; |
643 |
routing.koreliste = bean.koreliste; |
routing.koreliste = bean.koreliste; |