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 |
|
import dk.daoas.daoadresseservice.util.NaturalOrderComparator; |
32 |
|
|
33 |
public class AddressSearch { |
public class AddressSearch { |
34 |
|
|
58 |
|
|
59 |
|
|
60 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
61 |
|
|
62 |
|
postnrStr = postnrStr.trim(); |
63 |
|
adresse = adresse.trim(); |
64 |
|
|
65 |
|
|
66 |
SearchRequest request = new SearchRequest(); |
SearchRequest request = new SearchRequest(); |
67 |
SearchResult result = new SearchResult(); |
SearchResult result = new SearchResult(); |
68 |
|
|
70 |
String helperSearchKey = ""; |
String helperSearchKey = ""; |
71 |
|
|
72 |
try { |
try { |
73 |
request.postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
74 |
} catch (Exception E) { |
} catch (Exception E) { |
75 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
76 |
return result; |
return result; |
216 |
|
|
217 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
218 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
219 |
|
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(); |
220 |
|
DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>(); |
221 |
|
|
222 |
for (Address a : alleAdresser) { |
for (Address a : alleAdresser) { |
223 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
228 |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
229 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
230 |
} |
} |
231 |
|
|
232 |
|
|
233 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
234 |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
240 |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
241 |
for(String alias : aliaser) { |
for(String alias : aliaser) { |
242 |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
243 |
|
vasketAlias = aliasHelper.getInstance(vasketAlias); |
244 |
|
|
245 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
246 |
} |
} |
247 |
} |
} |
252 |
searchGadeidentAdresser.put(gadeident, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
253 |
} |
} |
254 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
255 |
|
husnrSearch = husnrHelper.getInstance(husnrSearch); |
256 |
gade.put(husnrSearch, a); |
gade.put(husnrSearch, a); |
257 |
} |
} |
258 |
|
|
296 |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
297 |
System.out.println("Build -- stage 3 udvidet dækning"); |
System.out.println("Build -- stage 3 udvidet dækning"); |
298 |
|
|
299 |
|
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
300 |
|
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
301 |
|
|
302 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
303 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
304 |
|
|
306 |
if (orgAddress == null) |
if (orgAddress == null) |
307 |
continue; |
continue; |
308 |
|
|
309 |
|
if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
310 |
|
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
311 |
|
continue; |
312 |
|
} |
313 |
|
|
314 |
Address targetAddress = idAddressMap.get(eb.targetId); |
Address targetAddress = idAddressMap.get(eb.targetId); |
315 |
if (targetAddress == null) |
if (targetAddress == null) { |
316 |
continue; |
continue; |
317 |
|
} |
318 |
|
|
319 |
|
|
320 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) { |
321 |
continue; |
continue; |
322 |
} |
} |
323 |
|
|
324 |
if (targetAddress.distributor.equals("LUKKET")) { |
|
325 |
|
|
326 |
|
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) { |
327 |
continue; |
continue; |
328 |
} |
} |
329 |
|
|
332 |
|
|
333 |
boolean covered = false; |
boolean covered = false; |
334 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
335 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
336 |
|
orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); |
337 |
|
|
338 |
if (orgAddress.rute != null) { |
if (orgAddress.rute != null) { |
339 |
orgAddress.koreliste = targetAddress.koreliste; |
orgAddress.koreliste = targetAddress.koreliste; |
340 |
covered = true; |
covered = true; |
342 |
} |
} |
343 |
|
|
344 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
345 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
346 |
|
orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); |
347 |
|
|
348 |
if (orgAddress.koreliste != null) { |
if (orgAddress.koreliste != null) { |
349 |
orgAddress.rute = targetAddress.rute; |
orgAddress.rute = targetAddress.rute; |
350 |
covered = true; |
covered = true; |
371 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
372 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
373 |
|
|
374 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
375 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
376 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
377 |
continue; |
continue; |
565 |
aliasSet.add(vejnavn.replace("john", "j") ); |
aliasSet.add(vejnavn.replace("john", "j") ); |
566 |
aliasSet.add(vejnavn.replace("thomas", "th") ); |
aliasSet.add(vejnavn.replace("thomas", "th") ); |
567 |
aliasSet.add(vejnavn.replace("thorvald", "th") ); |
aliasSet.add(vejnavn.replace("thorvald", "th") ); |
568 |
|
|
569 |
|
|
570 |
|
aliasSet.add(vejnavn.replace("christian", "chr") ); |
571 |
|
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
572 |
|
|
573 |
|
|
574 |
|
|
575 |
// Romertal |
// Romertal |
657 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
658 |
} |
} |
659 |
|
|
660 |
public Set<Entry<String,Integer>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
661 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
662 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
663 |
for (Entry<String,Integer> entry : map.entrySet() ) { |
for (Entry<String,Integer> entry : map.entrySet() ) { |
667 |
return newMap.entrySet(); |
return newMap.entrySet(); |
668 |
} |
} |
669 |
|
|
670 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
671 |
|
|
672 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
673 |
return new TreeSet<String>( gade.keySet() ); |
|
674 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
675 |
|
set.addAll( gade.keySet() ); |
676 |
|
|
677 |
|
return set; |
678 |
} |
} |
679 |
|
|
680 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |
681 |
|
|
682 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
683 |
return gade.get(husnr); |
return gade.get(husnr); |