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; |
638 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
639 |
} |
} |
640 |
|
|
641 |
public Set<Entry<String,Integer>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
642 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
643 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
644 |
for (Entry<String,Integer> entry : map.entrySet() ) { |
for (Entry<String,Integer> entry : map.entrySet() ) { |
648 |
return newMap.entrySet(); |
return newMap.entrySet(); |
649 |
} |
} |
650 |
|
|
651 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
652 |
|
|
653 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
654 |
return new TreeSet<String>( gade.keySet() ); |
|
655 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
656 |
|
set.addAll( gade.keySet() ); |
657 |
|
|
658 |
|
return set; |
659 |
} |
} |
660 |
|
|
661 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |
662 |
|
|
663 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
664 |
return gade.get(husnr); |
return gade.get(husnr); |