--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/24 17:19:16	2491
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/25 12:58:13	2504
@@ -28,6 +28,7 @@
 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
 import dk.daoas.daoadresseservice.db.DatabaseLayer;
 import dk.daoas.daoadresseservice.util.DeduplicateHelper;
+import dk.daoas.daoadresseservice.util.NaturalOrderComparator;
 
 public class AddressSearch {
 
@@ -57,6 +58,11 @@
 	
 	
 	public SearchResult search(String postnrStr, String adresse)  {
+		
+		postnrStr = postnrStr.trim();
+		adresse = adresse.trim();
+		
+		
 		SearchRequest request = new SearchRequest();
 		SearchResult result = new SearchResult();
 		
@@ -64,7 +70,7 @@
 		String helperSearchKey = "";
 		
 		try {
-			request.postnr = Integer.parseInt(postnrStr);
+			request.postnr = Short.parseShort(postnrStr);
 		} catch (Exception E) {
 			result.status = Status.ERROR_UNKNOWN_POSTAL;
 			return result;
@@ -300,15 +306,24 @@
 			if (orgAddress == null)
 				continue;
 			
+			if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
+				//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden
+				continue; 
+			}
+			
 			Address targetAddress = idAddressMap.get(eb.targetId);
-			if (targetAddress == null)
+			if (targetAddress == null) {
 				continue;
+			}
 			
-			if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) {
+			
+			if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) {
 				continue;
 			}			
 			
-			if (targetAddress.distributor.equals("LUKKET")) {
+			
+			
+			if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) {
 				continue;
 			}
 			
@@ -356,7 +371,7 @@
 		System.out.println("Build, stage3 elapsed: " + (start4-start3) );
 		System.out.println("Build -- stage 4 - 100pct");
 		
-		Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
+		Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
 		for (Address addr : alleAdresser) {
 			if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {				
 				continue;
@@ -637,7 +652,7 @@
 		return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
 	}
 	
-	public Set<Entry<String,Integer>> getVejnavne(int postnr) {
+	public Set<Entry<String,Integer>> getVejnavne(short postnr) {
 		Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr);
 		TreeMap<String,Integer> newMap = new TreeMap<String,Integer>();
 		for (Entry<String,Integer> entry : map.entrySet() ) {
@@ -647,13 +662,17 @@
 		return newMap.entrySet();
 	}
 	
-	public Set<String> getHusnumre(long gadeid) {
+	public Set<String> getHusnumre(int gadeid) {
 				
 		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
-		return new TreeSet<String>( gade.keySet() );		
+		
+		Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
+		set.addAll( gade.keySet() );
+		
+		return set;
 	}
 	
-	public Address getAdresse(long gadeid, String husnr) {
+	public Address getAdresse(int gadeid, String husnr) {
 		
 		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
 		return gade.get(husnr);