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 ); |
252 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
253 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
254 |
|
|
255 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
alleAdresser = db.getAllAdresses(); |
256 |
|
|
257 |
|
|
258 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
303 |
System.out.println("Build -- stage 2 alias tabel"); |
System.out.println("Build -- stage 2 alias tabel"); |
304 |
|
|
305 |
int vaskCount = 0; |
int vaskCount = 0; |
306 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = db.getAliasList(); |
307 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
308 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
309 |
|
|
340 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
341 |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
342 |
|
|
343 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = db.getExtendedAdresslist(); |
344 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
345 |
|
|
346 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
414 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
415 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
416 |
|
|
417 |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
418 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
419 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
420 |
continue; |
continue; |
478 |
return stats; |
return stats; |
479 |
} |
} |
480 |
|
|
481 |
|
public DatabaseLayer getDatabaseLayer() { |
482 |
|
return db; |
483 |
|
} |
484 |
|
|
485 |
public void clear() { |
public void clear() { |
486 |
searchPostnrVejnavnGadeid.clear(); |
searchPostnrVejnavnGadeid.clear(); |
487 |
searchGadeidentAdresser.clear(); |
searchGadeidentAdresser.clear(); |
703 |
|
|
704 |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
705 |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
706 |
|
|
707 |
|
aliasSet.add(vejnavn.replace("kronborg", "krbg") ); //Krbg ladegårdsvej, 3000 |
708 |
|
aliasSet.add(vejnavn.replace("krbg", "kronborg") ); |
709 |
|
|
710 |
// Opbyg æøå varianter over alle fundne aliaser |
// Opbyg æøå varianter over alle fundne aliaser |
711 |
|
|
754 |
|
|
755 |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
756 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
757 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
|
758 |
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()); |
|
|
} |
|
759 |
|
|
760 |
return newMap.entrySet(); |
return newMap.entrySet(); |
761 |
} |
} |