28 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
29 |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
30 |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
31 |
|
import dk.daoas.daoadresseservice.util.NaturalOrderComparator; |
32 |
|
|
33 |
public class AddressSearch { |
public class AddressSearch { |
34 |
|
|
58 |
|
|
59 |
|
|
60 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
61 |
|
|
62 |
|
postnrStr = postnrStr.trim(); |
63 |
|
adresse = adresse.trim(); |
64 |
|
|
65 |
|
|
66 |
SearchRequest request = new SearchRequest(); |
SearchRequest request = new SearchRequest(); |
67 |
SearchResult result = new SearchResult(); |
SearchResult result = new SearchResult(); |
68 |
|
|
306 |
if (orgAddress == null) |
if (orgAddress == null) |
307 |
continue; |
continue; |
308 |
|
|
309 |
|
if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
310 |
|
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
311 |
|
continue; |
312 |
|
} |
313 |
|
|
314 |
Address targetAddress = idAddressMap.get(eb.targetId); |
Address targetAddress = idAddressMap.get(eb.targetId); |
315 |
if (targetAddress == null) |
if (targetAddress == null) { |
316 |
continue; |
continue; |
317 |
|
} |
318 |
|
|
319 |
|
|
320 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) { |
321 |
continue; |
continue; |
322 |
} |
} |
323 |
|
|
324 |
if (targetAddress.distributor.equals("LUKKET")) { |
|
325 |
|
|
326 |
|
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) { |
327 |
continue; |
continue; |
328 |
} |
} |
329 |
|
|
565 |
aliasSet.add(vejnavn.replace("john", "j") ); |
aliasSet.add(vejnavn.replace("john", "j") ); |
566 |
aliasSet.add(vejnavn.replace("thomas", "th") ); |
aliasSet.add(vejnavn.replace("thomas", "th") ); |
567 |
aliasSet.add(vejnavn.replace("thorvald", "th") ); |
aliasSet.add(vejnavn.replace("thorvald", "th") ); |
568 |
|
|
569 |
|
|
570 |
|
aliasSet.add(vejnavn.replace("christian", "chr") ); |
571 |
|
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
572 |
|
|
573 |
|
|
574 |
|
|
575 |
// Romertal |
// Romertal |
670 |
public Set<String> getHusnumre(int gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
671 |
|
|
672 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
673 |
return new TreeSet<String>( gade.keySet() ); |
|
674 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
675 |
|
set.addAll( gade.keySet() ); |
676 |
|
|
677 |
|
return set; |
678 |
} |
} |
679 |
|
|
680 |
public Address getAdresse(int gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |