/[projects]/dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java
ViewVC logotype

Contents of /dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2832 - (show annotations) (download)
Tue Jan 19 17:27:57 2016 UTC (8 years, 3 months ago) by torben
File size: 21310 byte(s)
Use collections.sort instead of List.sort(null)
1 package dk.daoas.daoadresseservice;
2
3 import java.sql.SQLException;
4 import java.text.SimpleDateFormat;
5 import java.util.ArrayList;
6 import java.util.Collections;
7 import java.util.Date;
8 import java.util.HashMap;
9 import java.util.List;
10 import java.util.Map;
11 import java.util.Map.Entry;
12 import java.util.Set;
13 import java.util.TreeMap;
14 import java.util.TreeSet;
15 import java.util.concurrent.ConcurrentHashMap;
16
17 import org.apache.commons.lang3.StringUtils;
18
19 import dk.daoas.daoadresseservice.admin.ServiceConfig;
20 import dk.daoas.daoadresseservice.beans.Address;
21 import dk.daoas.daoadresseservice.beans.AliasBean;
22 import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
23 import dk.daoas.daoadresseservice.beans.ExtendedBean;
24 import dk.daoas.daoadresseservice.beans.HundredePctBean;
25 import dk.daoas.daoadresseservice.beans.SearchRequest;
26 import dk.daoas.daoadresseservice.beans.SearchResult;
27 import dk.daoas.daoadresseservice.beans.SearchResult.Status;
28 import dk.daoas.daoadresseservice.db.DatabaseLayer;
29 import dk.daoas.daoadresseservice.util.DaoUtils;
30 import dk.daoas.daoadresseservice.util.DeduplicateHelper;
31 import dk.daoas.daoadresseservice.util.NaturalOrderComparator;
32 import dk.daoas.daoadresseservice.util.NearestShortTreeMap;
33
34 public class AddressSearch {
35
36 private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid;
37 private Map<Integer, Map<Short, Map<String,Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra
38
39 private List<Address> ikkeDaekkedeAdresser = new ArrayList<Address>(60000);
40 private List<Address> hundredePctAdresser = new ArrayList<Address>(120000);
41
42 private Map<String,Integer> helperCache;
43
44 private DataStatisticsBean stats = new DataStatisticsBean();
45
46 private DatabaseLayer db;
47 private ServiceConfig config;
48
49
50 StreetnameHelper levenshteinHelper;
51 StreetnameHelper metaphoneHelper;
52 StreetnameHelper googleHelper;
53 StreetnameHelper osmHelper;
54
55
56 public AddressSearch(DatabaseLayer db, ServiceConfig config) {
57
58 this.db = db;
59 this.config = config;
60
61 levenshteinHelper = new LevenshteinStreetnameHelper( this );
62 metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config);
63 googleHelper = new GoogleStreetnameHelper( config );
64 osmHelper = new OSMStreetnameHelper( config );
65 }
66
67 public Address getAddressSafe(int gadeid, short husnr, String litra) throws Exception {
68
69 Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeid);
70
71 if (gade == null) {
72 throw new Exception("GadeID ikke fundet");
73 }
74
75 Map<String,Address> litraList = gade.get(husnr);
76
77 Address addr = litraList.get(litra);
78
79 if (addr == null) {
80 throw new Exception("Adresse ikke ikke fundet");
81 }
82
83 return addr;
84 }
85
86
87 public SearchResult search(String postnrStr, String adresse) {
88 return search(postnrStr, adresse, false);
89 }
90
91
92 public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr) {
93
94 postnrStr = postnrStr.trim();
95 adresse = adresse.trim();
96
97
98 SearchRequest request = new SearchRequest();
99 SearchResult result = new SearchResult();
100
101
102 try {
103 request.postnr = Short.parseShort(postnrStr);
104 } catch (Exception E) {
105 result.status = Status.ERROR_UNKNOWN_POSTAL;
106 return result;
107 }
108
109
110 request.streetNames = searchPostnrVejnavnGadeid.get(request.postnr);
111
112 if (request.streetNames == null) {
113 result.status = Status.ERROR_UNKNOWN_POSTAL;
114 return result;
115 }
116
117
118 result.splitResult = AddressUtils.splitAdresse(adresse);
119 request.vejnavn = result.splitResult.vej;
120
121
122
123 if (result.splitResult.husnr.length() == 0) {
124 result.status = Status.ERROR_MISSING_HOUSENUMBER;
125 return result;
126 }
127
128 result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
129
130
131 if (result.vasketVejnavn.indexOf("pakkebo") > -1
132 || result.vasketVejnavn.indexOf("pakkepost") > -1
133 || result.vasketVejnavn.indexOf("postbo") > -1 // postbox/postboks
134 || result.vasketVejnavn.indexOf("døgnpost") > -1
135 || result.vasketVejnavn.indexOf("døgnbo") > -1 // døgnbox // døgnboks
136 || result.vasketVejnavn.equals("id")
137 ) {
138 result.status = Status.ERROR_POSTBOX;
139 return result;
140 }
141
142 // LookupStreetname er en indkapsling af alm + levenstein + google + osm
143 Integer gadeident = lookupStretname(request, result, true);
144
145
146 /*
147 * Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn
148 *
149 * <strike>Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt</strike>*/
150 if (gadeident == null) {
151 final int MAX_TRIES = 4;
152
153 String vejnavnParts[] = request.vejnavn.split(" ");
154
155 for (int i=1; i<=MAX_TRIES && i<vejnavnParts.length; i++) {
156 String subVejnavn = DaoUtils.joinHelper(vejnavnParts, i);
157
158 request.vejnavn = subVejnavn;
159 result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
160
161 gadeident = lookupStretname(request, result, false);//prøv opslag MEN UDEN GOOGLE/OSM !!!
162
163 //hvis vi fandt vejen ud fra substrengen
164 if (gadeident != null) {
165 break;
166 }
167
168 //hvis vi ikke fandt kopierer vi vejnavn fra split igen
169 request.vejnavn = result.splitResult.vej;
170 result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
171 }
172 }
173
174
175
176 if (gadeident == null) {
177 result.status = Status.ERROR_UNKNOWN_STREETNAME;
178 return result;
179 }
180
181 result.gadeident = gadeident;
182
183
184 Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeident);
185 if (gade == null) { //Denne søgning må ikke fejle
186 result.status = Status.ERROR_INTERNAL;
187 return result;
188 }
189
190
191 //Kunne evt klares med Iterables.get fra Guava/Collections
192 Address firstAddress = gade.values().iterator().next().values().iterator().next(); //Første husnr -> første litra
193 result.vej = firstAddress.vejnavn;
194
195 short husnrSearch = Short.parseShort(result.splitResult.husnr );
196 Map<String,Address> litraList = gade.get(husnrSearch);
197
198
199 if (litraList == null) { //Husnr ikke fundet
200
201 if (naermesteHusnr) {
202 TreeMap<Short, Map<String,Address>> gadeTreeMap = (TreeMap<Short, Map<String,Address>>) gade;
203 result.anvendtHusnr = NearestShortTreeMap.getNearestKey(husnrSearch, gadeTreeMap);
204
205 result.nearestHusnr = true;
206 litraList = gade.get(result.anvendtHusnr);
207
208
209 } else {
210 result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT;
211 return result;
212 }
213 }
214
215 Address addr = litraList.get( result.splitResult.litra );
216
217 if (addr == null) { //litra ikke fundet
218 if (config.nearestLitra == true || naermesteHusnr == true) {
219 result.nearestLitra = true;
220 addr = litraList.values().iterator().next();
221 } else {
222 //husnr fundet men litra blev ikke fundet
223 result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT;
224 return result;
225 }
226 }
227
228 result.address = addr;
229
230
231 if ( StringUtils.equals(addr.distributor, "LUKKET") ) {
232 result.status = Status.STATUS_NOT_COVERED; //Skal vi have en special status til Lukkede adresser ?
233 return result;
234 }
235
236 if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
237 result.status = Status.STATUS_NOT_COVERED;
238 return result;
239 }
240
241
242 result.status = Status.STATUS_OK;
243
244 return result;
245 }
246
247
248 private Integer lookupStretname(SearchRequest request, SearchResult result, boolean useExternal) {
249 String helperSearchKey = "";
250
251 Integer gadeident = request.streetNames.get(result.vasketVejnavn);
252
253
254 if ( gadeident == null) {
255 helperSearchKey = "" + request.postnr + "/" + result.vasketVejnavn;
256 gadeident = helperCache.get(helperSearchKey);
257 }
258
259 if (gadeident == null) {
260 String vej = levenshteinHelper.proposeStreetName(request, result);
261 if (vej != null) {
262 gadeident = request.streetNames.get(vej);
263 }
264 }
265
266 if (gadeident == null) {
267 String vej = metaphoneHelper.proposeStreetName(request, result);
268 if (vej != null) {
269 gadeident = request.streetNames.get(vej);
270 }
271 }
272
273
274 // Brug OpenStreetMap før vi prøver google
275 // For google har en request limit, det har OSM ikke!
276 if ( gadeident == null && useExternal) {
277 String vej = osmHelper.proposeStreetName(request, result);
278 gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
279 }
280
281 if ( gadeident == null && useExternal) {
282 String vej = googleHelper.proposeStreetName(request, result);
283 gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
284 }
285 return gadeident;
286 }
287
288 private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) {
289 if (vej == null)
290 return null;
291
292 String vejVasket = AddressUtils.vaskVejnavn( vej );
293 Integer gadeident = postnrVeje.get(vejVasket);
294
295 if (gadeident != null) {
296 helperCache.put(helperSearchKey, gadeident);
297 }
298 return gadeident;
299
300 }
301
302 public Map<String,Integer> getStretsByPostal(short zip) {
303 return searchPostnrVejnavnGadeid.get(zip);
304 }
305
306
307
308 public void buildSearchStructures() throws SQLException{
309 searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>();
310 searchGadeidentAdresser = new HashMap<Integer, Map<Short, Map<String,Address>>>();
311 helperCache = new ConcurrentHashMap<String,Integer>();
312
313 // //////////////////////
314 // Start stage1
315
316 long start1 = System.currentTimeMillis();
317 System.out.println("Build -- stage 1");
318
319 List<Address> alleAdresser = db.getAllAdresses();
320
321
322 /* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/
323 Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
324
325
326 DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>();
327 DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>();
328
329 AliasGenerator aliasGenerator = new AliasGenerator();
330
331
332 for (Address a : alleAdresser) {
333 idAddressMap.put(a.id, a);
334
335 Short postnr = shortHelper.getInstance(a.postnr);
336
337 Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);
338
339 if (postnrVeje == null) {
340 postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries
341 searchPostnrVejnavnGadeid.put(postnr, postnrVeje);
342 }
343
344
345 String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
346 Integer gadeident = postnrVeje.get(vasketVejnavn);
347 if (gadeident == null) {
348 //postnrVeje.put(vasketVejnavn, a.gadeid);
349
350 gadeident = intHelper.getInstance( a.gadeid );
351
352 Set<String> aliaser = aliasGenerator.findVejAliaser(a.vejnavn);
353 for(String alias : aliaser) {
354 postnrVeje.put(alias, gadeident);
355 }
356
357 }
358
359
360 Map<Short, Map<String,Address>> gade = searchGadeidentAdresser.get(gadeident);
361 if (gade == null) {
362 gade = new TreeMap<Short, Map<String,Address>>();
363 searchGadeidentAdresser.put(gadeident, gade);
364 }
365
366 Map<String,Address> litraList = gade.get(a.husnr);
367 if (litraList == null) {
368 litraList = new HashMap<String,Address>();
369 gade.put(a.husnr, litraList);
370 }
371
372 litraList.put(a.husnrbogstav, a);
373 }
374
375
376 aliasGenerator.clear(); //frigiv hukommelse inden stage2
377 aliasGenerator = null;
378 shortHelper.clear();
379 shortHelper = null;
380 intHelper.clear();
381 intHelper = null;
382
383
384 ////////////////////////////////////////////////////////////////////////////////////////
385 long start2 = System.currentTimeMillis();
386 System.out.println("Build, stage1 elapsed: " + (start2-start1) );
387 System.out.println("Build -- stage 2 alias tabel");
388
389 int vaskCount = 0;
390 List<AliasBean> aliasList = db.getAliasList();
391 for (AliasBean alias : aliasList) {
392 Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
393
394 if (postnrVeje == null) {
395 //Burde ikke kunne ske - men better safe than sorry
396 continue;
397 }
398
399 String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn);
400 String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn);
401
402 Integer gadeident = postnrVeje.get(vasketVej);
403 if (gadeident == null) {
404 //Kender ikke den oprindelige vej
405 continue;
406 }
407
408 Integer aliasIdent = postnrVeje.get(vasketAlias);
409
410 if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet
411 postnrVeje.put(vasketAlias, gadeident);
412 vaskCount++;
413 }
414
415 }
416 System.out.println("Anvendte " + vaskCount + " aliaser fra databasen");
417
418 aliasList.clear();//cleanup inden stage3
419
420
421 ////////////////////////////////////////////////////////////////////////////////////////
422 long start3 = System.currentTimeMillis();
423 System.out.println("Build, stage2 elapsed: " + (start3-start2) );
424 System.out.println("Build -- stage 3 udvidet dækning");
425
426 DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
427 DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
428
429 List<ExtendedBean> extDao = db.getExtendedAdresslist();
430 for (ExtendedBean eb : extDao) {
431
432 Address orgAddress = idAddressMap.get(eb.orgId);
433 if (orgAddress == null)
434 continue;
435
436 if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
437 //kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden
438 continue;
439 }
440
441 Address targetAddress = idAddressMap.get(eb.targetId);
442 if (targetAddress == null) {
443 continue;
444 }
445
446
447 if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) {
448 continue;
449 }
450
451
452
453 if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) {
454 continue;
455 }
456
457 orgAddress.extTarget = targetAddress;
458 orgAddress.extAfstand = eb.afstand;
459
460 boolean covered = false;
461 if (targetAddress.distributor.equals("DAO")) {
462 orgAddress.ruteMandag = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);
463 orgAddress.ruteMandag = ruteHelper.getInstance(orgAddress.ruteMandag);
464
465 if (orgAddress.ruteMandag != null) {
466 orgAddress.korelisteMandag = targetAddress.korelisteMandag;
467 covered = true;
468 }
469 }
470
471 if (targetAddress.distributor.equals("BK")) {
472 orgAddress.korelisteMandag = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
473 orgAddress.korelisteMandag = korelisteHelper.getInstance(orgAddress.korelisteMandag);
474
475 if (orgAddress.korelisteMandag != null) {
476 orgAddress.ruteMandag = targetAddress.ruteMandag;
477 covered = true;
478 }
479 }
480
481 if (covered) { //Kopier resten af felterne
482 orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET;
483 orgAddress.dbkBane = targetAddress.dbkBane;
484
485 /* Sådan gør den gamle service */
486 /* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/
487 //orgAddress.kommunekode = targetAddress.kommunekode;
488 //orgAddress.vejkode = targetAddress.vejkode;
489
490
491 orgAddress.distributor = targetAddress.distributor;
492 }
493 }
494
495 // cleanup inden stage 4
496 idAddressMap = null;
497 ruteHelper = null;
498 korelisteHelper = null;
499
500 //////////////////////////////////////////////////////////////////////////////////////
501 long start4 = System.currentTimeMillis();
502 System.out.println("Build, stage3 elapsed: " + (start4-start3) );
503 System.out.println("Build -- stage 4 - 100pct");
504
505 Map<Short,HundredePctBean> hundredePct = db.get100PctList();
506 for (Address addr : alleAdresser) {
507 if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
508 continue;
509 }
510
511 if (addr.distributor != null && addr.distributor.equals("LUKKET")) {
512 continue;
513 }
514
515
516 HundredePctBean bean = hundredePct.get(addr.postnr);
517 if (bean == null) {
518 continue;
519 }
520
521 addr.daekningsType = DaekningsType.DAEKNING_100PCT;
522 addr.ruteMandag = bean.rute;
523 addr.korelisteMandag = bean.koreliste;
524 addr.dbkBane = bean.dbkBane;
525 addr.distributor = bean.distributor;
526 }
527
528 ////////////////////////////////////////////////////////////////////////////////////
529 long stop = System.currentTimeMillis();
530 System.out.println("Build, stage4 elapsed: " + (stop-start4) );
531 System.out.println("Build -- Gathering statistics");
532
533 for (Address addr : alleAdresser) {
534 switch (addr.daekningsType) {
535 case DAEKNING_DIREKTE:
536 stats.direkteCount++;
537 break;
538 case DAEKNING_UDVIDET:
539 stats.extendedCount++;
540 break;
541 case DAEKNING_100PCT:
542 hundredePctAdresser.add(addr);
543 stats.hundredePctCount++;
544 break;
545 default:
546 ikkeDaekkedeAdresser.add(addr);
547 stats.ikkeDaekketCount++;
548 }
549 }
550 stats.totalCount = alleAdresser.size();
551
552 Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet
553 Collections.sort( hundredePctAdresser );
554
555
556 stats.elapsed = stop-start1;
557 stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
558
559 System.out.println("Build: totalCount: " + stats.totalCount);
560 System.out.println("Build: direkteCount: " + stats.direkteCount);
561 System.out.println("Build: extendedCount: " + stats.extendedCount);
562 System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
563 System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
564
565 System.out.println("Build: Total Elapsed: " + (stop-start1) );
566 System.out.println("Build Completed");
567
568 }
569
570 public DataStatisticsBean getStatistics() {
571 return stats;
572 }
573
574 public DatabaseLayer getDatabaseLayer() {
575 return db;
576 }
577
578 public void clear() {
579 searchPostnrVejnavnGadeid.clear();
580 searchGadeidentAdresser.clear();
581 helperCache.clear();
582 }
583
584
585 private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
586 if (targetAddress.ruteMandag == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
587 return null;
588 }
589
590 // ///////////////////////////////////////////////////////////////////
591 switch( eb.transport) {
592 case "cykel":
593 if (eb.afstand < 0.151) {
594 return "." + targetAddress.ruteMandag;
595 } else if (eb.afstand < 0.501) {
596 return ".." + targetAddress.ruteMandag;
597 } else if (eb.afstand < 0.701) {
598 return "..." + targetAddress.ruteMandag;
599 } else if (eb.afstand < 1.001) {
600 return "...." + targetAddress.ruteMandag;
601 }
602 break;
603 case "scooter":
604 if (eb.afstand < 0.151) {
605 return "." + targetAddress.ruteMandag;
606 } else if (eb.afstand < 0.801) {
607 return ".." + targetAddress.ruteMandag;
608 } else if (eb.afstand < 1.201) {
609 return "..." + targetAddress.ruteMandag;
610 } else if (eb.afstand < 2.101) {
611 return "...." + targetAddress.ruteMandag;
612 }
613 break;
614 case "bil":
615 if (eb.afstand < 0.151) {
616 return "." + targetAddress.ruteMandag;
617 } else if (eb.afstand < 1.001) {
618 return ".." + targetAddress.ruteMandag;
619 } else if (eb.afstand < 1.601) {
620 return "..." + targetAddress.ruteMandag;
621 } else if (eb.afstand < 2.601) {
622 return "...." + targetAddress.ruteMandag;
623 }
624 break;
625 default:
626 System.out.println("Ukendt transport type: " + eb );
627 }
628 return null;
629 }
630
631 public List<Address> getNonCoveredAddresses() {
632 return ikkeDaekkedeAdresser;
633 }
634
635 public List<Address> get100PctAddresses() {
636 return hundredePctAdresser;
637 }
638
639 ///////////////////////////////////////////////////////////
640 private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
641 String inject;
642 if (eb.afstand <= 0.500) {
643 inject = ".";
644 } else {
645 inject = "..";
646 }
647 return AddressUtils.injectIntoBk(targetAddress.korelisteMandag, inject);
648 }
649
650
651 public Set<Short> getPostnumre() {
652 return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
653 }
654
655 public Set<Entry<String,Integer>> getVejnavne(short postnr) {
656 Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr);
657
658 TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering
659
660 return newMap.entrySet();
661 }
662
663 public Set<String> getHusnumre(int gadeid) {
664
665 Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
666
667 Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
668 for(Map<String,Address> litraList : gade.values()) {
669 for (Address a: litraList.values()) {
670 set.add( a.husnr + a.husnrbogstav );
671 }
672 }
673
674 return set;
675 }
676
677 public Address getAdresse(int gadeid, String husnrStr) {
678 short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
679 String litra = husnrStr.replaceAll("\\d", "");
680
681 Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
682 Map<String, Address> litraList = gade.get(husnr);
683 return litraList.get(litra);
684
685 }
686
687 }

  ViewVC Help
Powered by ViewVC 1.1.20