--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/05/22 11:22:56	2556
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/11/30 13:47:21	2787
@@ -27,13 +27,16 @@
 import dk.daoas.daoadresseservice.beans.SearchResult;
 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
 import dk.daoas.daoadresseservice.db.DatabaseLayer;
+import dk.daoas.daoadresseservice.util.DaoUtils;
 import dk.daoas.daoadresseservice.util.DeduplicateHelper;
 import dk.daoas.daoadresseservice.util.NaturalOrderComparator;
+import dk.daoas.daoadresseservice.util.NearestShortTreeMap;
 
 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;
 	
@@ -41,23 +44,53 @@
 	
 	private DataStatisticsBean stats = new DataStatisticsBean();
 	
-	ServiceConfig config;
+	private DatabaseLayer db;
+	private ServiceConfig config;
+	
 	
 	StreetnameHelper levenshteinHelper;
+	StreetnameHelper metaphoneHelper;
 	StreetnameHelper googleHelper;
 	StreetnameHelper osmHelper;
 	
 	
-	public AddressSearch(ServiceConfig config) {
+	public AddressSearch(DatabaseLayer db, ServiceConfig config) {
+		
+		this.db = db;
 		this.config = config;
 		
 		levenshteinHelper = new LevenshteinStreetnameHelper( this );
+		metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config);
 		googleHelper = new GoogleStreetnameHelper( config );
 		osmHelper = new OSMStreetnameHelper( config );
 	}
 	
+	public Address getAddressSafe(int gadeid, short husnr, String litra)  throws Exception {
+		
+		Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeid);
+		
+		if (gade == null) {
+			throw new Exception("GadeID ikke fundet");
+		}
+		
+		Map<String,Address> litraList = gade.get(husnr);
+		
+		Address addr = litraList.get(litra);
+		
+		if (addr == null) {
+			throw new Exception("Adresse ikke ikke fundet");
+		}
+				
+		return addr;
+	}
 	
