--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/02 07:45:27	2419
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/24 11:05:24	2489
@@ -9,7 +9,10 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +30,7 @@
 
 public class AddressSearch {
 
-	private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid;	
+	private Map<Short, Map<String,Long>> searchPostnrVejnavnGadeid;	
 	private Map<Long,  Map<String,Address>> searchGadeidentAdresser;
 
 	private List<Address> alleAdresser;
@@ -194,7 +197,7 @@
 	
 	
 	public void buildSearchStructures() throws SQLException{
-		searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>();
+		searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Long>>();
 		searchGadeidentAdresser = new HashMap<Long,  Map<String,Address>>();
 		helperCache = new ConcurrentHashMap<String,Long>();
 		
@@ -410,6 +413,9 @@
 	
 	
 	private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
+		if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
+			return null;
+		}
 
 		// ///////////////////////////////////////////////////////////////////
 		switch( eb.transport) {
@@ -600,7 +606,7 @@
 			//danske tegn 2
 			aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") );
 			aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") );
-			aliasSet.add( vVejnavn.replace("ø", "ae").replace("å", "aa") );
+			aliasSet.add( vVejnavn.replace("ø", "oe").replace("å", "aa") );
 			aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") );
 			aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") );
 			aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") );
@@ -613,5 +619,31 @@
 		return aliasSet;
 	}
 	
+	public Set<Short> getPostnumre() {
+		return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
+	}
+	
+	public Set<Entry<String,Long>> getVejnavne(int postnr) {
+		Map<String,Long> map = searchPostnrVejnavnGadeid.get(postnr);
+		TreeMap<String,Long> newMap = new TreeMap<String,Long>();
+		for (Entry<String,Long> entry : map.entrySet() ) {
+			newMap.put(entry.getKey(), entry.getValue());
+		}
+		
+		return newMap.entrySet();
+	}
+	
+	public Set<String> getHusnumre(long gadeid) {
+				
+		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
+		return new TreeSet<String>( gade.keySet() );		
+	}
 	
+	public Address getAdresse(long gadeid, String husnr) {
+		
+		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
+		return gade.get(husnr);
+		
+	}
+		
 }