--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/11/26 12:50:05	2784
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/11/30 13:47:21	2787
@@ -30,6 +30,7 @@
 import dk.daoas.daoadresseservice.util.DaoUtils;
 import dk.daoas.daoadresseservice.util.DeduplicateHelper;
 import dk.daoas.daoadresseservice.util.NaturalOrderComparator;
+import dk.daoas.daoadresseservice.util.NearestShortTreeMap;
 
 public class AddressSearch {
 
@@ -83,8 +84,13 @@
 		return addr;
 	}
 	
-	
+
 	public SearchResult search(String postnrStr, String adresse)  {
+		return search(postnrStr, adresse, false);
+	}
+	
+	
+	public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr)  {
 		
 		postnrStr = postnrStr.trim();
 		adresse = adresse.trim();
@@ -192,13 +198,24 @@
 		
 
 		if (litraList == null) { //Husnr ikke fundet
-			result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
-			return result;
+			
+			if (naermesteHusnr) {
+				TreeMap<Short, Map<String,Address>> gadeTreeMap = (TreeMap<Short, Map<String,Address>>) gade;
+				result.anvendtHusnr = NearestShortTreeMap.getNearestKey(husnrSearch, gadeTreeMap);
+				
+				result.nearestHusnr = true;
+				litraList = gade.get(result.anvendtHusnr);
+				
+				
+			} else {
+				result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
+				return result;	
+			}
 		}
 		
 		Address addr = litraList.get( result.splitResult.litra );
 		
-		if (addr == null) {
+		if (addr == null) { //litra ikke fundet
 			if (config.nearestLitra == true) {
 				result.nearestLitra = true;
 				addr = litraList.values().iterator().next();				
@@ -846,9 +863,8 @@
 	}
 	
 	public Address getAdresse(int gadeid, String husnrStr) {
-		
-		short husnr = Short.parseShort( husnrStr.replaceAll("\\d","") );
-		String litra =  husnrStr.replaceAll("^\\d", "");
+		short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
+		String litra =  husnrStr.replaceAll("\\d", "");		
 		
 		Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
 		Map<String, Address> litraList = gade.get(husnr);