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 |
|
|
70 |
String helperSearchKey = ""; |
String helperSearchKey = ""; |
71 |
|
|
72 |
try { |
try { |
73 |
request.postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
74 |
} catch (Exception E) { |
} catch (Exception E) { |
75 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
76 |
return result; |
return result; |
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 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
|
320 |
|
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 |
|
|
371 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
372 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
373 |
|
|
374 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
375 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
376 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
377 |
continue; |
continue; |
652 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
653 |
} |
} |
654 |
|
|
655 |
public Set<Entry<String,Integer>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
656 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
657 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
658 |
for (Entry<String,Integer> entry : map.entrySet() ) { |
for (Entry<String,Integer> entry : map.entrySet() ) { |
662 |
return newMap.entrySet(); |
return newMap.entrySet(); |
663 |
} |
} |
664 |
|
|
665 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
666 |
|
|
667 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
668 |
return new TreeSet<String>( gade.keySet() ); |
|
669 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
670 |
|
set.addAll( gade.keySet() ); |
671 |
|
|
672 |
|
return set; |
673 |
} |
} |
674 |
|
|
675 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |
676 |
|
|
677 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
678 |
return gade.get(husnr); |
return gade.get(husnr); |