/[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 2807 - (show annotations) (download)
Thu Jan 14 08:28:03 2016 UTC (8 years, 4 months ago) by torben
File size: 21153 byte(s)
Refactor alias generator to seperate class
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 long start1 = System.currentTimeMillis();
314 System.out.println("Build -- stage 1");
315
316 alleAdresser = db.getAllAdresses();
317
318
319 /* Mapper mellem db Row ID og adresse noden */
320 Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
321 DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(400000); // Indeholder pt 379664 entries
322
323 DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>();
324 DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>();
325
326 AliasGenerator aliasGenerator = new AliasGenerator();
327
328
329 for (Address a : alleAdresser) {
330 idAddressMap.put(a.id, a);
331
332 Short postnr = shortHelper.getInstance(a.postnr);
333
334 Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);
335
336 if (postnrVeje == null) {
337 postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries
338 searchPostnrVejnavnGadeid.put(postnr, postnrVeje);
339 }
340
341
342 String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
343 Integer gadeident = postnrVeje.get(vasketVejnavn);
344 if (gadeident == null) {
345 //postnrVeje.put(vasketVejnavn, a.gadeid);
346
347 gadeident = intHelper.getInstance( a.gadeid );
348
349 Set<String> aliaser = aliasGenerator.findVejAliaser(a.vejnavn);
350 for(String alias : aliaser) {
351 String vasketAlias = AddressUtils.vaskVejnavn(alias);
352 vasketAlias = aliasHelper.getInstance(vasketAlias);
353
354 postnrVeje.put(vasketAlias, 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 ////////////////////////////////////////////////////////////////////////////////////////
377 long start2 = System.currentTimeMillis();
378 System.out.println("Build, stage1 elapsed: " + (start2-start1) );
379 System.out.println("Build -- stage 2 alias tabel");
380
381 int vaskCount = 0;
382 List<AliasBean> aliasList = db.getAliasList();
383 for (AliasBean alias : aliasList) {
384 Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
385
386 if (postnrVeje == null) {
387 //Burde ikke kunne ske - men better safe than sorry
388 continue;
389 }
390
391 String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn);
392 String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn);
393
394 Integer gadeident = postnrVeje.get(vasketVej);
395 if (gadeident == null) {
396 //Kender ikke den oprindelige vej
397 continue;
398 }
399
400 Integer aliasIdent = postnrVeje.get(vasketAlias);
401
402 if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet
403 postnrVeje.put(vasketAlias, gadeident);
404 vaskCount++;
405 }
406
407 }
408 System.out.println("Anvendte " + vaskCount + " aliaser fra databasen");
409
410
411 ////////////////////////////////////////////////////////////////////////////////////////
412 long start3 = System.currentTimeMillis();
413 System.out.println("Build, stage2 elapsed: " + (start3-start2) );
414 System.out.println("Build -- stage 3 udvidet dækning");
415
416 DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
417 DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
418
419 List<ExtendedBean> extDao = db.getExtendedAdresslist();
420 for (ExtendedBean eb : extDao) {
421
422 Address orgAddress = idAddressMap.get(eb.orgId);
423 if (orgAddress == null)
424 continue;
425
426 if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
427 //kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden
428 continue;
429 }
430
431 Address targetAddress = idAddressMap.get(eb.targetId);
432 if (targetAddress == null) {
433 continue;
434 }
435
436
437 if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) {
438 continue;
439 }
440
441
442
443 if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) {
444 continue;
445 }
446
447 orgAddress.extTarget = targetAddress;
448 orgAddress.extAfstand = eb.afstand;
449
450 boolean covered = false;
451 if (targetAddress.distributor.equals("DAO")) {
452 orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);
453 orgAddress.rute = ruteHelper.getInstance(orgAddress.rute);
454
455 if (orgAddress.rute != null) {
456 orgAddress.koreliste = targetAddress.koreliste;
457 covered = true;
458 }
459 }
460
461 if (targetAddress.distributor.equals("BK")) {
462 orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
463 orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste);
464
465 if (orgAddress.koreliste != null) {
466 orgAddress.rute = targetAddress.rute;
467 covered = true;
468 }
469 }
470
471 if (covered) { //Kopier resten af felterne
472 orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET;
473 orgAddress.dbkBane = targetAddress.dbkBane;
474
475 /* Sådan gør den gamle service */
476 /* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/
477 //orgAddress.kommunekode = targetAddress.kommunekode;
478 //orgAddress.vejkode = targetAddress.vejkode;
479
480
481 orgAddress.distributor = targetAddress.distributor;
482 }
483 }
484
485 // nu skal vi ikke bruge idAddressMap længere
486 idAddressMap = null;
487
488 //////////////////////////////////////////////////////////////////////////////////////
489 long start4 = System.currentTimeMillis();
490 System.out.println("Build, stage3 elapsed: " + (start4-start3) );
491 System.out.println("Build -- stage 4 - 100pct");
492
493 Map<Short,HundredePctBean> hundredePct = db.get100PctList();
494 for (Address addr : alleAdresser) {
495 if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
496 continue;
497 }
498
499 if (addr.distributor != null && addr.distributor.equals("LUKKET")) {
500 continue;
501 }
502
503
504 HundredePctBean bean = hundredePct.get(addr.postnr);
505 if (bean == null) {
506 continue;
507 }
508
509 addr.daekningsType = DaekningsType.DAEKNING_100PCT;
510 addr.rute = bean.rute;
511 addr.koreliste = bean.koreliste;
512 addr.dbkBane = bean.dbkBane;
513 addr.distributor = bean.distributor;
514 }
515
516 ////////////////////////////////////////////////////////////////////////////////////
517 long stop = System.currentTimeMillis();
518 System.out.println("Build, stage4 elapsed: " + (stop-start4) );
519 System.out.println("Build -- Gathering statistics");
520
521 for (Address addr : alleAdresser) {
522 switch (addr.daekningsType) {
523 case DAEKNING_DIREKTE:
524 stats.direkteCount++;
525 break;
526 case DAEKNING_UDVIDET:
527 stats.extendedCount++;
528 break;
529 case DAEKNING_100PCT:
530 stats.hundredePctCount++;
531 break;
532 default:
533 stats.ikkeDaekketCount++;
534 }
535 }
536 stats.totalCount = alleAdresser.size();
537
538
539 stats.elapsed = stop-start1;
540 stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
541
542 System.out.println("Build: totalCount: " + stats.totalCount);
543 System.out.println("Build: direkteCount: " + stats.direkteCount);
544 System.out.println("Build: extendedCount: " + stats.extendedCount);
545 System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
546 System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
547
548 System.out.println("Build: Total Elapsed: " + (stop-start1) );
549 System.out.println("Build Completed");
550
551 }
552
553 public DataStatisticsBean getStatistics() {
554 return stats;
555 }
556
557 public DatabaseLayer getDatabaseLayer() {
558 return db;
559 }
560
561 public void clear() {
562 searchPostnrVejnavnGadeid.clear();
563 searchGadeidentAdresser.clear();
564 alleAdresser.clear();
565 helperCache.clear();
566 }
567
568
569 private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
570 if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
571 return null;
572 }
573
574 // ///////////////////////////////////////////////////////////////////
575 switch( eb.transport) {
576 case "cykel":
577 if (eb.afstand < 0.151) {
578 return "." + targetAddress.rute;
579 } else if (eb.afstand < 0.501) {
580 return ".." + targetAddress.rute;
581 } else if (eb.afstand < 0.701) {
582 return "..." + targetAddress.rute;
583 } else if (eb.afstand < 1.001) {
584 return "...." + targetAddress.rute;
585 }
586 break;
587 case "scooter":
588 if (eb.afstand < 0.151) {
589 return "." + targetAddress.rute;
590 } else if (eb.afstand < 0.801) {
591 return ".." + targetAddress.rute;
592 } else if (eb.afstand < 1.201) {
593 return "..." + targetAddress.rute;
594 } else if (eb.afstand < 2.101) {
595 return "...." + targetAddress.rute;
596 }
597 break;
598 case "bil":
599 if (eb.afstand < 0.151) {
600 return "." + targetAddress.rute;
601 } else if (eb.afstand < 1.001) {
602 return ".." + targetAddress.rute;
603 } else if (eb.afstand < 1.601) {
604 return "..." + targetAddress.rute;
605 } else if (eb.afstand < 2.601) {
606 return "...." + targetAddress.rute;
607 }
608 break;
609 default:
610 System.out.println("Ukendt transport type: " + eb );
611 }
612 return null;
613 }
614
615 public List<Address> getNonCoveredAddresses() {
616 List<Address> result = new ArrayList<Address>(60000);
617 for (Address a : alleAdresser) {
618 if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
619 result.add(a);
620 }
621 }
622 Collections.sort(result );
623 return result;
624 }
625
626 public List<Address> get100PctAddresses() {
627 List<Address> result = new ArrayList<Address>(120000);
628 for (Address a : alleAdresser) {
629 if ( a.daekningsType == DaekningsType.DAEKNING_100PCT) {
630 result.add(a);
631 }
632 }
633 Collections.sort(result );
634 return result;
635 }
636
637 ///////////////////////////////////////////////////////////
638 private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
639 String inject;
640 if (eb.afstand <= 0.500) {
641 inject = ".";
642 } else {
643 inject = "..";
644 }
645 return AddressUtils.injectIntoBk(targetAddress.koreliste, inject);
646 }
647
648
649 public Set<Short> getPostnumre() {
650 return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
651 }
652
653 public Set<Entry<String,Integer>> getVejnavne(short postnr) {
654 Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr);
655
656 TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering
657
658 return newMap.entrySet();
659 }
660
661 public Set<String> getHusnumre(int gadeid) {
662
663 Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
664
665 Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
666 for(Map<String,Address> litraList : gade.values()) {
667 for (Address a: litraList.values()) {
668 set.add( a.husnr + a.husnrbogstav );
669 }
670 }
671
672 return set;
673 }
674
675 public Address getAdresse(int gadeid, String husnrStr) {
676 short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
677 String litra = husnrStr.replaceAll("\\d", "");
678
679 Map<Short,Map<String, Address>> gade = searchGadeidentAdresser.get(gadeid);
680 Map<String, Address> litraList = gade.get(husnr);
681 return litraList.get(litra);
682
683 }
684
685 }

  ViewVC Help
Powered by ViewVC 1.1.20