--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/24 09:36:05	2484
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2015/03/25 04:18:49	2495
@@ -27,15 +27,17 @@
 import dk.daoas.daoadresseservice.beans.SearchResult;
 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
 import dk.daoas.daoadresseservice.db.DatabaseLayer;
+import dk.daoas.daoadresseservice.util.DeduplicateHelper;
+import dk.daoas.daoadresseservice.util.NaturalOrderComparator;
 
 public class AddressSearch {
 
-	private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid;	
-	private Map<Long,  Map<String,Address>> searchGadeidentAdresser;
+	private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid;	
+	private Map<Integer,  Map<String,Address>> searchGadeidentAdresser;
 
 	private List<Address> alleAdresser;
 	
-	private Map<String,Long> helperCache;
+	private Map<String,Integer> helperCache;
 	
 	private DataStatisticsBean stats = new DataStatisticsBean();
 	
@@ -63,7 +65,7 @@
 		String helperSearchKey = "";
 		
 		try {
-			request.postnr = Integer.parseInt(postnrStr);
+			request.postnr = Short.parseShort(postnrStr);
 		} catch (Exception E) {
 			result.status = Status.ERROR_UNKNOWN_POSTAL;
 			return result;
@@ -100,7 +102,7 @@
 			return result;			
 		}
 		
-		Long gadeident =  request.streetNames.get(request.vasketVejnavn);
+		Integer gadeident =  request.streetNames.get(request.vasketVejnavn);
 		
 		
 		if ( gadeident == null) {
@@ -176,12 +178,12 @@
 		return result;
 	}
 	
-	private Long helperWrapper(String vej, Map<String,Long> postnrVeje, String helperSearchKey) {
+	private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) {
 		if (vej == null)
 			return null;
 		
 		String vejVasket = AddressUtils.vaskVejnavn( vej );
-		Long gadeident =  postnrVeje.get(vejVasket);
+		Integer gadeident =  postnrVeje.get(vejVasket);
 		
 		if (gadeident != null) {
 			helperCache.put(helperSearchKey, gadeident);
@@ -190,16 +192,16 @@
 		
 	}
 	
-	public Map<String,Long> getStretsByPostal(int zip) {
+	public Map<String,Integer> getStretsByPostal(int zip) {
 		return searchPostnrVejnavnGadeid.get(zip);
 	}
 
 	
 	
 	public void buildSearchStructures() throws SQLException{
-		searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>();
-		searchGadeidentAdresser = new HashMap<Long,  Map<String,Address>>();
-		helperCache = new ConcurrentHashMap<String,Long>();
+		searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>();
+		searchGadeidentAdresser = new HashMap<Integer,  Map<String,Address>>();
+		helperCache = new ConcurrentHashMap<String,Integer>();
 		
 		long start1 = System.currentTimeMillis();
 		System.out.println("Build -- stage 1");
@@ -209,19 +211,22 @@
 		
 		/* 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);
 			
-			Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr);		
+			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr);		
 			
 			if (postnrVeje == null) {
-				postnrVeje = new ConcurrentHashMap<String,Long>();
+				postnrVeje = new ConcurrentHashMap<String,Integer>();
 				searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje);
 			}
+				
 			
 			String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
-			Long gadeident = postnrVeje.get(vasketVejnavn);
+			Integer gadeident = postnrVeje.get(vasketVejnavn);
 			if (gadeident == null) {				
 				//postnrVeje.put(vasketVejnavn, a.gadeid);
 				
@@ -230,6 +235,8 @@
 				Set<String> aliaser = findVejAliaser(a.vejnavn);
 				for(String alias : aliaser) {
 					String vasketAlias = AddressUtils.vaskVejnavn(alias);
+					vasketAlias = aliasHelper.getInstance(vasketAlias);
+					
 					postnrVeje.put(vasketAlias, gadeident);	
 				}				
 			}
@@ -240,6 +247,7 @@
 				searchGadeidentAdresser.put(gadeident, gade);
 			}
 			String husnrSearch = "" + a.husnr + a.husnrbogstav;
+			husnrSearch = husnrHelper.getInstance(husnrSearch);
 			gade.put(husnrSearch, a);			
 		}
 		
@@ -251,7 +259,7 @@
 		int vaskCount = 0;
 		List<AliasBean> aliasList = DatabaseLayer.getAliasList();
 		for (AliasBean alias : aliasList) {
-			Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
+			Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
 			
 			if (postnrVeje == null) {
 				//Burde ikke kunne ske - men better safe than sorry
@@ -261,13 +269,13 @@
 			String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn);
 			String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn);
 			
-			Long gadeident = postnrVeje.get(vasketVej);
+			Integer gadeident = postnrVeje.get(vasketVej);
 			if (gadeident == null) {
 				//Kender ikke den oprindelige vej
 				continue;
 			}
 			
-			Long aliasIdent = postnrVeje.get(vasketAlias);
+			Integer aliasIdent = postnrVeje.get(vasketAlias);
 			
 			if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet
 				postnrVeje.put(vasketAlias, gadeident);	
@@ -283,6 +291,9 @@
 		System.out.println("Build, stage2 elapsed: " + (start3-start2) );
 		System.out.println("Build -- stage 3 udvidet dækning");
 		
+		DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
+		DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
+		
 		List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist();
 		for (ExtendedBean eb : extDao) {
 			
@@ -307,7 +318,9 @@
 
 			boolean covered = false;
 			if (targetAddress.distributor.equals("DAO")) {
-				orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);				
+				orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);	
+				orgAddress.rute = ruteHelper.getInstance(orgAddress.rute);
+				
 				if (orgAddress.rute != null) {
 					orgAddress.koreliste = targetAddress.koreliste;
 					covered = true;
@@ -315,7 +328,9 @@
 			}
 			
 			if (targetAddress.distributor.equals("BK")) {
-				orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);				
+				orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
+				orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste);
+				
 				if (orgAddress.koreliste != null) {
 					orgAddress.rute = targetAddress.rute;
 					covered = true;
@@ -342,7 +357,7 @@
 		System.out.println("Build, stage3 elapsed: " + (start4-start3) );
 		System.out.println("Build -- stage 4 - 100pct");
 		
-		Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
+		Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
 		for (Address addr : alleAdresser) {
 			if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {				
 				continue;
@@ -606,7 +621,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", "å") );
@@ -619,27 +634,31 @@
 		return aliasSet;
 	}
 	
-	public Set<Integer> getPostnumre() {
-		return new TreeSet<Integer>( searchPostnrVejnavnGadeid.keySet() );
+	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() ) {
+	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());
 		}
 		
 		return newMap.entrySet();
 	}
 	
-	public Set<String> getHusnumre(long gadeid) {
+	public Set<String> getHusnumre(int gadeid) {
 				
 		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
-		return new TreeSet<String>( gade.keySet() );		
+		
+		Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
+		set.addAll( gade.keySet() );
+		
+		return set;
 	}
 	
-	public Address getAdresse(long gadeid, String husnr) {
+	public Address getAdresse(int gadeid, String husnr) {
 		
 		Map<String, Address> gade = searchGadeidentAdresser.get(gadeid);
 		return gade.get(husnr);