--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java 2015/02/13 14:38:59 2279 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/AdressSearch.java 2015/02/14 09:31:46 2292 @@ -2,12 +2,18 @@ import java.sql.SQLException; import java.util.HashMap; +import java.util.HashSet; 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.SearchResult.Status; +import dk.daoas.daoadresseservice.beans.Address; +import dk.daoas.daoadresseservice.beans.ExtendedBean; +import dk.daoas.daoadresseservice.beans.HundredePctBean; +import dk.daoas.daoadresseservice.beans.SearchResult; +import dk.daoas.daoadresseservice.beans.SearchResult.Status; import dk.daoas.daoadresseservice.db.DatabaseLayer; public class AdressSearch { @@ -17,11 +23,13 @@ List
alleAdresser; - /* Mapper mellem db Row ID og adresse noden */ - Map idAddressMap; + + Map hundredePct; public SearchResult search(String postnrStr, String adresse) { +//long start1 = System.currentTimeMillis(); + int postnr=0; try { @@ -29,6 +37,7 @@ } catch (Exception E) { return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); } +//long start2 = System.currentTimeMillis(); Map postnrVeje = searchPostnrVejnavnGadeid.get(postnr); @@ -36,23 +45,29 @@ return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); } +//long start3 = System.currentTimeMillis(); + SplitResult split = AddressUtils.splitAdresse(adresse); - String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); + String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); if (split.husnr.length() == 0) { return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); } +//long start4 = System.currentTimeMillis(); Long gadeident = postnrVeje.get(vasketVejnavn); if (gadeident == null) { return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); - } + } +//long start5 = System.currentTimeMillis(); Map gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle +//long start6 = System.currentTimeMillis(); String husnrSearch = "" + split.husnr + split.litra; Address addr = gade.get(husnrSearch); +//long start7 = System.currentTimeMillis(); if (addr == null) { return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); } @@ -64,6 +79,16 @@ if (addr.distributor.equals("LUKKET")) { return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? } + +/* +System.out.println("Search2: " + (start2-start1) ); +System.out.println("Search3: " + (start3-start1) ); +System.out.println("Search4: " + (start4-start1) ); +System.out.println("Search5: " + (start5-start1) ); +System.out.println("Search6: " + (start6-start1) ); +System.out.println("Search7: " + (start7-start1) ); +*/ + return new SearchResult(addr); @@ -73,12 +98,15 @@ public void buildSearchStructures() throws SQLException{ searchPostnrVejnavnGadeid = new HashMap>(); searchGadeidentAdresser = new HashMap>(); - idAddressMap = new HashMap(); - + System.out.println("Build -- stage 1"); alleAdresser = DatabaseLayer.getAllAdresses(); + + /* Mapper mellem db Row ID og adresse noden */ + Map idAddressMap = new HashMap( alleAdresser.size() ); + for (Address a : alleAdresser) { idAddressMap.put(a.id, a); @@ -89,9 +117,17 @@ searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); } - Long gadeident = postnrVeje.get(a.vasketVejnavn); + String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); + Long gadeident = postnrVeje.get(vasketVejnavn); if (gadeident == null) { - postnrVeje.put(a.vasketVejnavn, a.gadeid); + //postnrVeje.put(vasketVejnavn, a.gadeid); + + Set aliaser = findVejAliaser(a.vejnavn); + for(String alias : aliaser) { + String vasketAlias = AddressUtils.vaskVejnavn(alias); + postnrVeje.put(vasketAlias, a.gadeid); + } + } Map gade = searchGadeidentAdresser.get(a.gadeid); @@ -100,7 +136,7 @@ searchGadeidentAdresser.put(a.gadeid, gade); } String husnrSearch = "" + a.husnr + a.husnrbogstav; - gade.put(husnrSearch, a); + gade.put(husnrSearch, a); } @@ -129,11 +165,25 @@ orgAddress.extTarget = targetAddress; orgAddress.extAfstand = eb.afstand; - orgAddress.rute = calculateExtendedRoute(eb,orgAddress,targetAddress); + boolean covered = false; + if (targetAddress.distributor.equals("DAO")) { + orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); + if (orgAddress.rute != null) { + orgAddress.koreliste = targetAddress.koreliste; + covered = true; + } + } - if (orgAddress.rute != null) { + if (targetAddress.distributor.equals("BK")) { + orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); + if (orgAddress.koreliste != null) { + orgAddress.rute = targetAddress.rute; + covered = true; + } + } + + if (covered) { //Kopier resten af felterne orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; - orgAddress.koreliste = targetAddress.koreliste; orgAddress.dbkBane = targetAddress.dbkBane; /* Sådan gør den gamle service */ @@ -142,15 +192,17 @@ orgAddress.distributor = targetAddress.distributor; } - - } + + // nu skal vi ikke bruge idAddressMap længere + idAddressMap = null; + ////////////////////////////////////////////////////////////////////////////////////// System.out.println("Build -- stage 3 - 100pct"); - Map hundredePct = DatabaseLayer.get100PctList(); + hundredePct = DatabaseLayer.get100PctList(); for (Address addr : alleAdresser) { - if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { + if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { continue; } @@ -171,63 +223,151 @@ addr.distributor = bean.distributor; } + //////////////////////////////////////////////////////////////////////////////////// + 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++; + break; + case DAEKNING_UDVIDET: + extendedCount++; + break; + case DAEKNING_100PCT: + hundredePctCount++; + break; + default: + ikkeDaekketCount++; + } + } + + 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 Completed"); + } - private String calculateExtendedRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { - switch (targetAddress.distributor) { - case "DAO": - // /////////////////////////////////////////////////////////////////// - switch( eb.transport) { - case "cykel": - if (eb.afstand < 0.151) { - return "." + targetAddress.rute; - } else if (eb.afstand < 0.501) { - return ".." + targetAddress.rute; - } else if (eb.afstand < 0.701) { - return "..." + targetAddress.rute; - } else if (eb.afstand < 0.501) { - return "...." + targetAddress.rute; - } - break; - case "scooter": - if (eb.afstand < 0.151) { - return "." + targetAddress.rute; - } else if (eb.afstand < 0.801) { - return ".." + targetAddress.rute; - } else if (eb.afstand < 1.201) { - return "..." + targetAddress.rute; - } else if (eb.afstand < 2.101) { - return "...." + targetAddress.rute; - } - break; - case "bil": - if (eb.afstand < 0.151) { - return "." + targetAddress.rute; - } else if (eb.afstand < 1.001) { - return ".." + targetAddress.rute; - } else if (eb.afstand < 1.601) { - return "..." + targetAddress.rute; - } else if (eb.afstand < 2.601) { - return "...." + targetAddress.rute; - } - break; + private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { + + // /////////////////////////////////////////////////////////////////// + switch( eb.transport) { + case "cykel": + if (eb.afstand < 0.151) { + return "." + targetAddress.rute; + } else if (eb.afstand < 0.501) { + return ".." + targetAddress.rute; + } else if (eb.afstand < 0.701) { + return "..." + targetAddress.rute; + } else if (eb.afstand < 0.501) { + return "...." + targetAddress.rute; } - break; - - /////////////////////////////////////////////////////////// - - case "BK": - String inject; - if (eb.afstand <= 0.500) { - inject = "."; - } else { - inject = ".."; + break; + case "scooter": + if (eb.afstand < 0.151) { + return "." + targetAddress.rute; + } else if (eb.afstand < 0.801) { + return ".." + targetAddress.rute; + } else if (eb.afstand < 1.201) { + return "..." + targetAddress.rute; + } else if (eb.afstand < 2.101) { + return "...." + targetAddress.rute; } - return AddressUtils.injectIntoBk(targetAddress.rute, inject); - } + break; + case "bil": + if (eb.afstand < 0.151) { + return "." + targetAddress.rute; + } else if (eb.afstand < 1.001) { + return ".." + targetAddress.rute; + } else if (eb.afstand < 1.601) { + return "..." + targetAddress.rute; + } else if (eb.afstand < 2.601) { + return "...." + targetAddress.rute; + } + break; + } return null; } + /////////////////////////////////////////////////////////// + private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { + String inject; + if (eb.afstand <= 0.500) { + inject = "."; + } else { + inject = ".."; + } + return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); + } + + private Set findVejAliaser(String vejnavn) { + Set aliasSet = new HashSet(); + aliasSet.add(vejnavn); + + aliasSet.add(vejnavn.replace("alle", "allé") ); + aliasSet.add(vejnavn.replace("allé", "alle") ); + + // danske tegn 1 + aliasSet.add(vejnavn.replace("æ", "ae") ); + aliasSet.add(vejnavn.replace("ø", "oe") ); + aliasSet.add(vejnavn.replace("å", "aa") ); + aliasSet.add(vejnavn.replace("ae", "æ") ); + aliasSet.add(vejnavn.replace("oe", "ø") ); + aliasSet.add(vejnavn.replace("aa", "å") ); + + //danske tegn 2 + aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe") ); + aliasSet.add( vejnavn.replace("æ", "ae").replace("å", "aa") ); + aliasSet.add( vejnavn.replace("ø", "ae").replace("å", "aa") ); + aliasSet.add( vejnavn.replace("ae", "æ").replace("oe","ø") ); + aliasSet.add( vejnavn.replace("ae", "æ").replace("aa","å") ); + aliasSet.add( vejnavn.replace("oe", "ø").replace("aa", "å") ); + + //danske tegn 3 + aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") ); + aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); + + + aliasSet.add(vejnavn.replace("gl", "gammel") ); + aliasSet.add(vejnavn.replace("gammel", "gl") ); + + aliasSet.add(vejnavn.replace("lille", "ll") ); + aliasSet.add(vejnavn.replace("ll ", "lille") ); + aliasSet.add(vejnavn.replace("ll.", "lille") ); + + aliasSet.add(vejnavn.replace("store", "st") ); + aliasSet.add(vejnavn.replace("st ", "store") ); + aliasSet.add(vejnavn.replace("st.", "store") ); + + aliasSet.add(vejnavn.replace("søndre", "sdr") ); + aliasSet.add(vejnavn.replace("sdr", "søndre") ); + + + aliasSet.add(vejnavn.replace("nørre", "nr") ); + aliasSet.add(vejnavn.replace("nr", "nørre") ); + + aliasSet.add(vejnavn.replace("nordre", "ndr") ); + aliasSet.add(vejnavn.replace("ndr", "nordre") ); + + aliasSet.add(vejnavn.replace("sankt", "skt") ); + aliasSet.add(vejnavn.replace("skt", "sankt") ); + + aliasSet.add(vejnavn.replace("skt", "sct") ); + aliasSet.add(vejnavn.replace("sct", "skt") ); + + + + return aliasSet; + } + }