--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/07/13 10:32:11	2598
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/10/30 10:37:14	2761
@@ -42,21 +42,40 @@
 	
 	private DataStatisticsBean stats = new DataStatisticsBean();
 	
-	ServiceConfig config;
+	private DatabaseLayer db;
+	
 	
 	StreetnameHelper levenshteinHelper;
 	StreetnameHelper googleHelper;
 	StreetnameHelper osmHelper;
 	
 	
-	public AddressSearch(ServiceConfig config) {
-		this.config = config;
+	public AddressSearch(DatabaseLayer db, ServiceConfig config) {
+		
+		this.db = db;
 		
 		levenshteinHelper = new LevenshteinStreetnameHelper( this );
 		googleHelper = new GoogleStreetnameHelper( config );
 		osmHelper = new OSMStreetnameHelper( config );
 	}
 	
+	public Address getAddressSafe(int gadeid, String husnr)  throws Exception {
+		
+		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)  {
 		
@@ -250,7 +269,7 @@
 		long start1 = System.currentTimeMillis();
 		System.out.println("Build -- stage 1");
 		
-		alleAdresser = DatabaseLayer.getAllAdresses();
+		alleAdresser = db.getAllAdresses();
 		
 		
 		/* Mapper mellem db Row ID og adresse noden */
@@ -301,7 +320,7 @@
 		System.out.println("Build -- stage 2 alias tabel");
 		
 		int vaskCount = 0;
-		List<AliasBean> aliasList = DatabaseLayer.getAliasList();
+		List<AliasBean> aliasList = db.getAliasList();
 		for (AliasBean alias : aliasList) {
 			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
 			
@@ -338,7 +357,7 @@
 		DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
 		DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
 		
-		List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist();
+		List<ExtendedBean> extDao = db.getExtendedAdresslist();
 		for (ExtendedBean eb : extDao) {
 			
 			Address orgAddress = idAddressMap.get(eb.orgId);			
@@ -412,7 +431,7 @@
 		System.out.println("Build, stage3 elapsed: " + (start4-start3) );
 		System.out.println("Build -- stage 4 - 100pct");
 		
-		Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
+		Map<Short,HundredePctBean> hundredePct = db.get100PctList();
 		for (Address addr : alleAdresser) {
 			if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {				
 				continue;
@@ -476,6 +495,10 @@
 		return stats;
 	}
 	
+	public DatabaseLayer getDatabaseLayer() {
+		return db;
+	}
+	
 	public void clear() {
 		searchPostnrVejnavnGadeid.clear();
 		searchGadeidentAdresser.clear();
@@ -498,7 +521,7 @@
 				return ".." + targetAddress.rute;
 			} else if (eb.afstand < 0.701) {
 				return "..." + targetAddress.rute;
-			} else if (eb.afstand < 0.501) {
+			} else if (eb.afstand < 1.001) {
 				return "...." + targetAddress.rute;
 			}
 			break;			
@@ -539,6 +562,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;
@@ -632,6 +666,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
@@ -697,6 +734,9 @@
 
 		aliasSet.add(vejnavn.replace("boulevard", "boule") );
 		aliasSet.add(vejnavn.replace("boule", "boulevard") );
+				
+		aliasSet.add(vejnavn.replace("kronborg", "krbg") ); //Krbg ladegårdsvej, 3000
+		aliasSet.add(vejnavn.replace("krbg", "kronborg") );
 		
 		// Opbyg æøå varianter over alle fundne aliaser
 		
@@ -745,10 +785,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();
 	}