30 |
import dk.daoas.daoadresseservice.util.DaoUtils; |
import dk.daoas.daoadresseservice.util.DaoUtils; |
31 |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
32 |
import dk.daoas.daoadresseservice.util.NaturalOrderComparator; |
import dk.daoas.daoadresseservice.util.NaturalOrderComparator; |
33 |
|
import dk.daoas.daoadresseservice.util.NearestShortTreeMap; |
34 |
|
|
35 |
public class AddressSearch { |
public class AddressSearch { |
36 |
|
|
37 |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
38 |
private Map<Integer, Map<String,Address>> searchGadeidentAdresser; |
private Map<Integer, Map<Short, Map<String,Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra |
39 |
|
|
40 |
|
|
41 |
private List<Address> alleAdresser; |
private List<Address> alleAdresser; |
42 |
|
|
44 |
|
|
45 |
private DataStatisticsBean stats = new DataStatisticsBean(); |
private DataStatisticsBean stats = new DataStatisticsBean(); |
46 |
|
|
47 |
ServiceConfig config; |
private DatabaseLayer db; |
48 |
|
private ServiceConfig config; |
49 |
|
|
50 |
|
|
51 |
StreetnameHelper levenshteinHelper; |
StreetnameHelper levenshteinHelper; |
52 |
|
StreetnameHelper metaphoneHelper; |
53 |
StreetnameHelper googleHelper; |
StreetnameHelper googleHelper; |
54 |
StreetnameHelper osmHelper; |
StreetnameHelper osmHelper; |
55 |
|
|
56 |
|
|
57 |
public AddressSearch(ServiceConfig config) { |
public AddressSearch(DatabaseLayer db, ServiceConfig config) { |
58 |
|
|
59 |
|
this.db = db; |
60 |
this.config = config; |
this.config = config; |
61 |
|
|
62 |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
63 |
|
metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config); |
64 |
googleHelper = new GoogleStreetnameHelper( config ); |
googleHelper = new GoogleStreetnameHelper( config ); |
65 |
osmHelper = new OSMStreetnameHelper( config ); |
osmHelper = new OSMStreetnameHelper( config ); |
66 |
} |
} |
67 |
|
|
68 |
|
public Address getAddressSafe(int gadeid, short husnr, String litra) throws Exception { |
69 |
|
|
70 |
|
Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeid); |
71 |
|
|
72 |
|
if (gade == null) { |
73 |
|
throw new Exception("GadeID ikke fundet"); |
74 |
|
} |
75 |
|
|
76 |
|
Map<String,Address> litraList = gade.get(husnr); |
77 |
|
|
78 |
|
Address addr = litraList.get(litra); |
79 |
|
|
80 |
|
if (addr == null) { |
81 |
|
throw new Exception("Adresse ikke ikke fundet"); |
82 |
|
} |
83 |
|
|
84 |
|
return addr; |
85 |
|
} |
86 |
|
|
87 |
|
|
88 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
89 |
|
return search(postnrStr, adresse, false); |
90 |
|
} |
91 |
|
|
92 |
|
|
93 |
|
public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr) { |
94 |
|
|
95 |
postnrStr = postnrStr.trim(); |
postnrStr = postnrStr.trim(); |
96 |
adresse = adresse.trim(); |
adresse = adresse.trim(); |
182 |
result.gadeident = gadeident; |
result.gadeident = gadeident; |
183 |
|
|
184 |
|
|
185 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); |
Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeident); |
186 |
if (gade == null) { //Denne søgning må ikke fejle |
if (gade == null) { //Denne søgning må ikke fejle |
187 |
result.status = Status.ERROR_INTERNAL; |
result.status = Status.ERROR_INTERNAL; |
188 |
return result; |
return result; |
190 |
|
|
191 |
|
|
192 |
//Kunne evt klares med Iterables.get fra Guava/Collections |
//Kunne evt klares med Iterables.get fra Guava/Collections |
193 |
Address firstAddress = gade.values().iterator().next(); |
Address firstAddress = gade.values().iterator().next().values().iterator().next(); //Første husnr -> første litra |
194 |
result.vej = firstAddress.vejnavn; |
result.vej = firstAddress.vejnavn; |
195 |
|
|
196 |
String husnrSearch = "" + result.splitResult.husnr + result.splitResult.litra; |
short husnrSearch = Short.parseShort(result.splitResult.husnr ); |
197 |
Address addr = gade.get(husnrSearch); |
Map<String,Address> litraList = gade.get(husnrSearch); |
198 |
|
|
199 |
|
|
200 |
if (addr == null) { |
if (litraList == null) { //Husnr ikke fundet |
201 |
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; |
|
202 |
return result; |
if (naermesteHusnr) { |
203 |
|
TreeMap<Short, Map<String,Address>> gadeTreeMap = (TreeMap<Short, Map<String,Address>>) gade; |
204 |
|
result.anvendtHusnr = NearestShortTreeMap.getNearestKey(husnrSearch, gadeTreeMap); |
205 |
|
|
206 |
|
result.nearestHusnr = true; |
207 |
|
litraList = gade.get(result.anvendtHusnr); |
208 |
|
|
209 |
|
|
210 |
|
} else { |
211 |
|
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; |
212 |
|
return result; |
213 |
|
} |
214 |
|
} |
215 |
|
|
216 |
|
Address addr = litraList.get( result.splitResult.litra ); |
217 |
|
|
218 |
|
if (addr == null) { //litra ikke fundet |
219 |
|
if (config.nearestLitra == true || naermesteHusnr == true) { |
220 |
|
result.nearestLitra = true; |
221 |
|
addr = litraList.values().iterator().next(); |
222 |
|
} else { |
223 |
|
//husnr fundet men litra blev ikke fundet |
224 |
|
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; |
225 |
|
return result; |
226 |
|
} |
227 |
} |
} |
228 |
|
|
229 |
result.address = addr; |
result.address = addr; |
264 |
} |
} |
265 |
} |
} |
266 |
|
|
267 |
|
if (gadeident == null) { |
268 |
|
String vej = metaphoneHelper.proposeStreetName(request, result); |
269 |
|
if (vej != null) { |
270 |
|
gadeident = request.streetNames.get(vej); |
271 |
|
} |
272 |
|
} |
273 |
|
|
274 |
|
|
275 |
// Brug OpenStreetMap før vi prøver google |
// Brug OpenStreetMap før vi prøver google |
276 |
// For google har en request limit, det har OSM ikke! |
// For google har en request limit, det har OSM ikke! |
308 |
|
|
309 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
310 |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
311 |
searchGadeidentAdresser = new HashMap<Integer, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Integer, Map<Short, Map<String,Address>>>(); |
312 |
helperCache = new ConcurrentHashMap<String,Integer>(); |
helperCache = new ConcurrentHashMap<String,Integer>(); |
313 |
|
|
314 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
315 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
316 |
|
|
317 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
alleAdresser = db.getAllAdresses(); |
318 |
|
|
319 |
|
|
320 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
321 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
322 |
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(400000); // Indeholder pt 379664 entries |
323 |
DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>(); |
|
324 |
|
DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>(); |
325 |
|
DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>(); |
326 |
|
|
327 |
|
|
328 |
for (Address a : alleAdresser) { |
for (Address a : alleAdresser) { |
329 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
330 |
|
|
331 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); |
Short postnr = shortHelper.getInstance(a.postnr); |
332 |
|
|
333 |
|
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr); |
334 |
|
|
335 |
if (postnrVeje == null) { |
if (postnrVeje == null) { |
336 |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries |
337 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(postnr, postnrVeje); |
338 |
} |
} |
339 |
|
|
340 |
|
|
343 |
if (gadeident == null) { |
if (gadeident == null) { |
344 |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
345 |
|
|
346 |
gadeident = a.gadeid; |
gadeident = intHelper.getInstance( a.gadeid ); |
347 |
|
|
348 |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
349 |
for(String alias : aliaser) { |
for(String alias : aliaser) { |
351 |
vasketAlias = aliasHelper.getInstance(vasketAlias); |
vasketAlias = aliasHelper.getInstance(vasketAlias); |
352 |
|
|
353 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
354 |
} |
} |
355 |
|
|
356 |
} |
} |
357 |
|
|
358 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); |
|
359 |
|
Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeident); |
360 |
if (gade == null) { |
if (gade == null) { |
361 |
gade = new HashMap<String, Address>(); |
gade = new TreeMap<Short, Map<String,Address>>(); |
362 |
searchGadeidentAdresser.put(gadeident, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
363 |
} |
} |
364 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
|
365 |
husnrSearch = husnrHelper.getInstance(husnrSearch); |
Map<String,Address> litraList = gade.get(a.husnr); |
366 |
gade.put(husnrSearch, a); |
if (litraList == null) { |
367 |
|
litraList = new HashMap<String,Address>(); |
368 |
|
gade.put(a.husnr, litraList); |
369 |
|
} |
370 |
|
|
371 |
|
litraList.put(a.husnrbogstav, a); |
372 |
} |
} |
373 |
|
|
374 |
|
|
375 |
//////////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////////// |
376 |
long start2 = System.currentTimeMillis(); |
long start2 = System.currentTimeMillis(); |
377 |
System.out.println("Build, stage1 elapsed: " + (start2-start1) ); |
System.out.println("Build, stage1 elapsed: " + (start2-start1) ); |
378 |
System.out.println("Build -- stage 2 alias tabel"); |
System.out.println("Build -- stage 2 alias tabel"); |
379 |
|
|
380 |
int vaskCount = 0; |
int vaskCount = 0; |
381 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = db.getAliasList(); |
382 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
383 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
384 |
|
|
415 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
416 |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
417 |
|
|
418 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = db.getExtendedAdresslist(); |
419 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
420 |
|
|
421 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
489 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
490 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
491 |
|
|
492 |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
493 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
494 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
495 |
continue; |
continue; |
514 |
|
|
515 |
//////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////// |
516 |
long stop = System.currentTimeMillis(); |
long stop = System.currentTimeMillis(); |
517 |
System.out.println("Build, stage3 elapsed: " + (stop-start4) ); |
System.out.println("Build, stage4 elapsed: " + (stop-start4) ); |
518 |
System.out.println("Build -- Gathering statistics"); |
System.out.println("Build -- Gathering statistics"); |
519 |
|
|
520 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
553 |
return stats; |
return stats; |
554 |
} |
} |
555 |
|
|
556 |
|
public DatabaseLayer getDatabaseLayer() { |
557 |
|
return db; |
558 |
|
} |
559 |
|
|
560 |
public void clear() { |
public void clear() { |
561 |
searchPostnrVejnavnGadeid.clear(); |
searchPostnrVejnavnGadeid.clear(); |
562 |
searchGadeidentAdresser.clear(); |
searchGadeidentAdresser.clear(); |
579 |
return ".." + targetAddress.rute; |
return ".." + targetAddress.rute; |
580 |
} else if (eb.afstand < 0.701) { |
} else if (eb.afstand < 0.701) { |
581 |
return "..." + targetAddress.rute; |
return "..." + targetAddress.rute; |
582 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 1.001) { |
583 |
return "...." + targetAddress.rute; |
return "...." + targetAddress.rute; |
584 |
} |
} |
585 |
break; |
break; |
605 |
return "...." + targetAddress.rute; |
return "...." + targetAddress.rute; |
606 |
} |
} |
607 |
break; |
break; |
608 |
|
default: |
609 |
|
System.out.println("Ukendt transport type: " + eb ); |
610 |
} |
} |
611 |
return null; |
return null; |
612 |
} |
} |
622 |
return result; |
return result; |
623 |
} |
} |
624 |
|
|
625 |
|
public List<Address> get100PctAddresses() { |
626 |
|
List<Address> result = new ArrayList<Address>(120000); |
627 |
|
for (Address a : alleAdresser) { |
628 |
|
if ( a.daekningsType == DaekningsType.DAEKNING_100PCT) { |
629 |
|
result.add(a); |
630 |
|
} |
631 |
|
} |
632 |
|
Collections.sort(result ); |
633 |
|
return result; |
634 |
|
} |
635 |
|
|
636 |
/////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////// |
637 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
638 |
String inject; |
String inject; |
671 |
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
672 |
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
673 |
|
|
674 |
|
aliasSet.add(vejnavn.replace("gl", "gamle") ); |
675 |
|
aliasSet.add(vejnavn.replace("gamle", "gl") ); |
676 |
|
|
677 |
aliasSet.add(vejnavn.replace("lille", "ll") ); |
aliasSet.add(vejnavn.replace("lille", "ll") ); |
678 |
aliasSet.add(vejnavn.replace("ll ", "lille") ); |
aliasSet.add(vejnavn.replace("ll ", "lille") ); |
679 |
aliasSet.add(vejnavn.replace("ll.", "lille") ); |
aliasSet.add(vejnavn.replace("ll.", "lille") ); |
729 |
aliasSet.add(vejnavn.replace("christians", "chr") ); |
aliasSet.add(vejnavn.replace("christians", "chr") ); |
730 |
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
731 |
aliasSet.add(vejnavn.replace("kristians", "kr") ); |
aliasSet.add(vejnavn.replace("kristians", "kr") ); |
732 |
|
|
733 |
|
aliasSet.add(vejnavn.replace("mylius", "myl") ); |
734 |
|
aliasSet.add(vejnavn.replace("myl", "mylius") ); |
735 |
|
|
736 |
|
aliasSet.add(vejnavn.replace("ludvig", "ludv") ); |
737 |
|
aliasSet.add(vejnavn.replace("ludv", "ludvig") ); |
738 |
|
|
739 |
|
|
740 |
// alternative stavninger |
// alternative stavninger |
800 |
|
|
801 |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
802 |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
803 |
|
|
804 |
|
aliasSet.add(vejnavn.replace("kronborg", "krbg") ); //Krbg ladegårdsvej, 3000 |
805 |
|
aliasSet.add(vejnavn.replace("krbg", "kronborg") ); |
806 |
|
|
807 |
// Opbyg æøå varianter over alle fundne aliaser |
// Opbyg æøå varianter over alle fundne aliaser |
808 |
|
|
809 |
@SuppressWarnings("unchecked") |
HashSet<String> variants = new HashSet<String>( aliasSet ); |
|
HashSet<String> variants = (HashSet<String>) aliasSet.clone(); |
|
810 |
|
|
811 |
for (String vVejnavn : variants) { |
for (String vVejnavn : variants) { |
812 |
// danske tegn 1 |
// danske tegn 1 |
826 |
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
827 |
|
|
828 |
//danske tegn 3 |
//danske tegn 3 |
829 |
aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") ); |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") ); |
830 |
aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); |
831 |
|
|
832 |
|
|
833 |
//udenlandsketegn |
//udenlandsketegn |
834 |
aliasSet.add(vejnavn.replace("u", "ü") ); |
aliasSet.add( vVejnavn.replace("u", "ü") ); |
835 |
aliasSet.add(vejnavn.replace("ü", "u") ); |
aliasSet.add( vVejnavn.replace("ü", "u") ); |
836 |
|
|
837 |
aliasSet.add(vejnavn.replace("ä", "æ") ); |
aliasSet.add( vVejnavn.replace("ä", "æ") ); |
838 |
aliasSet.add(vejnavn.replace("æ", "ä") ); |
aliasSet.add( vVejnavn.replace("æ", "ä") ); |
839 |
|
|
840 |
aliasSet.add(vejnavn.replace("ö", "ø") ); |
aliasSet.add( vVejnavn.replace("ö", "ø") ); |
841 |
aliasSet.add(vejnavn.replace("ø", "ö") ); |
aliasSet.add( vVejnavn.replace("ø", "ö") ); |
842 |
} |
} |
843 |
|
|
844 |
return aliasSet; |
return aliasSet; |
850 |
|
|
851 |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
852 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
853 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
|
854 |
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()); |
|
|
} |
|
855 |
|
|
856 |
return newMap.entrySet(); |
return newMap.entrySet(); |
857 |
} |
} |
858 |
|
|
859 |
public Set<String> getHusnumre(int gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
860 |
|
|
861 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid); |
862 |
|
|
863 |
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
864 |
set.addAll( gade.keySet() ); |
for(Map<String,Address> litraList : gade.values()) { |
865 |
|
for (Address a: litraList.values()) { |
866 |
|
set.add( a.husnr + a.husnrbogstav ); |
867 |
|
} |
868 |
|
} |
869 |
|
|
870 |
return set; |
return set; |
871 |
} |
} |
872 |
|
|
873 |
public Address getAdresse(int gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnrStr) { |
874 |
|
short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") ); |
875 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
String litra = husnrStr.replaceAll("\\d", ""); |
876 |
return gade.get(husnr); |
|
877 |
|
Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid); |
878 |
|
Map<String, Address> litraList = gade.get(husnr); |
879 |
|
return litraList.get(litra); |
880 |
|
|
881 |
} |
} |
882 |
|
|