--- 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	2016/01/13 10:42:47	2801
@@ -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();				
@@ -248,7 +265,7 @@
 		}
 		
 		if (gadeident == null) {
-			String vej = levenshteinHelper.proposeStreetName(request, result);
+			String vej = metaphoneHelper.proposeStreetName(request, result);
 			if (vej != null) {
 				gadeident =  request.streetNames.get(vej);
 			}
@@ -304,14 +321,20 @@
 		Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
 		DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>();
 		
+		DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>();
+		DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>();
+		
+		
 		for (Address a : alleAdresser) {
 			idAddressMap.put(a.id, a);
 			
-			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr);		
+			Short postnr = shortHelper.getInstance(a.postnr);
+			
+			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);		
 			
 			if (postnrVeje == null) {
-				postnrVeje = new ConcurrentHashMap<String,Integer>();
-				searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje);
+				postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries
+				searchPostnrVejnavnGadeid.put(postnr, postnrVeje);
 			}
 				
 			
@@ -320,7 +343,7 @@
 			if (gadeident == null) {				
 				//postnrVeje.put(vasketVejnavn, a.gadeid);
 				
-				gadeident = a.gadeid;
+				gadeident = intHelper.getInstance( a.gadeid );
 				
 				Set<String> aliaser = findVejAliaser(a.vejnavn);
 				for(String alias : aliaser) {
@@ -328,9 +351,11 @@
 					vasketAlias = aliasHelper.getInstance(vasketAlias);
 					
 					postnrVeje.put(vasketAlias, gadeident);	
-				}				
+				}
+				
 			}
 			
+			
 			Map<Short, Map<String,Address>> gade =  searchGadeidentAdresser.get(gadeident); 
 			if (gade == null) {
 				gade = new TreeMap<Short, Map<String,Address>>();
@@ -345,7 +370,7 @@
 			
 			litraList.put(a.husnrbogstav, a);			
 		}
-		
+
 		////////////////////////////////////////////////////////////////////////////////////////
 		long start2 = System.currentTimeMillis();
 		System.out.println("Build, stage1 elapsed: " + (start2-start1) );
@@ -846,9 +871,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);