+
 	public SearchResult search(String postnrStr, String adresse)  {
+		return search(postnrStr, adresse, false);
+	}
+	
+	
+	public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr)  {
 		
 		postnrStr = postnrStr.trim();
 		adresse = adresse.trim();
@@ -66,8 +99,6 @@
 		SearchRequest request = new SearchRequest();
 		SearchResult result = new SearchResult();
 		
-
-		String helperSearchKey = "";
 		
 		try {
 			request.postnr = Short.parseShort(postnrStr);
@@ -110,23 +141,25 @@
 		}
 		
 		// LookupStreetname er en indkapsling af alm + levenstein + google + osm
-		Integer gadeident = lookupStretname(request, result, helperSearchKey);
+		Integer gadeident = lookupStretname(request, result, true);
 		
 		
 		/*
-		 * Hvis der ikke er direkte hits, prøver vi at skære op til 3 ord vejnavn
+		 * Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn
 		 *
-		 *Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt
+		 * <strike>Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt</strike>*/
 		if (gadeident == null) {
+			final int MAX_TRIES = 4;
+			
 			String vejnavnParts[] = request.vejnavn.split(" ");
 			
-			for (int i=1; i<=3 && i<vejnavnParts.length; i++) {
+			for (int i=1; i<=MAX_TRIES && i<vejnavnParts.length; i++) {
 				String subVejnavn = DaoUtils.joinHelper(vejnavnParts, i);
 				
 				request.vejnavn = subVejnavn;
 				result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
 				
-				gadeident = lookupStretname(request, result, helperSearchKey);
+				gadeident = lookupStretname(request, result, false);//prøv opslag MEN UDEN GOOGLE/OSM !!!
 				
 				//hvis vi fandt vejen ud fra substrengen
 				if (gadeident != null) { 
@@ -137,7 +170,7 @@
 				request.vejnavn = result.splitResult.vej;
 				result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
 			}			
-		}*/
+		}
 		
 
 		
@@ -149,7 +182,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;			
@@ -157,15 +190,40 @@
 		
 		
 		//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) {
-			result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
-			return result;
+		if (litraList == null) { //Husnr ikke fundet
+			
+			if (naermesteHusnr) {
+				TreeMap<Short, Map<String,Address>> gadeTreeMap = (TreeMap<Short, Map<String,Address>>) gade;
+				result.anvendtHusnr = NearestShortTreeMap.getNearestKey(husnrSearch, gadeTreeMap);
+				
+				result.nearestHusnr = true;
+				litraList = gade.get(result.anvendtHusnr);
+				
+				
+			} else {
+				result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
+				return result;	
+			}
+		}
+		
+		Address addr = litraList.get( result.splitResult.litra );
+		
+		if (addr == null) { //litra ikke fundet
+			if (config.nearestLitra == true) {
+				result.nearestLitra = true;
+				addr = litraList.values().iterator().next();				
+			} else {
+				//husnr fundet men litra blev ikke fundet
+				result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; 
+				return result;	
+			}			
 		}
 		
 		result.address = addr;
@@ -188,7 +246,9 @@
 	}
 
 
-	private Integer lookupStretname(SearchRequest request, SearchResult result, String helperSearchKey) {
+	private Integer lookupStretname(SearchRequest request, SearchResult result, boolean useExternal) {
+		String helperSearchKey = "";
+		
 		Integer gadeident =  request.streetNames.get(result.vasketVejnavn);
 		
 		
@@ -204,15 +264,22 @@
 			}
 		}
 		
+		if (gadeident == null) {
+			String vej = levenshteinHelper.proposeStreetName(request, result);
+			if (vej != null) {
+				gadeident =  request.streetNames.get(vej);
+			}
+		}
+		
 		
 		// Brug OpenStreetMap før vi prøver google
 		// For google har en request limit, det har OSM ikke!
-		if ( gadeident == null) {
+		if ( gadeident == null && useExternal) {
 			String vej = osmHelper.proposeStreetName(request, result);		
 			gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
 		}
 		
-		if ( gadeident == null) {
+		if ( gadeident == null && useExternal) {
 			String vej = googleHelper.proposeStreetName(request, result);		
 			gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
 		}
@@ -241,19 +308,18 @@
 	
 	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();
 		System.out.println("Build -- stage 1");
 		
-		alleAdresser = DatabaseLayer.getAllAdresses();
+		alleAdresser = db.getAllAdresses();
 		
 		
 		/* 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);
@@ -282,14 +348,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);			
 		}
 		
 		////////////////////////////////////////////////////////////////////////////////////////
@@ -298,7 +369,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);
 			
@@ -335,7 +406,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);			
@@ -409,7 +480,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;
@@ -434,7 +505,7 @@
 		
 		////////////////////////////////////////////////////////////////////////////////////
 		long stop = System.currentTimeMillis();
-		System.out.println("Build, stage3 elapsed: " + (stop-start4) );
+		System.out.println("Build, stage4 elapsed: " + (stop-start4) );
 		System.out.println("Build -- Gathering statistics");
 				
 		for (Address addr : alleAdresser) {
@@ -452,11 +523,13 @@
 				stats.ikkeDaekketCount++;
 			}
 		}		
+		stats.totalCount = alleAdresser.size();
 		
 		
 		stats.elapsed = stop-start1;		
 		stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
 		
+		System.out.println("Build: totalCount: " + stats.totalCount);
 		System.out.println("Build: direkteCount: " + stats.direkteCount);
 		System.out.println("Build: extendedCount: " + stats.extendedCount);
 		System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
@@ -471,6 +544,10 @@
 		return stats;
 	}
 	
+	public DatabaseLayer getDatabaseLayer() {
+		return db;
+	}
+	
 	public void clear() {
 		searchPostnrVejnavnGadeid.clear();
 		searchGadeidentAdresser.clear();
@@ -493,7 +570,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;			
@@ -519,6 +596,8 @@
 				return "...." + targetAddress.rute;
 			}
 			break;
+		default:
+			System.out.println("Ukendt transport type: " + eb );
 		}		
 		return null;
 	}
@@ -534,6 +613,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;
@@ -572,6 +662,9 @@
 		aliasSet.add(vejnavn.replace("gl", "gammel") );
 		aliasSet.add(vejnavn.replace("gammel", "gl") );
 		
+		aliasSet.add(vejnavn.replace("gl", "gamle") );
+		aliasSet.add(vejnavn.replace("gamle", "gl") );
+		
 		aliasSet.add(vejnavn.replace("lille", "ll") );
 		aliasSet.add(vejnavn.replace("ll ", "lille") );
 		aliasSet.add(vejnavn.replace("ll.", "lille") );
@@ -581,7 +674,9 @@
 		aliasSet.add(vejnavn.replace("st.", "store") );
 		
 		aliasSet.add(vejnavn.replace("søndre", "sdr") );
-		aliasSet.add(vejnavn.replace("sdr", "søndre") );
+		aliasSet.add(vejnavn.replace("sdr", "søndre") );		
+		aliasSet.add(vejnavn.replace("sønder", "sdr") );
+		aliasSet.add(vejnavn.replace("sdr", "sønder") );
 
 		
 		aliasSet.add(vejnavn.replace("nørre", "nr") );
@@ -617,10 +712,20 @@
 		aliasSet.add(vejnavn.replace("john", "j") );
 		aliasSet.add(vejnavn.replace("thomas", "th") );
 		aliasSet.add(vejnavn.replace("thorvald", "th") );
+		aliasSet.add(vejnavn.replace("frederik", "fr") );
+		aliasSet.add(vejnavn.replace("frederiks", "fr") );
 		
 		
 		aliasSet.add(vejnavn.replace("christian", "chr") );
+		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") );
+		
+		aliasSet.add(vejnavn.replace("ludvig", "ludv") );
+		aliasSet.add(vejnavn.replace("ludv", "ludvig") );
 		
 		
 		// alternative stavninger
@@ -680,7 +785,15 @@
 		
 		aliasSet.add(vejnavn.replace("plads", "pl") );
 		aliasSet.add(vejnavn.replace("vænget", "vænge") );
-		
+
+		aliasSet.add(vejnavn.replace("boulevard", "blvd") );
+		aliasSet.add(vejnavn.replace("blvd", "boulevard") );
+
+		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
 		
@@ -729,28 +842,33 @@
 	
 	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();
 	}
 	
 	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) {
-		
-		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
-		return gade.get(husnr);
+	public Address getAdresse(int gadeid, String husnrStr) {
+		short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
+		String litra =  husnrStr.replaceAll("\\d", "");		
+		
+		Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
+		Map<String, Address> litraList = gade.get(husnr);
+		return litraList.get(litra);
 		
 	}