42 |
|
|
43 |
private DataStatisticsBean stats = new DataStatisticsBean(); |
private DataStatisticsBean stats = new DataStatisticsBean(); |
44 |
|
|
45 |
ServiceConfig config; |
private DatabaseLayer db; |
46 |
|
|
47 |
|
|
48 |
StreetnameHelper levenshteinHelper; |
StreetnameHelper levenshteinHelper; |
49 |
StreetnameHelper googleHelper; |
StreetnameHelper googleHelper; |
50 |
StreetnameHelper osmHelper; |
StreetnameHelper osmHelper; |
51 |
|
|
52 |
|
|
53 |
public AddressSearch(ServiceConfig config) { |
public AddressSearch(DatabaseLayer db, ServiceConfig config) { |
54 |
this.config = config; |
|
55 |
|
this.db = db; |
56 |
|
|
57 |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
58 |
googleHelper = new GoogleStreetnameHelper( config ); |
googleHelper = new GoogleStreetnameHelper( config ); |
59 |
osmHelper = new OSMStreetnameHelper( config ); |
osmHelper = new OSMStreetnameHelper( config ); |
60 |
} |
} |
61 |
|
|
62 |
|
public Address getAddressSafe(int gadeid, String husnr) throws Exception { |
63 |
|
|
64 |
|
Map<String,Address> gade = searchGadeidentAdresser.get(gadeid); |
65 |
|
|
66 |
|
if (gade == null) { |
67 |
|
throw new Exception("GadeID ikke fundet"); |
68 |
|
} |
69 |
|
|
70 |
|
Address addr = gade.get(husnr); |
71 |
|
|
72 |
|
if (addr == null) { |
73 |
|
throw new Exception("Adresse ikke ikke fundet"); |
74 |
|
} |
75 |
|
|
76 |
|
return addr; |
77 |
|
} |
78 |
|
|
79 |
|
|
80 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
81 |
|
|
269 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
270 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
271 |
|
|
272 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
alleAdresser = db.getAllAdresses(); |
273 |
|
|
274 |
|
|
275 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
320 |
System.out.println("Build -- stage 2 alias tabel"); |
System.out.println("Build -- stage 2 alias tabel"); |
321 |
|
|
322 |
int vaskCount = 0; |
int vaskCount = 0; |
323 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = db.getAliasList(); |
324 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
325 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
326 |
|
|
357 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
358 |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
359 |
|
|
360 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = db.getExtendedAdresslist(); |
361 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
362 |
|
|
363 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
431 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
432 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
433 |
|
|
434 |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
435 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
436 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
437 |
continue; |
continue; |
456 |
|
|
457 |
//////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////// |
458 |
long stop = System.currentTimeMillis(); |
long stop = System.currentTimeMillis(); |
459 |
System.out.println("Build, stage3 elapsed: " + (stop-start4) ); |
System.out.println("Build, stage4 elapsed: " + (stop-start4) ); |
460 |
System.out.println("Build -- Gathering statistics"); |
System.out.println("Build -- Gathering statistics"); |
461 |
|
|
462 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
474 |
stats.ikkeDaekketCount++; |
stats.ikkeDaekketCount++; |
475 |
} |
} |
476 |
} |
} |
477 |
|
stats.totalCount = alleAdresser.size(); |
478 |
|
|
479 |
|
|
480 |
stats.elapsed = stop-start1; |
stats.elapsed = stop-start1; |
481 |
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ); |
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ); |
482 |
|
|
483 |
|
System.out.println("Build: totalCount: " + stats.totalCount); |
484 |
System.out.println("Build: direkteCount: " + stats.direkteCount); |
System.out.println("Build: direkteCount: " + stats.direkteCount); |
485 |
System.out.println("Build: extendedCount: " + stats.extendedCount); |
System.out.println("Build: extendedCount: " + stats.extendedCount); |
486 |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
495 |
return stats; |
return stats; |
496 |
} |
} |
497 |
|
|
498 |
|
public DatabaseLayer getDatabaseLayer() { |
499 |
|
return db; |
500 |
|
} |
501 |
|
|
502 |
public void clear() { |
public void clear() { |
503 |
searchPostnrVejnavnGadeid.clear(); |
searchPostnrVejnavnGadeid.clear(); |
504 |
searchGadeidentAdresser.clear(); |
searchGadeidentAdresser.clear(); |
521 |
return ".." + targetAddress.rute; |
return ".." + targetAddress.rute; |
522 |
} else if (eb.afstand < 0.701) { |
} else if (eb.afstand < 0.701) { |
523 |
return "..." + targetAddress.rute; |
return "..." + targetAddress.rute; |
524 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 1.001) { |
525 |
return "...." + targetAddress.rute; |
return "...." + targetAddress.rute; |
526 |
} |
} |
527 |
break; |
break; |
562 |
return result; |
return result; |
563 |
} |
} |
564 |
|
|
565 |
|
public List<Address> get100PctAddresses() { |
566 |
|
List<Address> result = new ArrayList<Address>(120000); |
567 |
|
for (Address a : alleAdresser) { |
568 |
|
if ( a.daekningsType == DaekningsType.DAEKNING_100PCT) { |
569 |
|
result.add(a); |
570 |
|
} |
571 |
|
} |
572 |
|
Collections.sort(result ); |
573 |
|
return result; |
574 |
|
} |
575 |
|
|
576 |
/////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////// |
577 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
578 |
String inject; |
String inject; |
611 |
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
612 |
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
613 |
|
|
614 |
|
aliasSet.add(vejnavn.replace("gl", "gamle") ); |
615 |
|
aliasSet.add(vejnavn.replace("gamle", "gl") ); |
616 |
|
|
617 |
aliasSet.add(vejnavn.replace("lille", "ll") ); |
aliasSet.add(vejnavn.replace("lille", "ll") ); |
618 |
aliasSet.add(vejnavn.replace("ll ", "lille") ); |
aliasSet.add(vejnavn.replace("ll ", "lille") ); |
619 |
aliasSet.add(vejnavn.replace("ll.", "lille") ); |
aliasSet.add(vejnavn.replace("ll.", "lille") ); |
623 |
aliasSet.add(vejnavn.replace("st.", "store") ); |
aliasSet.add(vejnavn.replace("st.", "store") ); |
624 |
|
|
625 |
aliasSet.add(vejnavn.replace("søndre", "sdr") ); |
aliasSet.add(vejnavn.replace("søndre", "sdr") ); |
626 |
aliasSet.add(vejnavn.replace("sdr", "søndre") ); |
aliasSet.add(vejnavn.replace("sdr", "søndre") ); |
627 |
|
aliasSet.add(vejnavn.replace("sønder", "sdr") ); |
628 |
|
aliasSet.add(vejnavn.replace("sdr", "sønder") ); |
629 |
|
|
630 |
|
|
631 |
aliasSet.add(vejnavn.replace("nørre", "nr") ); |
aliasSet.add(vejnavn.replace("nørre", "nr") ); |
669 |
aliasSet.add(vejnavn.replace("christians", "chr") ); |
aliasSet.add(vejnavn.replace("christians", "chr") ); |
670 |
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
671 |
aliasSet.add(vejnavn.replace("kristians", "kr") ); |
aliasSet.add(vejnavn.replace("kristians", "kr") ); |
672 |
|
|
673 |
|
aliasSet.add(vejnavn.replace("mylius", "myl") ); |
674 |
|
aliasSet.add(vejnavn.replace("myl", "mylius") ); |
675 |
|
|
676 |
|
|
677 |
// alternative stavninger |
// alternative stavninger |
737 |
|
|
738 |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
739 |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
740 |
|
|
741 |
|
aliasSet.add(vejnavn.replace("kronborg", "krbg") ); //Krbg ladegårdsvej, 3000 |
742 |
|
aliasSet.add(vejnavn.replace("krbg", "kronborg") ); |
743 |
|
|
744 |
// Opbyg æøå varianter over alle fundne aliaser |
// Opbyg æøå varianter over alle fundne aliaser |
745 |
|
|
788 |
|
|
789 |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
790 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
791 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
|
792 |
for (Entry<String,Integer> entry : map.entrySet() ) { |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering |
|
newMap.put(entry.getKey(), entry.getValue()); |
|
|
} |
|
793 |
|
|
794 |
return newMap.entrySet(); |
return newMap.entrySet(); |
795 |
} |
} |