27 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
28 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
29 |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
30 |
|
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
31 |
|
|
32 |
public class AddressSearch { |
public class AddressSearch { |
33 |
|
|
210 |
|
|
211 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
212 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
213 |
|
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(); |
214 |
|
DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>(); |
215 |
|
|
216 |
for (Address a : alleAdresser) { |
for (Address a : alleAdresser) { |
217 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
222 |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
223 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
224 |
} |
} |
225 |
|
|
226 |
|
|
227 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
228 |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
234 |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
235 |
for(String alias : aliaser) { |
for(String alias : aliaser) { |
236 |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
237 |
|
vasketAlias = aliasHelper.getInstance(vasketAlias); |
238 |
|
|
239 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
240 |
} |
} |
241 |
} |
} |
246 |
searchGadeidentAdresser.put(gadeident, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
247 |
} |
} |
248 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
249 |
|
husnrSearch = husnrHelper.getInstance(husnrSearch); |
250 |
gade.put(husnrSearch, a); |
gade.put(husnrSearch, a); |
251 |
} |
} |
252 |
|
|
290 |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
291 |
System.out.println("Build -- stage 3 udvidet dækning"); |
System.out.println("Build -- stage 3 udvidet dækning"); |
292 |
|
|
293 |
|
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
294 |
|
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
295 |
|
|
296 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
297 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
298 |
|
|
317 |
|
|
318 |
boolean covered = false; |
boolean covered = false; |
319 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
320 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
321 |
|
orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); |
322 |
|
|
323 |
if (orgAddress.rute != null) { |
if (orgAddress.rute != null) { |
324 |
orgAddress.koreliste = targetAddress.koreliste; |
orgAddress.koreliste = targetAddress.koreliste; |
325 |
covered = true; |
covered = true; |
327 |
} |
} |
328 |
|
|
329 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
330 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
331 |
|
orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); |
332 |
|
|
333 |
if (orgAddress.koreliste != null) { |
if (orgAddress.koreliste != null) { |
334 |
orgAddress.rute = targetAddress.rute; |
orgAddress.rute = targetAddress.rute; |
335 |
covered = true; |
covered = true; |
356 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
357 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
358 |
|
|
359 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
360 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
361 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
362 |
continue; |
continue; |
637 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
638 |
} |
} |
639 |
|
|
640 |
public Set<Entry<String,Integer>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
641 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
642 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
643 |
for (Entry<String,Integer> entry : map.entrySet() ) { |
for (Entry<String,Integer> entry : map.entrySet() ) { |
647 |
return newMap.entrySet(); |
return newMap.entrySet(); |
648 |
} |
} |
649 |
|
|
650 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
651 |
|
|
652 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
653 |
return new TreeSet<String>( gade.keySet() ); |
return new TreeSet<String>( gade.keySet() ); |
654 |
} |
} |
655 |
|
|
656 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |
657 |
|
|
658 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
659 |
return gade.get(husnr); |
return gade.get(husnr); |