--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/07/15 06:52:05	2608
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/10/27 14:40:44	2758
@@ -44,7 +44,6 @@
 	
 	private DatabaseLayer db;
 	
-	ServiceConfig config;
 	
 	StreetnameHelper levenshteinHelper;
 	StreetnameHelper googleHelper;
@@ -52,7 +51,6 @@
 	
 	
 	public AddressSearch(DatabaseLayer db, ServiceConfig config) {
-		this.config = config;
 		
 		this.db = db;
 		
@@ -61,6 +59,24 @@
 		osmHelper = new OSMStreetnameHelper( config );
 	}
 	
+	public Address getAddressSafe(int gadeid, String husnr)  throws Exception{
+		SearchResult result = new SearchResult();
+		
+		Map<String,Address> gade = searchGadeidentAdresser.get(gadeid);
+		
+		if (gade == null) {
+			throw new Exception("GadeID ikke fundet");
+		}
+		
+		Address addr = gade.get("husnr");
+		
+		if (addr == null) {
+			throw new Exception("Adresse ikke ikke fundet");
+		}
+				
+		return addr;
+	}
+	
 	
 	public SearchResult search(String postnrStr, String adresse)  {
 		
@@ -547,6 +563,17 @@
 		return result;
 	}
 	
+	public List<Address> get100PctAddresses() {
+		List<Address> result = new ArrayList<Address>(120000);
+		for (Address a : alleAdresser) {
+			if ( a.daekningsType == DaekningsType.DAEKNING_100PCT) {
+				result.add(a);
+			}
+		}
+		Collections.sort(result );
+		return result;
+	}
+	
 	///////////////////////////////////////////////////////////
 	private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
 		String inject;
@@ -640,6 +667,9 @@
 		aliasSet.add(vejnavn.replace("christians", "chr") );
 		aliasSet.add(vejnavn.replace("kristian", "kr") );
 		aliasSet.add(vejnavn.replace("kristians", "kr") );
+
+		aliasSet.add(vejnavn.replace("mylius", "myl") );
+		aliasSet.add(vejnavn.replace("myl", "mylius") );
 		
 		
 		// alternative stavninger
@@ -756,10 +786,8 @@
 	
 	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() ) {
-			newMap.put(entry.getKey(), entry.getValue());
-		}
+		
+		TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering
 		
 		return newMap.entrySet();
 	}