42 |
|
|
43 |
private DataStatisticsBean stats = new DataStatisticsBean(); |
private DataStatisticsBean stats = new DataStatisticsBean(); |
44 |
|
|
45 |
|
private DatabaseLayer db; |
46 |
|
|
47 |
ServiceConfig config; |
ServiceConfig config; |
48 |
|
|
49 |
StreetnameHelper levenshteinHelper; |
StreetnameHelper levenshteinHelper; |
51 |
StreetnameHelper osmHelper; |
StreetnameHelper osmHelper; |
52 |
|
|
53 |
|
|
54 |
public AddressSearch(ServiceConfig config) { |
public AddressSearch(DatabaseLayer db, ServiceConfig config) { |
55 |
this.config = config; |
this.config = config; |
56 |
|
|
57 |
|
this.db = db; |
58 |
|
|
59 |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
60 |
googleHelper = new GoogleStreetnameHelper( config ); |
googleHelper = new GoogleStreetnameHelper( config ); |
61 |
osmHelper = new OSMStreetnameHelper( config ); |
osmHelper = new OSMStreetnameHelper( config ); |
254 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
255 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
256 |
|
|
257 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
alleAdresser = db.getAllAdresses(); |
258 |
|
|
259 |
|
|
260 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
305 |
System.out.println("Build -- stage 2 alias tabel"); |
System.out.println("Build -- stage 2 alias tabel"); |
306 |
|
|
307 |
int vaskCount = 0; |
int vaskCount = 0; |
308 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = db.getAliasList(); |
309 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
310 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
311 |
|
|
342 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
343 |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
344 |
|
|
345 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = db.getExtendedAdresslist(); |
346 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
347 |
|
|
348 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
416 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
417 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
418 |
|
|
419 |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
420 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
421 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
422 |
continue; |
continue; |
459 |
stats.ikkeDaekketCount++; |
stats.ikkeDaekketCount++; |
460 |
} |
} |
461 |
} |
} |
462 |
|
stats.totalCount = alleAdresser.size(); |
463 |
|
|
464 |
|
|
465 |
stats.elapsed = stop-start1; |
stats.elapsed = stop-start1; |
466 |
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() ); |
467 |
|
|
468 |
|
System.out.println("Build: totalCount: " + stats.totalCount); |
469 |
System.out.println("Build: direkteCount: " + stats.direkteCount); |
System.out.println("Build: direkteCount: " + stats.direkteCount); |
470 |
System.out.println("Build: extendedCount: " + stats.extendedCount); |
System.out.println("Build: extendedCount: " + stats.extendedCount); |
471 |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
480 |
return stats; |
return stats; |
481 |
} |
} |
482 |
|
|
483 |
|
public DatabaseLayer getDatabaseLayer() { |
484 |
|
return db; |
485 |
|
} |
486 |
|
|
487 |
public void clear() { |
public void clear() { |
488 |
searchPostnrVejnavnGadeid.clear(); |
searchPostnrVejnavnGadeid.clear(); |
489 |
searchGadeidentAdresser.clear(); |
searchGadeidentAdresser.clear(); |
705 |
|
|
706 |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
707 |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
708 |
|
|
709 |
|
aliasSet.add(vejnavn.replace("kronborg", "krbg") ); //Krbg ladegårdsvej, 3000 |
710 |
|
aliasSet.add(vejnavn.replace("krbg", "kronborg") ); |
711 |
|
|
712 |
// Opbyg æøå varianter over alle fundne aliaser |
// Opbyg æøå varianter over alle fundne aliaser |
713 |
|
|