--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2015/05/22 06:43:40 2554 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java 2016/06/09 09:53:13 3045 @@ -6,7 +6,6 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -19,6 +18,7 @@ import dk.daoas.daoadresseservice.admin.ServiceConfig; import dk.daoas.daoadresseservice.beans.Address; +import dk.daoas.daoadresseservice.beans.Address.RoutingInfo; import dk.daoas.daoadresseservice.beans.AliasBean; import dk.daoas.daoadresseservice.beans.DataStatisticsBean; import dk.daoas.daoadresseservice.beans.ExtendedBean; @@ -27,37 +27,76 @@ 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> searchPostnrVejnavnGadeid; - private Map> searchGadeidentAdresser; - - private List
alleAdresser; + private Map>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra + + private ArrayList
ikkeDaekkedeAdresser = new ArrayList
(60000); + private ArrayList
hundredePctAdresser = new ArrayList
(120000); private Map helperCache; 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 ); + levenshteinHelper = new LevenshteinStreetnameHelper(); + metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config); googleHelper = new GoogleStreetnameHelper( config ); osmHelper = new OSMStreetnameHelper( config ); } + public Address getAddressSafe(int gadeid, short husnr, String litra) throws Exception { + + Map> gade = searchGadeidentAdresser.get(gadeid); + + if (gade == null) { + throw new Exception("GadeID ikke fundet"); + } + + List
litraList = gade.get(husnr); + + Address addr = null; + for(Address a : litraList) { + if (a.husnrbogstav.equals(litra) ) { + addr = a; + break; + } + } + + 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 +105,6 @@ SearchRequest request = new SearchRequest(); SearchResult result = new SearchResult(); - - String helperSearchKey = ""; try { request.postnr = Short.parseShort(postnrStr); @@ -109,32 +146,35 @@ return result; } - Integer gadeident = request.streetNames.get(result.vasketVejnavn); + // LookupStreetname er en indkapsling af alm + levenstein + google + osm + Integer gadeident = lookupStretname(request, result, true); - if ( gadeident == null) { - helperSearchKey = "" + request.postnr + "/" + result.vasketVejnavn; - gadeident = helperCache.get(helperSearchKey); - } - + /* + * Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn + **/ 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) { - String vej = osmHelper.proposeStreetName(request, result); - gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); - } - - if ( gadeident == null) { - String vej = googleHelper.proposeStreetName(request, result); - gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); + final int MAX_TRIES = 4; + + String vejnavnParts[] = request.vejnavn.split(" "); + + for (int i=1; i<=MAX_TRIES && i gade = searchGadeidentAdresser.get(gadeident); + Map> gade = searchGadeidentAdresser.get(gadeident); if (gade == null) { //Denne søgning må ikke fejle result.status = Status.ERROR_INTERNAL; return result; } + //Kunne evt klares med Iterables.get fra Guava/Collections - Address firstAddress = gade.values().iterator().next(); + Address firstAddress = gade.values().iterator().next().get(0); //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 ); + List
litraList = gade.get(husnrSearch); + - if (addr == null) { - result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; - return result; + if (litraList == null) { //Husnr ikke fundet + + if (naermesteHusnr) { + TreeMap> gadeTreeMap = (TreeMap>) 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 = null; + for(Address a : litraList) { + if ( a.husnrbogstav.equals( result.splitResult.litra ) ) { + addr = a; + break; + } + } + + if (addr == null) { //litra ikke fundet + if (config.nearestLitra == true || naermesteHusnr == true) { + result.nearestLitra = true; + addr = litraList.get(0); + } else { + //husnr fundet men litra blev ikke fundet + result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; + return result; + } } result.address = addr; @@ -184,6 +256,47 @@ return result; } + + + private Integer lookupStretname(SearchRequest request, SearchResult result, boolean useExternal) { + String helperSearchKey = ""; + + Integer gadeident = request.streetNames.get(result.vasketVejnavn); + + + if ( gadeident == null) { + helperSearchKey = "" + request.postnr + "/" + result.vasketVejnavn; + gadeident = helperCache.get(helperSearchKey); + } + + if (gadeident == null) { + String vej = levenshteinHelper.proposeStreetName(request, result); + if (vej != null) { + gadeident = request.streetNames.get(vej); + } + } + + if (gadeident == null) { + String vej = metaphoneHelper.proposeStreetName(request, result); + if (vej != null) { + gadeident = request.streetNames.get(vej); + } + } + + + // Brug OpenStreetMap før vi prøver google + // google har en hard request limit, men OSM har en fair usage policy! + if ( gadeident == null && useExternal) { + String vej = osmHelper.proposeStreetName(request, result); + gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); + } + + if ( gadeident == null && useExternal) { + String vej = googleHelper.proposeStreetName(request, result); + gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); + } + return gadeident; + } private Integer helperWrapper(String vej, Map postnrVeje, String helperSearchKey) { if (vej == null) @@ -207,28 +320,39 @@ public void buildSearchStructures() throws SQLException{ searchPostnrVejnavnGadeid = new HashMap>(); - searchGadeidentAdresser = new HashMap>(); + searchGadeidentAdresser = new HashMap>>(); helperCache = new ConcurrentHashMap(); + // ////////////////////// + // Start stage1 + long start1 = System.currentTimeMillis(); System.out.println("Build -- stage 1"); - alleAdresser = DatabaseLayer.getAllAdresses(); + List
alleAdresser = db.getAllAdresses(); - /* Mapper mellem db Row ID og adresse noden */ + /* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/ Map idAddressMap = new HashMap( alleAdresser.size() ); - DeduplicateHelper aliasHelper = new DeduplicateHelper(); - DeduplicateHelper husnrHelper = new DeduplicateHelper(); + + + DeduplicateHelper shortHelper = new DeduplicateHelper(); + DeduplicateHelper intHelper = new DeduplicateHelper(); + + AliasGenerator aliasGenerator = new AliasGenerator(); + + ArrayList> litraListCache = new ArrayList>(); for (Address a : alleAdresser) { idAddressMap.put(a.id, a); - Map postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); + Short postnr = shortHelper.getInstance(a.postnr); + + Map postnrVeje = searchPostnrVejnavnGadeid.get(postnr); if (postnrVeje == null) { - postnrVeje = new ConcurrentHashMap(); - searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); + postnrVeje = new HashMap(10240); //lige nu indeholder den største 9500 entries + searchPostnrVejnavnGadeid.put(postnr, postnrVeje); } @@ -237,34 +361,50 @@ if (gadeident == null) { //postnrVeje.put(vasketVejnavn, a.gadeid); - gadeident = a.gadeid; + gadeident = intHelper.getInstance( a.gadeid ); + + Set aliaser = aliasGenerator.findVejAliaser(a.vejnavn); + for(String alias : aliaser) { + postnrVeje.put(alias, gadeident); + } - Set aliaser = findVejAliaser(a.vejnavn); - for(String alias : aliaser) { - String vasketAlias = AddressUtils.vaskVejnavn(alias); - vasketAlias = aliasHelper.getInstance(vasketAlias); - - postnrVeje.put(vasketAlias, gadeident); - } } - Map gade = searchGadeidentAdresser.get(gadeident); + + Map> gade = searchGadeidentAdresser.get(gadeident); if (gade == null) { - gade = new HashMap(); + gade = new TreeMap >(); searchGadeidentAdresser.put(gadeident, gade); } - String husnrSearch = "" + a.husnr + a.husnrbogstav; - husnrSearch = husnrHelper.getInstance(husnrSearch); - gade.put(husnrSearch, a); + + List
litraList = gade.get(a.husnr); + if (litraList == null) { + litraList = new ArrayList
(); + gade.put(a.husnr, litraList); + + litraListCache.add( (ArrayList
) litraList); + } + litraList.add(a); } + for (ArrayList
list: litraListCache) { + list.trimToSize(); + } + + + litraListCache.clear(); //frigiv hukommelse inden stage2 + aliasGenerator.clear(); + shortHelper.clear(); + intHelper.clear(); + + //////////////////////////////////////////////////////////////////////////////////////// long start2 = System.currentTimeMillis(); System.out.println("Build, stage1 elapsed: " + (start2-start1) ); System.out.println("Build -- stage 2 alias tabel"); int vaskCount = 0; - List aliasList = DatabaseLayer.getAliasList(); + List aliasList = db.getAliasList(); for (AliasBean alias : aliasList) { Map postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); @@ -292,6 +432,8 @@ } System.out.println("Anvendte " + vaskCount + " aliaser fra databasen"); + aliasList.clear();//cleanup inden stage3 + //////////////////////////////////////////////////////////////////////////////////////// long start3 = System.currentTimeMillis(); @@ -301,17 +443,18 @@ DeduplicateHelper ruteHelper = new DeduplicateHelper(); DeduplicateHelper korelisteHelper = new DeduplicateHelper(); - List extDao = DatabaseLayer.getExtendedAdresslist(); + List extDao = db.getExtendedAdresslist(); for (ExtendedBean eb : extDao) { Address orgAddress = idAddressMap.get(eb.orgId); - if (orgAddress == null) + if (orgAddress == null) { continue; + } - if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { + /*if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { //kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden continue; - } + }*/ Address targetAddress = idAddressMap.get(eb.targetId); if (targetAddress == null) { @@ -329,31 +472,37 @@ continue; } - orgAddress.extTarget = targetAddress; - orgAddress.extAfstand = eb.afstand; - boolean covered = false; + + short modifyCounter = 0; + if (targetAddress.distributor.equals("DAO")) { - orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); - orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); - - if (orgAddress.rute != null) { - orgAddress.koreliste = targetAddress.koreliste; - covered = true; - } + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); + modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); } if (targetAddress.distributor.equals("BK")) { - orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); - orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); - - if (orgAddress.koreliste != null) { - orgAddress.rute = targetAddress.rute; - covered = true; - } + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); + modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); + } + + + if (modifyCounter > 0) { + orgAddress.extTarget = targetAddress; + orgAddress.extAfstand = eb.afstand; } - if (covered) { //Kopier resten af felterne + if (modifyCounter>0 && orgAddress.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { //Kopier resten af felterne orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; orgAddress.dbkBane = targetAddress.dbkBane; @@ -367,23 +516,23 @@ } } - // nu skal vi ikke bruge idAddressMap længere + // cleanup inden stage 4 idAddressMap = null; + ruteHelper = null; + korelisteHelper = null; ////////////////////////////////////////////////////////////////////////////////////// long start4 = System.currentTimeMillis(); System.out.println("Build, stage3 elapsed: " + (start4-start3) ); System.out.println("Build -- stage 4 - 100pct"); - Map hundredePct = DatabaseLayer.get100PctList(); + Map hundredePct = db.get100PctList(); for (Address addr : alleAdresser) { - if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { - continue; - } + if (addr.distributor != null && addr.distributor.equals("LUKKET")) { continue; - } + } HundredePctBean bean = hundredePct.get(addr.postnr); @@ -391,16 +540,29 @@ continue; } - addr.daekningsType = DaekningsType.DAEKNING_100PCT; - addr.rute = bean.rute; - addr.koreliste = bean.koreliste; - addr.dbkBane = bean.dbkBane; - addr.distributor = bean.distributor; + short modifyCounter = 0; + modifyCounter += updateRouting100Pct(bean, addr.routingMandag); + modifyCounter += updateRouting100Pct(bean, addr.routingTirsdag); + modifyCounter += updateRouting100Pct(bean, addr.routingOnsdag); + modifyCounter += updateRouting100Pct(bean, addr.routingTorsdag); + modifyCounter += updateRouting100Pct(bean, addr.routingFredag); + modifyCounter += updateRouting100Pct(bean, addr.routingLordag); + modifyCounter += updateRouting100Pct(bean, addr.routingSondag); + + + if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) { + addr.daekningsType = DaekningsType.DAEKNING_100PCT; + addr.dbkBane = bean.dbkBane; + addr.distributor = bean.distributor; + } + + + } //////////////////////////////////////////////////////////////////////////////////// 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) { @@ -412,17 +574,26 @@ stats.extendedCount++; break; case DAEKNING_100PCT: + hundredePctAdresser.add(addr); stats.hundredePctCount++; break; default: + ikkeDaekkedeAdresser.add(addr); stats.ikkeDaekketCount++; } } + stats.totalCount = alleAdresser.size(); + ikkeDaekkedeAdresser.trimToSize(); + hundredePctAdresser.trimToSize(); + Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet + Collections.sort( hundredePctAdresser ); + 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); @@ -432,21 +603,73 @@ System.out.println("Build Completed"); } + + + public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper ruteHelper) { + if (source.rute != null) { + return 0; + } + + source.rute = calculateExtendedBkRoute(bean, target); + source.rute = ruteHelper.getInstance(source.rute); + + if (source.rute != null) { + source.koreliste = target.koreliste; + return 1; + } else { + return 0; + } + } + + public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper ruteHelper) { + if (source.rute != null) { + return 0; + } + + source.rute = calculateExtendedDaoRoute(bean, target); + source.rute = ruteHelper.getInstance(source.rute); + + if (source.rute != null) { + source.koreliste = target.koreliste; + return 1; + } else { + return 0; + } + + } + + public short updateRouting100Pct(HundredePctBean bean, RoutingInfo routing) { + if (routing.rute == null) { + routing.rute = bean.rute; + routing.koreliste = bean.koreliste; + return 1; + } else { + return 0; + } + } public DataStatisticsBean getStatistics() { return stats; } + public DatabaseLayer getDatabaseLayer() { + return db; + } + public void clear() { searchPostnrVejnavnGadeid.clear(); searchGadeidentAdresser.clear(); - alleAdresser.clear(); helperCache.clear(); } - private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { - if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel + private String calculateExtendedDaoRoute(ExtendedBean eb, RoutingInfo targetRoute) { + if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel + return null; + } + + if (eb.transport == null) { + System.out.println("NULL transport type ved rute " + targetRoute.rute ); return null; } @@ -454,240 +677,68 @@ switch( eb.transport) { case "cykel": if (eb.afstand < 0.151) { - return "." + targetAddress.rute; + return "." + targetRoute.rute; } else if (eb.afstand < 0.501) { - return ".." + targetAddress.rute; + return ".." + targetRoute.rute; } else if (eb.afstand < 0.701) { - return "..." + targetAddress.rute; - } else if (eb.afstand < 0.501) { - return "...." + targetAddress.rute; + return "..." + targetRoute.rute; + } else if (eb.afstand < 1.001) { + return "...." + targetRoute.rute; } break; case "scooter": if (eb.afstand < 0.151) { - return "." + targetAddress.rute; + return "." + targetRoute.rute; } else if (eb.afstand < 0.801) { - return ".." + targetAddress.rute; + return ".." + targetRoute.rute; } else if (eb.afstand < 1.201) { - return "..." + targetAddress.rute; + return "..." + targetRoute.rute; } else if (eb.afstand < 2.101) { - return "...." + targetAddress.rute; + return "...." + targetRoute.rute; } break; case "bil": if (eb.afstand < 0.151) { - return "." + targetAddress.rute; + return "." + targetRoute.rute; } else if (eb.afstand < 1.001) { - return ".." + targetAddress.rute; + return ".." + targetRoute.rute; } else if (eb.afstand < 1.601) { - return "..." + targetAddress.rute; + return "..." + targetRoute.rute; } else if (eb.afstand < 2.601) { - return "...." + targetAddress.rute; + return "...." + targetRoute.rute; } break; + default: + System.out.println("Ukendt transport type: " + eb ); } return null; } public List
getNonCoveredAddresses() { - List
result = new ArrayList
(60000); - for (Address a : alleAdresser) { - if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { - result.add(a); - } - } - Collections.sort(result ); - return result; + return ikkeDaekkedeAdresser; + } + + public List
get100PctAddresses() { + return hundredePctAdresser; } /////////////////////////////////////////////////////////// - private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { + + + private String calculateExtendedBkRoute(ExtendedBean eb, RoutingInfo targetRoute) { + if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel + return null; + } + String inject; if (eb.afstand <= 0.500) { inject = "."; } else { inject = ".."; } - return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); + return inject + targetRoute.rute; } - private Set findVejAliaser(String vejnavn) { - vejnavn = vejnavn.toLowerCase(); - HashSet aliasSet = new HashSet(); - aliasSet.add(vejnavn); - - aliasSet.add(vejnavn.replace("alle", "allé") ); - aliasSet.add(vejnavn.replace("allé", "alle") ); - - - // forkortelser - aliasSet.add(vejnavn.replace("dronningens", "dr") ); - aliasSet.add(vejnavn.replace("dr.", "dronningens") ); - aliasSet.add(vejnavn.replace("dr ", "dronningens") ); - - aliasSet.add(vejnavn.replace("dronning", "dr") ); - aliasSet.add(vejnavn.replace("dr.", "dronning") ); - aliasSet.add(vejnavn.replace("dr ", "dronning") ); - - aliasSet.add(vejnavn.replace("kng", "kongen") ); - aliasSet.add(vejnavn.replace("kongen", "kng") ); - - aliasSet.add(vejnavn.replace("kvt", "kvarter") ); - aliasSet.add(vejnavn.replace("kvarter", "kvt") ); - - 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("vestre", "vester") ); - aliasSet.add(vejnavn.replace("vester", "vestre") ); - - aliasSet.add(vejnavn.replace("søndre", "sønder") ); - aliasSet.add(vejnavn.replace("sønder", "søndre") ); - - aliasSet.add(vejnavn.replace("østre", "øster") ); - aliasSet.add(vejnavn.replace("øster", "østre") ); - - aliasSet.add(vejnavn.replace("borgmester", "borgm") ); - aliasSet.add(vejnavn.replace("borgm", "borgmester") ); - - - aliasSet.add(vejnavn.replace("sankt", "skt") ); - aliasSet.add(vejnavn.replace("sankt", "sct") ); - aliasSet.add(vejnavn.replace("skt", "sankt") ); - - aliasSet.add(vejnavn.replace("skt", "sct") ); - aliasSet.add(vejnavn.replace("sct", "skt") ); - - - - // fornavn forkortelser - aliasSet.add(vejnavn.replace("john", "j") ); - aliasSet.add(vejnavn.replace("thomas", "th") ); - aliasSet.add(vejnavn.replace("thorvald", "th") ); - - - aliasSet.add(vejnavn.replace("christian", "chr") ); - aliasSet.add(vejnavn.replace("kristian", "kr") ); - - - // alternative stavninger - aliasSet.add(vejnavn.replace("peder", "peter") ); - aliasSet.add(vejnavn.replace("peter", "peder") ); - - - - // Romertal - aliasSet.add(vejnavn.replace("1", "i") ); - aliasSet.add(vejnavn.replace("i", "1") ); - - aliasSet.add(vejnavn.replace("2", "ii") ); - aliasSet.add(vejnavn.replace("ii", "2") ); - - aliasSet.add(vejnavn.replace("3", "iii") ); - aliasSet.add(vejnavn.replace("iii", "3") ); - - aliasSet.add(vejnavn.replace("4", "iv") ); - aliasSet.add(vejnavn.replace("iv", "4") ); - - aliasSet.add(vejnavn.replace("5", "v") ); - aliasSet.add(vejnavn.replace("v", "5") ); - - aliasSet.add(vejnavn.replace("6", "vi") ); - aliasSet.add(vejnavn.replace("vi", "6") ); - - aliasSet.add(vejnavn.replace("7", "vii") ); - aliasSet.add(vejnavn.replace("vii", "7") ); - - aliasSet.add(vejnavn.replace("8", "viii") ); - aliasSet.add(vejnavn.replace("viii", "8") ); - - aliasSet.add(vejnavn.replace("9", "ix") ); - aliasSet.add(vejnavn.replace("ix", "9") ); - - aliasSet.add(vejnavn.replace("10", "x") ); - aliasSet.add(vejnavn.replace("x", "10") ); - - - //alternative måder at stave vej/gade/alle - aliasSet.add(vejnavn.replace("vej", "ve") ); - aliasSet.add(vejnavn.replace("vej", "vj") ); - aliasSet.add(vejnavn.replace("vej", "v") ); - aliasSet.add(vejnavn.replace("vej", "vejen") ); - aliasSet.add(vejnavn.replace("vejen", "vej") ); - - aliasSet.add(vejnavn.replace("v", "vej") );//Vi kan have vejnavne i DB der bare slutter på v istedet for vej - - aliasSet.add(vejnavn.replace("alle", "all") ); - aliasSet.add(vejnavn.replace("allé", "all") ); - aliasSet.add(vejnavn.replace("alle", "allú") ); //Fundet i logs.hentruteinfo - aliasSet.add(vejnavn.replace("allé", "allú") ); - - aliasSet.add(vejnavn.replace("gade", "gaed") ); //Fundet i logs.hentruteinfo - aliasSet.add(vejnavn.replace("gade", "gde") ); - - aliasSet.add(vejnavn.replace("plads", "pl") ); - aliasSet.add(vejnavn.replace("vænget", "vænge") ); - - - // Opbyg æøå varianter over alle fundne aliaser - - @SuppressWarnings("unchecked") - HashSet variants = (HashSet) aliasSet.clone(); - - for (String vVejnavn : variants) { - // danske tegn 1 - aliasSet.add( vVejnavn.replace("æ", "ae") ); - aliasSet.add( vVejnavn.replace("ø", "oe") ); - aliasSet.add( vVejnavn.replace("å", "aa") ); - aliasSet.add( vVejnavn.replace("ae", "æ") ); - aliasSet.add( vVejnavn.replace("oe", "ø") ); - aliasSet.add( vVejnavn.replace("aa", "å") ); - - //danske tegn 2 - aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); - 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", "å") ); - - //danske tegn 3 - aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") ); - aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); - - - //udenlandsketegn - aliasSet.add(vejnavn.replace("u", "ü") ); - aliasSet.add(vejnavn.replace("ü", "u") ); - - aliasSet.add(vejnavn.replace("ä", "æ") ); - aliasSet.add(vejnavn.replace("æ", "ä") ); - - aliasSet.add(vejnavn.replace("ö", "ø") ); - aliasSet.add(vejnavn.replace("ø", "ö") ); - } - - return aliasSet; - } public Set getPostnumre() { return new TreeSet( searchPostnrVejnavnGadeid.keySet() ); @@ -695,28 +746,40 @@ public Set> getVejnavne(short postnr) { Map map = searchPostnrVejnavnGadeid.get(postnr); - TreeMap newMap = new TreeMap(); - for (Entry entry : map.entrySet() ) { - newMap.put(entry.getKey(), entry.getValue()); - } + + TreeMap newMap = new TreeMap( map );//Lav et nyt TreeMap for at sikre sortering return newMap.entrySet(); } public Set getHusnumre(int gadeid) { - Map gade = searchGadeidentAdresser.get(gadeid); + Map> gade = searchGadeidentAdresser.get(gadeid); Set set = new TreeSet( new NaturalOrderComparator() ); - set.addAll( gade.keySet() ); + for(List
litraList : gade.values()) { + for (Address a: litraList) { + set.add( a.husnr + a.husnrbogstav ); + } + } return set; } - public Address getAdresse(int gadeid, String husnr) { + public Address getAdresse(int gadeid, String husnrStr) { + short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") ); + String litra = husnrStr.replaceAll("\\d", ""); + + Map> gade = searchGadeidentAdresser.get(gadeid); + List
litraList = gade.get(husnr); + + for(Address addr : litraList) { + if (addr.husnrbogstav.equals(litra)) { + return addr; + } + } - Map gade = searchGadeidentAdresser.get(gadeid); - return gade.get(husnr); + return null; }