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

  ViewVC Help
Powered by ViewVC 1.1.20