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 |
|
|
35 |
private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid; |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
36 |
private Map<Long, Map<String,Address>> searchGadeidentAdresser; |
private Map<Integer, Map<String,Address>> searchGadeidentAdresser; |
37 |
|
|
38 |
private List<Address> alleAdresser; |
private List<Address> alleAdresser; |
39 |
|
|
40 |
private Map<String,Long> helperCache; |
private Map<String,Integer> helperCache; |
41 |
|
|
42 |
private DataStatisticsBean stats = new DataStatisticsBean(); |
private DataStatisticsBean stats = new DataStatisticsBean(); |
43 |
|
|
65 |
String helperSearchKey = ""; |
String helperSearchKey = ""; |
66 |
|
|
67 |
try { |
try { |
68 |
request.postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
69 |
} catch (Exception E) { |
} catch (Exception E) { |
70 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
71 |
return result; |
return result; |
102 |
return result; |
return result; |
103 |
} |
} |
104 |
|
|
105 |
Long gadeident = request.streetNames.get(request.vasketVejnavn); |
Integer gadeident = request.streetNames.get(request.vasketVejnavn); |
106 |
|
|
107 |
|
|
108 |
if ( gadeident == null) { |
if ( gadeident == null) { |
178 |
return result; |
return result; |
179 |
} |
} |
180 |
|
|
181 |
private Long helperWrapper(String vej, Map<String,Long> postnrVeje, String helperSearchKey) { |
private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) { |
182 |
if (vej == null) |
if (vej == null) |
183 |
return null; |
return null; |
184 |
|
|
185 |
String vejVasket = AddressUtils.vaskVejnavn( vej ); |
String vejVasket = AddressUtils.vaskVejnavn( vej ); |
186 |
Long gadeident = postnrVeje.get(vejVasket); |
Integer gadeident = postnrVeje.get(vejVasket); |
187 |
|
|
188 |
if (gadeident != null) { |
if (gadeident != null) { |
189 |
helperCache.put(helperSearchKey, gadeident); |
helperCache.put(helperSearchKey, gadeident); |
192 |
|
|
193 |
} |
} |
194 |
|
|
195 |
public Map<String,Long> getStretsByPostal(int zip) { |
public Map<String,Integer> getStretsByPostal(int zip) { |
196 |
return searchPostnrVejnavnGadeid.get(zip); |
return searchPostnrVejnavnGadeid.get(zip); |
197 |
} |
} |
198 |
|
|
199 |
|
|
200 |
|
|
201 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
202 |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
203 |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Integer, Map<String,Address>>(); |
204 |
helperCache = new ConcurrentHashMap<String,Long>(); |
helperCache = new ConcurrentHashMap<String,Integer>(); |
205 |
|
|
206 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
207 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
211 |
|
|
212 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
213 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
214 |
|
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(); |
215 |
|
DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>(); |
216 |
|
|
217 |
for (Address a : alleAdresser) { |
for (Address a : alleAdresser) { |
218 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
219 |
|
|
220 |
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); |
221 |
|
|
222 |
if (postnrVeje == null) { |
if (postnrVeje == null) { |
223 |
postnrVeje = new ConcurrentHashMap<String,Long>(); |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
224 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
225 |
} |
} |
226 |
|
|
227 |
|
|
228 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
229 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
230 |
if (gadeident == null) { |
if (gadeident == null) { |
231 |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
232 |
|
|
235 |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
236 |
for(String alias : aliaser) { |
for(String alias : aliaser) { |
237 |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
238 |
|
vasketAlias = aliasHelper.getInstance(vasketAlias); |
239 |
|
|
240 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
241 |
} |
} |
242 |
} |
} |
247 |
searchGadeidentAdresser.put(gadeident, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
248 |
} |
} |
249 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
250 |
|
husnrSearch = husnrHelper.getInstance(husnrSearch); |
251 |
gade.put(husnrSearch, a); |
gade.put(husnrSearch, a); |
252 |
} |
} |
253 |
|
|
259 |
int vaskCount = 0; |
int vaskCount = 0; |
260 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
261 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
262 |
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
263 |
|
|
264 |
if (postnrVeje == null) { |
if (postnrVeje == null) { |
265 |
//Burde ikke kunne ske - men better safe than sorry |
//Burde ikke kunne ske - men better safe than sorry |
269 |
String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn); |
String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn); |
270 |
String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn); |
String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn); |
271 |
|
|
272 |
Long gadeident = postnrVeje.get(vasketVej); |
Integer gadeident = postnrVeje.get(vasketVej); |
273 |
if (gadeident == null) { |
if (gadeident == null) { |
274 |
//Kender ikke den oprindelige vej |
//Kender ikke den oprindelige vej |
275 |
continue; |
continue; |
276 |
} |
} |
277 |
|
|
278 |
Long aliasIdent = postnrVeje.get(vasketAlias); |
Integer aliasIdent = postnrVeje.get(vasketAlias); |
279 |
|
|
280 |
if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet |
if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet |
281 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
291 |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
292 |
System.out.println("Build -- stage 3 udvidet dækning"); |
System.out.println("Build -- stage 3 udvidet dækning"); |
293 |
|
|
294 |
|
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
295 |
|
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
296 |
|
|
297 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
298 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
299 |
|
|
301 |
if (orgAddress == null) |
if (orgAddress == null) |
302 |
continue; |
continue; |
303 |
|
|
304 |
|
if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
305 |
|
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
306 |
|
continue; |
307 |
|
} |
308 |
|
|
309 |
Address targetAddress = idAddressMap.get(eb.targetId); |
Address targetAddress = idAddressMap.get(eb.targetId); |
310 |
if (targetAddress == null) |
if (targetAddress == null) { |
311 |
continue; |
continue; |
312 |
|
} |
313 |
|
|
314 |
|
|
315 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) { |
316 |
continue; |
continue; |
317 |
} |
} |
318 |
|
|
319 |
if (targetAddress.distributor.equals("LUKKET")) { |
|
320 |
|
|
321 |
|
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) { |
322 |
continue; |
continue; |
323 |
} |
} |
324 |
|
|
327 |
|
|
328 |
boolean covered = false; |
boolean covered = false; |
329 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
330 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
331 |
|
orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); |
332 |
|
|
333 |
if (orgAddress.rute != null) { |
if (orgAddress.rute != null) { |
334 |
orgAddress.koreliste = targetAddress.koreliste; |
orgAddress.koreliste = targetAddress.koreliste; |
335 |
covered = true; |
covered = true; |
337 |
} |
} |
338 |
|
|
339 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
340 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
341 |
|
orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); |
342 |
|
|
343 |
if (orgAddress.koreliste != null) { |
if (orgAddress.koreliste != null) { |
344 |
orgAddress.rute = targetAddress.rute; |
orgAddress.rute = targetAddress.rute; |
345 |
covered = true; |
covered = true; |
366 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
367 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
368 |
|
|
369 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
370 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
371 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
372 |
continue; |
continue; |
630 |
//danske tegn 2 |
//danske tegn 2 |
631 |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); |
632 |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") ); |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") ); |
633 |
aliasSet.add( vVejnavn.replace("ø", "ae").replace("å", "aa") ); |
aliasSet.add( vVejnavn.replace("ø", "oe").replace("å", "aa") ); |
634 |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") ); |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") ); |
635 |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") ); |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") ); |
636 |
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
643 |
return aliasSet; |
return aliasSet; |
644 |
} |
} |
645 |
|
|
646 |
public Set<Integer> getPostnumre() { |
public Set<Short> getPostnumre() { |
647 |
return new TreeSet<Integer>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
648 |
} |
} |
649 |
|
|
650 |
public Set<Entry<String,Long>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
651 |
Map<String,Long> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
652 |
TreeMap<String,Long> newMap = new TreeMap<String,Long>(); |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
653 |
for (Entry<String,Long> entry : map.entrySet() ) { |
for (Entry<String,Integer> entry : map.entrySet() ) { |
654 |
newMap.put(entry.getKey(), entry.getValue()); |
newMap.put(entry.getKey(), entry.getValue()); |
655 |
} |
} |
656 |
|
|
657 |
return newMap.entrySet(); |
return newMap.entrySet(); |
658 |
} |
} |
659 |
|
|
660 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
661 |
|
|
662 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
663 |
return new TreeSet<String>( gade.keySet() ); |
|
664 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
665 |
|
set.addAll( gade.keySet() ); |
666 |
|
|
667 |
|
return set; |
668 |
} |
} |
669 |
|
|
670 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnr) { |
671 |
|
|
672 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
673 |
return gade.get(husnr); |
return gade.get(husnr); |