/[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 2817 - (show annotations) (download)
Fri Jan 15 08:11:58 2016 UTC (8 years, 4 months ago) by torben
File size: 21176 byte(s)
Comment
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
40 private List<Address> alleAdresser;
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 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
419 ////////////////////////////////////////////////////////////////////////////////////////
420 long start3 = System.currentTimeMillis();
421 System.out.println("Build, stage2 elapsed: " + (start3-start2) );
422 System.out.println("Build -- stage 3 udvidet dækning");
423
424 DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
425 DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
426
427 List<ExtendedBean> extDao = db.getExtendedAdresslist();
428 for (ExtendedBean eb : extDao) {
429
430 Address orgAddress = idAddressMap.get(eb.orgId);
431 if (orgAddress == null)
432 continue;
433
434 if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
435 //kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden
436 continue;
437 }
438
439 Address targetAddress = idAddressMap.get(eb.targetId);
440 if (targetAddress == null) {
441 continue;
442 }
443
444
445 if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) {
446 continue;
447 }
448
449
450
451 if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) {
452 continue;
453 }
454
455 orgAddress.extTarget = targetAddress;
456 orgAddress.extAfstand = eb.afstand;
457
458 boolean covered = false;
459 if (targetAddress.distributor.equals("DAO")) {
460 orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);
461 orgAddress.rute = ruteHelper.getInstance(orgAddress.rute);
462
463 if (orgAddress.rute != null) {
464 orgAddress.koreliste = targetAddress.koreliste;
465 covered = true;
466 }
467 }
468
469 if (targetAddress.distributor.equals("BK")) {
470 orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
471 orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste);
472
473 if (orgAddress.koreliste != null) {
474 orgAddress.rute = targetAddress.rute;
475 covered = true;
476 }
477 }
478
479 if (covered) { //Kopier resten af felterne
480 orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET;
481 orgAddress.dbkBane = targetAddress.dbkBane;
482
483 /* Sådan gør den gamle service */
484 /* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/
485 //orgAddress.kommunekode = targetAddress.kommunekode;
486 //orgAddress.vejkode = targetAddress.vejkode;
487
488
489 orgAddress.distributor = targetAddress.distributor;
490 }
491 }
492
493 // nu skal vi ikke bruge idAddressMap længere
494 idAddressMap = null;
495
496 //////////////////////////////////////////////////////////////////////////////////////
497 long start4 = System.currentTimeMillis();
498 System.out.println("Build, stage3 elapsed: " + (start4-start3) );
499 System.out.println("Build -- stage 4 - 100pct");
500
501 Map<Short,HundredePctBean> hundredePct = db.get100PctList();
502 for (Address addr : alleAdresser) {
503 if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
504 continue;
505 }
506
507 if (addr.distributor != null && addr.distributor.equals("LUKKET")) {
508 continue;
509 }
510
511
512 HundredePctBean bean = hundredePct.get(addr.postnr);
513 if (bean == null) {
514 continue;
515 }
516
517 addr.daekningsType = DaekningsType.DAEKNING_100PCT;
518 addr.rute = bean.rute;
519 addr.koreliste = bean.koreliste;
520 addr.dbkBane = bean.dbkBane;
521 addr.distributor = bean.distributor;
522 }
523
524 ////////////////////////////////////////////////////////////////////////////////////
525 long stop = System.currentTimeMillis();
526 System.out.println("Build, stage4 elapsed: " + (stop-start4) );
527 System.out.println("Build -- Gathering statistics");
528
529 for (Address addr : alleAdresser) {
530 switch (addr.daekningsType) {
531 case DAEKNING_DIREKTE:
532 stats.direkteCount++;
533 break;
534 case DAEKNING_UDVIDET:
535 stats.extendedCount++;
536 break;
537 case DAEKNING_100PCT:
538 stats.hundredePctCount++;
539 break;
540 default:
541 stats.ikkeDaekketCount++;
542 }
543 }
544 stats.totalCount = alleAdresser.size();
545
546
547 stats.elapsed = stop-start1;
548 stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
549
550 System.out.println("Build: totalCount: " + stats.totalCount);
551 System.out.println("Build: direkteCount: " + stats.direkteCount);
552 System.out.println("Build: extendedCount: " + stats.extendedCount);
553 System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
554 System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
555
556 System.out.println("Build: Total Elapsed: " + (stop-start1) );
557 System.out.println("Build Completed");
558
559 }
560
561 public DataStatisticsBean getStatistics() {
562 return stats;
563 }
564
565 public DatabaseLayer getDatabaseLayer() {
566 return db;
567 }
568
569 public void clear() {
570 searchPostnrVejnavnGadeid.clear();
571 searchGadeidentAdresser.clear();
572 alleAdresser.clear();
573 helperCache.clear();
574 }
575
576
577 private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
578 if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
579 return null;
580 }
581
582 // ///////////////////////////////////////////////////////////////////
583 switch( eb.transport) {
584 case "cykel":
585 if (eb.afstand < 0.151) {
586 return "." + targetAddress.rute;
587 } else if (eb.afstand < 0.501) {
588 return ".." + targetAddress.rute;
589 } else if (eb.afstand < 0.701) {
590 return "..." + targetAddress.rute;
591 } else if (eb.afstand < 1.001) {
592 return "...." + targetAddress.rute;
593 }
594 break;
595 case "scooter":
596 if (eb.afstand < 0.151) {
597 return "." + targetAddress.rute;
598 } else if (eb.afstand < 0.801) {
599 return ".." + targetAddress.rute;
600 } else if (eb.afstand < 1.201) {
601 return "..." + targetAddress.rute;
602 } else if (eb.afstand < 2.101) {
603 return "...." + targetAddress.rute;
604 }
605 break;
606 case "bil":
607 if (eb.afstand < 0.151) {
608 return "." + targetAddress.rute;
609 } else if (eb.afstand < 1.001) {
610 return ".." + targetAddress.rute;
611 } else if (eb.afstand < 1.601) {
612 return "..." + targetAddress.rute;
613 } else if (eb.afstand < 2.601) {
614 return "...." + targetAddress.rute;
615 }
616 break;
617 default:
618 System.out.println("Ukendt transport type: " + eb );
619 }
620 return null;
621 }
622
623 public List<Address> getNonCoveredAddresses() {
624 List<Address> result = new ArrayList<Address>(60000);
625 for (Address a : alleAdresser) {
626 if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
627 result.add(a);
628 }
629 }
630 Collections.sort(result );
631 return result;
632 }
633
634 public List<Address> get100PctAddresses() {
635 List<Address> result = new ArrayList<Address>(120000);
636 for (Address a : alleAdresser) {
637 if ( a.daekningsType == DaekningsType.DAEKNING_100PCT) {
638 result.add(a);
639 }
640 }
641 Collections.sort(result );
642 return result;
643 }
644
645 ///////////////////////////////////////////////////////////
646 private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
647 String inject;
648 if (eb.afstand <= 0.500) {
649 inject = ".";
650 } else {
651 inject = "..";
652 }
653 return AddressUtils.injectIntoBk(targetAddress.koreliste, inject);
654 }
655
656
657 public Set<Short> getPostnumre() {
658 return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
659 }
660
661 public Set<Entry<String,Integer>> getVejnavne(short postnr) {
662 Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr);
663
664 TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering
665
666 return newMap.entrySet();
667 }
668
669 public Set<String> getHusnumre(int gadeid) {
670
671 Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
672
673 Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
674 for(Map<String,Address> litraList : gade.values()) {
675 for (Address a: litraList.values()) {
676 set.add( a.husnr + a.husnrbogstav );
677 }
678 }
679
680 return set;
681 }
682
683 public Address getAdresse(int gadeid, String husnrStr) {
684 short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
685 String litra = husnrStr.replaceAll("\\d", "");
686
687 Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
688 Map<String, Address> litraList = gade.get(husnr);
689 return litraList.get(litra);
690
691 }
692
693 }

  ViewVC Help
Powered by ViewVC 1.1.20