--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java	2015/02/16 13:49:56	2310
+++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java	2015/02/23 14:39:49	2346
@@ -1,16 +1,21 @@
 package dk.daoas.daoadresseservice;
 
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import dk.daoas.daoadresseservice.AddressUtils.SplitResult;
+import dk.daoas.daoadresseservice.admin.ServiceConfig;
 import dk.daoas.daoadresseservice.beans.Address;
+import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
 import dk.daoas.daoadresseservice.beans.ExtendedBean;
 import dk.daoas.daoadresseservice.beans.HundredePctBean;
 import dk.daoas.daoadresseservice.beans.SearchResult;
@@ -19,18 +24,17 @@
 
 public class AdressSearch {
 
-	Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid;	
-	Map<Long,  Map<String,Address>> searchGadeidentAdresser;
+	private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid;	
+	private Map<Long,  Map<String,Address>> searchGadeidentAdresser;
 
-	List<Address> alleAdresser;
+	private List<Address> alleAdresser;
 	
-	Map<String,Long> helperCache;
+	private Map<String,Long> helperCache;
 	
+	private DataStatisticsBean stats = new DataStatisticsBean(); 
 	
-	Map<Integer,HundredePctBean> hundredePct;
 	
-	
-	public SearchResult search(String postnrStr, String adresse)  {
+	public SearchResult search(ServiceConfig config, String postnrStr, String adresse)  {
 		
 		int postnr=0;
 		boolean google = false;
@@ -67,29 +71,33 @@
 		
 		
 		if ( gadeident == null) {
-			String googleVej = GeocodeHelper.googleHelper(postnr, split.vej );
-			google = true;
-			
-			if (googleVej != null) {
-				String googleVasket = AddressUtils.vaskVejnavn( googleVej );
-				gadeident =  postnrVeje.get(googleVasket);
+			if (config.useGoogle) {
+				String googleVej = GeocodeHelper.googleHelper(postnr, split.vej );
+				google = true;
 				
-				if (gadeident != null) {
-					helperCache.put(helperSearchKey, gadeident);
+				if (googleVej != null) {
+					String googleVasket = AddressUtils.vaskVejnavn( googleVej );
+					gadeident =  postnrVeje.get(googleVasket);
+					
+					if (gadeident != null) {
+						helperCache.put(helperSearchKey, gadeident);
+					}
 				}
 			}
 		}
 		
 		if ( gadeident == null) {
-			String osmVej = GeocodeHelper.openstreetmapHelper(postnr, split.vej );
-			osm = true;
-			
-			if (osmVej != null) {
-				String osmVasket = AddressUtils.vaskVejnavn( osmVej );
-				gadeident =  postnrVeje.get(osmVasket);
+			if (config.useOpenStreetMaps) {
+				String osmVej = GeocodeHelper.openstreetmapHelper(postnr, split.vej );
+				osm = true;
 				
-				if (gadeident != null) {
-					helperCache.put(helperSearchKey, gadeident);
+				if (osmVej != null) {
+					String osmVasket = AddressUtils.vaskVejnavn( osmVej );
+					gadeident =  postnrVeje.get(osmVasket);
+					
+					if (gadeident != null) {
+						helperCache.put(helperSearchKey, gadeident);
+					}
 				}
 			}
 		}
@@ -234,7 +242,7 @@
 		System.out.println("Build, stage2 elapsed: " + (start3-start2) );
 		System.out.println("Build -- stage 3 - 100pct");
 		
-		hundredePct = DatabaseLayer.get100PctList();
+		Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
 		for (Address addr : alleAdresser) {
 			if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {				
 				continue;
@@ -261,38 +269,48 @@
 		long stop = System.currentTimeMillis();
 		System.out.println("Build, stage3 elapsed: " + (stop-start3) );
 		System.out.println("Build -- Gathering statistics");
-		
-		int direkteCount = 0;
-		int extendedCount = 0;
-		int hundredePctCount = 0;
-		int ikkeDaekketCount = 0;
-		
+				
 		for (Address addr : alleAdresser) {
 			switch (addr.daekningsType) {
 			case DAEKNING_DIREKTE:
-				direkteCount++;
+				stats.direkteCount++;
 				break;
 			case DAEKNING_UDVIDET:
-				extendedCount++;
+				stats.extendedCount++;
 				break;
 			case DAEKNING_100PCT:
-				hundredePctCount++;
+				stats.hundredePctCount++;
 				break;
 			default:
-				ikkeDaekketCount++;
+				stats.ikkeDaekketCount++;
 			}
-		}
+		}		
+		
+		
+		stats.elapsed = stop-start1;		
+		stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
 		
-		System.out.println("Build: direkteCount: " + direkteCount);
-		System.out.println("Build: extendedCount: " + extendedCount);
-		System.out.println("Build: hundredePctCount: " + hundredePctCount);
-		System.out.println("Build: ikkeDaekketCount: " + ikkeDaekketCount);
+		System.out.println("Build: direkteCount: " + stats.direkteCount);
+		System.out.println("Build: extendedCount: " + stats.extendedCount);
+		System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
+		System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
 		
 		System.out.println("Build: Total Elapsed: " + (stop-start1) );
 		System.out.println("Build Completed");
 		
 	}
 	
+	public DataStatisticsBean getStatistics() {
+		return stats;
+	}
+	
+	public void clear() {
+		searchPostnrVejnavnGadeid.clear();
+		searchGadeidentAdresser.clear();
+		alleAdresser.clear();
+		helperCache.clear();
+	}
+	
 	
 	private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
 
@@ -333,7 +351,18 @@
 			break;
 		}		
 		return null;
-	}	
+	}
+	
+	public List<Address> getNonCoveredAddresses() {
+		List<Address> result = new ArrayList<Address>(60000);
+		for (Address a : alleAdresser) {
+			if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
+				result.add(a);
+			}
+		}
+		Collections.sort(result );
+		return result;
+	}
 	
 	///////////////////////////////////////////////////////////
 	private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
@@ -351,6 +380,9 @@
 		HashSet<String> aliasSet = new HashSet<String>();
 		aliasSet.add(vejnavn);
 		
+		aliasSet.add(vejnavn.replace("u", "ü") );
+		aliasSet.add(vejnavn.replace("ü", "u") );
+		
 		aliasSet.add(vejnavn.replace("alle", "allé") );
 		aliasSet.add(vejnavn.replace("allé", "alle") );		
 		
@@ -394,10 +426,7 @@
 		@SuppressWarnings("unchecked")
 		HashSet<String> variants = (HashSet<String>) aliasSet.clone();
 		
-		Iterator<String> vIt = variants.iterator();
-		while ( vIt.hasNext() ) {
-			String vVejnavn = vIt.next();
-					
+		for (String vVejnavn : variants) {					
 			// danske tegn 1
 			aliasSet.add( vVejnavn.replace("æ", "ae") );
 			aliasSet.add( vVejnavn.replace("ø", "oe") );