152 |
|
|
153 |
/* |
/* |
154 |
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn |
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn |
155 |
* |
**/ |
|
* <strike>Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt</strike>*/ |
|
156 |
if (gadeident == null) { |
if (gadeident == null) { |
157 |
final int MAX_TRIES = 4; |
final int MAX_TRIES = 4; |
158 |
|
|
285 |
|
|
286 |
|
|
287 |
// Brug OpenStreetMap før vi prøver google |
// Brug OpenStreetMap før vi prøver google |
288 |
// For google har en request limit, det har OSM ikke! |
// google har en hard request limit, men OSM har en fair usage policy! |
289 |
if ( gadeident == null && useExternal) { |
if ( gadeident == null && useExternal) { |
290 |
String vej = osmHelper.proposeStreetName(request, result); |
String vej = osmHelper.proposeStreetName(request, result); |
291 |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
487 |
} |
} |
488 |
|
|
489 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
490 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); |
491 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); |
492 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); |
493 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); |
494 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); |
495 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); |
496 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); |
497 |
} |
} |
498 |
|
|
499 |
|
|
603 |
System.out.println("Build Completed"); |
System.out.println("Build Completed"); |
604 |
|
|
605 |
} |
} |
606 |
|
|
607 |
|
|
608 |
public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> korelisteHelper) { |
public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
609 |
if (source.rute != null) { |
if (source.rute != null) { |
610 |
return 0; |
return 0; |
611 |
} |
} |
612 |
|
|
613 |
source.koreliste = calculateExtendedBkKoreliste(bean, target); |
source.rute = calculateExtendedBkRoute(bean, target); |
614 |
source.koreliste = korelisteHelper.getInstance(source.koreliste); |
source.rute = ruteHelper.getInstance(source.rute); |
615 |
|
|
616 |
if (source.koreliste != null) { |
if (source.rute != null) { |
617 |
source.rute = target.rute; |
source.koreliste = target.koreliste; |
618 |
return 1; |
return 1; |
619 |
} else { |
} else { |
620 |
return 0; |
return 0; |
621 |
} |
} |
622 |
} |
} |
623 |
|
|
624 |
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
667 |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
668 |
return null; |
return null; |
669 |
} |
} |
670 |
|
|
671 |
|
if (eb.transport == null) { |
672 |
|
System.out.println("NULL transport type ved rute " + targetRoute.rute ); |
673 |
|
return null; |
674 |
|
} |
675 |
|
|
676 |
// /////////////////////////////////////////////////////////////////// |
// /////////////////////////////////////////////////////////////////// |
677 |
switch( eb.transport) { |
switch( eb.transport) { |
723 |
} |
} |
724 |
|
|
725 |
/////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////// |
726 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, RoutingInfo targetRoute) { |
|
727 |
|
|
728 |
|
private String calculateExtendedBkRoute(ExtendedBean eb, RoutingInfo targetRoute) { |
729 |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
730 |
return null; |
return null; |
731 |
} |
} |
736 |
} else { |
} else { |
737 |
inject = ".."; |
inject = ".."; |
738 |
} |
} |
739 |
return AddressUtils.injectIntoBk(targetRoute.koreliste, inject); |
return inject + targetRoute.rute; |
740 |
} |
} |
741 |
|
|
742 |
|
|