--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/11/26 12:10:35	2782
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/11/26 12:28:27	2783
@@ -34,7 +34,8 @@
 public class AddressSearch {
 
 	private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid;	
-	private Map<Integer,  Map<String,Address>> searchGadeidentAdresser;
+	private Map<Integer,  Map<Short, Map<String,Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra
+	
 
 	private List<Address> alleAdresser;
 	
@@ -61,15 +62,17 @@
 		osmHelper = new OSMStreetnameHelper( config );
 	}
 	
-	public Address getAddressSafe(int gadeid, String husnr)  throws Exception {
+	public Address getAddressSafe(int gadeid, short husnr, String litra)  throws Exception {
 		
-		Map<String,Address> gade = searchGadeidentAdresser.get(gadeid);
+		Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeid);
 		
 		if (gade == null) {
 			throw new Exception("GadeID ikke fundet");
 		}
 		
-		Address addr = gade.get(husnr);
+		Map<String,Address> litraList = gade.get(husnr);
+		
+		Address addr = litraList.get(litra);
 		
 		if (addr == null) {
 			throw new Exception("Adresse ikke ikke fundet");
@@ -171,7 +174,7 @@
 		result.gadeident = gadeident;
 		
 		
-		Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); 
+		Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeident); 
 		if (gade == null) { //Denne søgning må ikke fejle
 			result.status = Status.ERROR_INTERNAL; 
 			return result;			
@@ -179,17 +182,26 @@
 		
 		
 		//Kunne evt klares med Iterables.get fra Guava/Collections
-		Address firstAddress = gade.values().iterator().next();
+		Address firstAddress = gade.values().iterator().next().values().iterator().next(); //Første husnr -> første litra
 		result.vej = firstAddress.vejnavn;
 		
-		String husnrSearch = "" + result.splitResult.husnr + result.splitResult.litra;
-		Address addr = gade.get(husnrSearch);
+		short husnrSearch = Short.parseShort(result.splitResult.husnr );		
+		Map<String,Address> litraList = gade.get(husnrSearch);
+		
 
-		if (addr == null) {
+		if (litraList == null) { //Husnr ikke fundet
 			result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
 			return result;
 		}
 		
+		Address addr = litraList.get( result.splitResult.litra );
+		
+		if (addr == null) {
+			//husnr fundet men litra blev ikke fundet
+			result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
+			return result;			
+		}
+		
 		result.address = addr;
 		
 		
@@ -272,7 +284,7 @@
 	
 	public void buildSearchStructures() throws SQLException{
 		searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>();
-		searchGadeidentAdresser = new HashMap<Integer,  Map<String,Address>>();
+		searchGadeidentAdresser = new HashMap<Integer,  Map<Short, Map<String,Address>>>();
 		helperCache = new ConcurrentHashMap<String,Integer>();
 		
 		long start1 = System.currentTimeMillis();
@@ -284,7 +296,6 @@
 		/* Mapper mellem db Row ID og adresse noden */
 		Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
 		DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>();
-		DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>();
 		
 		for (Address a : alleAdresser) {
 			idAddressMap.put(a.id, a);
@@ -313,14 +324,19 @@
 				}				
 			}
 			
-			Map<String, Address> gade =  searchGadeidentAdresser.get(gadeident); 
+			Map<Short, Map<String,Address>> gade =  searchGadeidentAdresser.get(gadeident); 
 			if (gade == null) {
-				gade = new HashMap<String, Address>();
+				gade = new TreeMap<Short, Map<String,Address>>();
 				searchGadeidentAdresser.put(gadeident, gade);
 			}
-			String husnrSearch = "" + a.husnr + a.husnrbogstav;
-			husnrSearch = husnrHelper.getInstance(husnrSearch);
-			gade.put(husnrSearch, a);			
+			
+			Map<String,Address> litraList = gade.get(a.husnr);
+			if (litraList == null) {
+				litraList = new HashMap<String,Address>();
+				gade.put(a.husnr, litraList);
+			}
+			
+			litraList.put(a.husnrbogstav, a);			
 		}
 		
 		////////////////////////////////////////////////////////////////////////////////////////
@@ -810,18 +826,26 @@
 	
 	public Set<String> getHusnumre(int gadeid) {
 				
-		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
+		Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
 		
 		Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
-		set.addAll( gade.keySet() );
+		for(Map<String,Address> litraList : gade.values()) {
+			for (Address a: litraList.values()) {
+				set.add( a.husnr + a.husnrbogstav );				
+			}
+		}
 		
 		return set;
 	}
 	
-	public Address getAdresse(int gadeid, String husnr) {
+	public Address getAdresse(int gadeid, String husnrStr) {
+		
+		short husnr = Short.parseShort( husnrStr.replaceAll("\\d","") );
+		String litra =  husnrStr.replaceAll("^\\d", "");
 		
-		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
-		return gade.get(husnr);
+		Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
+		Map<String, Address> litraList = gade.get(husnr);
+		return litraList.get(litra);
 		
 	}