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 |
|
|
65 |
String helperSearchKey = ""; |
String helperSearchKey = ""; |
66 |
|
|
67 |
try { |
try { |
68 |
request.postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
69 |
} catch (Exception E) { |
} catch (Exception E) { |
70 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
71 |
return result; |
return result; |
301 |
if (orgAddress == null) |
if (orgAddress == null) |
302 |
continue; |
continue; |
303 |
|
|
304 |
|
if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
305 |
|
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
306 |
|
continue; |
307 |
|
} |
308 |
|
|
309 |
Address targetAddress = idAddressMap.get(eb.targetId); |
Address targetAddress = idAddressMap.get(eb.targetId); |
310 |
if (targetAddress == null) |
if (targetAddress == null) { |
311 |
continue; |
continue; |
312 |
|
} |
313 |
|
|
314 |
|
|
315 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) { |
316 |
continue; |
continue; |
317 |
} |
} |
318 |
|
|
319 |
if (targetAddress.distributor.equals("LUKKET")) { |
|
320 |
|
|
321 |
|
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) { |
322 |
continue; |
continue; |
323 |
} |
} |
324 |
|
|
366 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
367 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
368 |
|
|
369 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
370 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
371 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
372 |
continue; |
continue; |
647 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
648 |
} |
} |
649 |
|
|
650 |
public Set<Entry<String,Integer>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
651 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
652 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
653 |
for (Entry<String,Integer> entry : map.entrySet() ) { |
for (Entry<String,Integer> entry : map.entrySet() ) { |
657 |
return newMap.entrySet(); |
return newMap.entrySet(); |
658 |
} |
} |
659 |
|
|
660 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
661 |
|
|
662 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
663 |
return new TreeSet<String>( gade.keySet() ); |
|
664 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
665 |
|
set.addAll( gade.keySet() ); |
666 |
|
|
667 |
|
return set; |
668 |
} |
} |
669 |
|
|
670 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |
671 |
|
|
672 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
673 |
return gade.get(husnr); |
return gade.get(husnr); |