6 |
import java.util.Collections; |
import java.util.Collections; |
7 |
import java.util.Date; |
import java.util.Date; |
8 |
import java.util.HashMap; |
import java.util.HashMap; |
|
import java.util.HashSet; |
|
9 |
import java.util.List; |
import java.util.List; |
10 |
import java.util.Map; |
import java.util.Map; |
11 |
import java.util.Map.Entry; |
import java.util.Map.Entry; |
18 |
|
|
19 |
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
20 |
import dk.daoas.daoadresseservice.beans.Address; |
import dk.daoas.daoadresseservice.beans.Address; |
21 |
|
import dk.daoas.daoadresseservice.beans.Address.RoutingInfo; |
22 |
import dk.daoas.daoadresseservice.beans.AliasBean; |
import dk.daoas.daoadresseservice.beans.AliasBean; |
23 |
import dk.daoas.daoadresseservice.beans.DataStatisticsBean; |
import dk.daoas.daoadresseservice.beans.DataStatisticsBean; |
24 |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
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, List<Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra |
39 |
|
|
40 |
private List<Address> alleAdresser; |
private ArrayList<Address> ikkeDaekkedeAdresser = new ArrayList<Address>(60000); |
41 |
|
private ArrayList<Address> hundredePctAdresser = new ArrayList<Address>(120000); |
42 |
|
|
43 |
private Map<String,Integer> helperCache; |
private Map<String,Integer> helperCache; |
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(); |
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, List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
71 |
|
|
72 |
|
if (gade == null) { |
73 |
|
throw new Exception("GadeID ikke fundet"); |
74 |
|
} |
75 |
|
|
76 |
|
List<Address> litraList = gade.get(husnr); |
77 |
|
|
78 |
|
Address addr = null; |
79 |
|
for(Address a : litraList) { |
80 |
|
if (a.husnrbogstav.equals(litra) ) { |
81 |
|
addr = a; |
82 |
|
break; |
83 |
|
} |
84 |
|
} |
85 |
|
|
86 |
|
if (addr == null) { |
87 |
|
throw new Exception("Adresse ikke ikke fundet"); |
88 |
|
} |
89 |
|
|
90 |
|
return addr; |
91 |
|
} |
92 |
|
|
93 |
|
|
94 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
95 |
|
return search(postnrStr, adresse, false); |
96 |
|
} |
97 |
|
|
98 |
|
|
99 |
|
public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr) { |
100 |
|
|
101 |
postnrStr = postnrStr.trim(); |
postnrStr = postnrStr.trim(); |
102 |
adresse = adresse.trim(); |
adresse = adresse.trim(); |
152 |
|
|
153 |
/* |
/* |
154 |
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn |
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn |
155 |
* |
**/ |
|
* <strike>Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt</strike>*/ |
|
156 |
if (gadeident == null) { |
if (gadeident == null) { |
157 |
final int MAX_TRIES = 4; |
final int MAX_TRIES = 4; |
158 |
|
|
187 |
result.gadeident = gadeident; |
result.gadeident = gadeident; |
188 |
|
|
189 |
|
|
190 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident); |
191 |
if (gade == null) { //Denne søgning må ikke fejle |
if (gade == null) { //Denne søgning må ikke fejle |
192 |
result.status = Status.ERROR_INTERNAL; |
result.status = Status.ERROR_INTERNAL; |
193 |
return result; |
return result; |
194 |
} |
} |
195 |
|
|
196 |
|
|
197 |
|
|
198 |
//Kunne evt klares med Iterables.get fra Guava/Collections |
//Kunne evt klares med Iterables.get fra Guava/Collections |
199 |
Address firstAddress = gade.values().iterator().next(); |
Address firstAddress = gade.values().iterator().next().get(0); //Første husnr -> første litra |
200 |
result.vej = firstAddress.vejnavn; |
result.vej = firstAddress.vejnavn; |
201 |
|
|
202 |
String husnrSearch = "" + result.splitResult.husnr + result.splitResult.litra; |
short husnrSearch = Short.parseShort(result.splitResult.husnr ); |
203 |
Address addr = gade.get(husnrSearch); |
List<Address> litraList = gade.get(husnrSearch); |
204 |
|
|
205 |
|
|
206 |
if (addr == null) { |
if (litraList == null) { //Husnr ikke fundet |
207 |
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT; |
|
208 |
return result; |
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; |
result.address = addr; |
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 |
// Brug OpenStreetMap før vi prøver google |
288 |
// For google har en request limit, det har OSM ikke! |
// google har en hard request limit, men OSM har en fair usage policy! |
289 |
if ( gadeident == null && useExternal) { |
if ( gadeident == null && useExternal) { |
290 |
String vej = osmHelper.proposeStreetName(request, result); |
String vej = osmHelper.proposeStreetName(request, result); |
291 |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
320 |
|
|
321 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
322 |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
323 |
searchGadeidentAdresser = new HashMap<Integer, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Integer, Map<Short, List<Address>>>(); |
324 |
helperCache = new ConcurrentHashMap<String,Integer>(); |
helperCache = new ConcurrentHashMap<String,Integer>(); |
325 |
|
|
326 |
|
// ////////////////////// |
327 |
|
// Start stage1 |
328 |
|
|
329 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
330 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
331 |
|
|
332 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
List<Address> alleAdresser = db.getAllAdresses(); |
333 |
|
|
334 |
|
|
335 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/ |
336 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
337 |
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(); |
|
338 |
DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>(); |
|
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) { |
for (Address a : alleAdresser) { |
347 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
348 |
|
|
349 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); |
Short postnr = shortHelper.getInstance(a.postnr); |
350 |
|
|
351 |
|
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr); |
352 |
|
|
353 |
if (postnrVeje == null) { |
if (postnrVeje == null) { |
354 |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries |
355 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(postnr, postnrVeje); |
356 |
} |
} |
357 |
|
|
358 |
|
|
361 |
if (gadeident == null) { |
if (gadeident == null) { |
362 |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
363 |
|
|
364 |
gadeident = a.gadeid; |
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 |
|
|
|
Set<String> aliaser = findVejAliaser(a.vejnavn); |
|
|
for(String alias : aliaser) { |
|
|
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
|
|
vasketAlias = aliasHelper.getInstance(vasketAlias); |
|
|
|
|
|
postnrVeje.put(vasketAlias, gadeident); |
|
|
} |
|
371 |
} |
} |
372 |
|
|
373 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); |
|
374 |
|
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident); |
375 |
if (gade == null) { |
if (gade == null) { |
376 |
gade = new HashMap<String, Address>(); |
gade = new TreeMap<Short, List<Address> >(); |
377 |
searchGadeidentAdresser.put(gadeident, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
378 |
} |
} |
379 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
|
380 |
husnrSearch = husnrHelper.getInstance(husnrSearch); |
List<Address> litraList = gade.get(a.husnr); |
381 |
gade.put(husnrSearch, a); |
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(); |
long start2 = System.currentTimeMillis(); |
403 |
System.out.println("Build, stage1 elapsed: " + (start2-start1) ); |
System.out.println("Build, stage1 elapsed: " + (start2-start1) ); |
404 |
System.out.println("Build -- stage 2 alias tabel"); |
System.out.println("Build -- stage 2 alias tabel"); |
405 |
|
|
406 |
int vaskCount = 0; |
int vaskCount = 0; |
407 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = db.getAliasList(); |
408 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
409 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
410 |
|
|
432 |
} |
} |
433 |
System.out.println("Anvendte " + vaskCount + " aliaser fra databasen"); |
System.out.println("Anvendte " + vaskCount + " aliaser fra databasen"); |
434 |
|
|
435 |
|
aliasList.clear();//cleanup inden stage3 |
436 |
|
|
437 |
|
|
438 |
//////////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////////// |
439 |
long start3 = System.currentTimeMillis(); |
long start3 = System.currentTimeMillis(); |
443 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
444 |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
445 |
|
|
446 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = db.getExtendedAdresslist(); |
447 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
448 |
|
|
449 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
450 |
if (orgAddress == null) |
if (orgAddress == null) { |
451 |
continue; |
continue; |
452 |
|
} |
453 |
|
|
454 |
if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
/*if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
455 |
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
456 |
continue; |
continue; |
457 |
} |
}*/ |
458 |
|
|
459 |
Address targetAddress = idAddressMap.get(eb.targetId); |
Address targetAddress = idAddressMap.get(eb.targetId); |
460 |
if (targetAddress == null) { |
if (targetAddress == null) { |
472 |
continue; |
continue; |
473 |
} |
} |
474 |
|
|
|
orgAddress.extTarget = targetAddress; |
|
|
orgAddress.extAfstand = eb.afstand; |
|
475 |
|
|
476 |
boolean covered = false; |
|
477 |
|
short modifyCounter = 0; |
478 |
|
|
479 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
480 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); |
481 |
orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); |
482 |
|
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); |
483 |
if (orgAddress.rute != null) { |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); |
484 |
orgAddress.koreliste = targetAddress.koreliste; |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); |
485 |
covered = true; |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); |
486 |
} |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); |
487 |
} |
} |
488 |
|
|
489 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
490 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); |
491 |
orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); |
492 |
|
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); |
493 |
if (orgAddress.koreliste != null) { |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); |
494 |
orgAddress.rute = targetAddress.rute; |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); |
495 |
covered = true; |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); |
496 |
} |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); |
497 |
} |
} |
498 |
|
|
499 |
if (covered) { //Kopier resten af felterne |
|
500 |
|
if (modifyCounter > 0) { |
501 |
|
orgAddress.extTarget = targetAddress; |
502 |
|
orgAddress.extAfstand = eb.afstand; |
503 |
|
} |
504 |
|
|
505 |
|
if (modifyCounter>0 && orgAddress.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { //Kopier resten af felterne |
506 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
507 |
orgAddress.dbkBane = targetAddress.dbkBane; |
orgAddress.dbkBane = targetAddress.dbkBane; |
508 |
|
|
516 |
} |
} |
517 |
} |
} |
518 |
|
|
519 |
// nu skal vi ikke bruge idAddressMap længere |
// cleanup inden stage 4 |
520 |
idAddressMap = null; |
idAddressMap = null; |
521 |
|
ruteHelper = null; |
522 |
|
korelisteHelper = null; |
523 |
|
|
524 |
////////////////////////////////////////////////////////////////////////////////////// |
////////////////////////////////////////////////////////////////////////////////////// |
525 |
long start4 = System.currentTimeMillis(); |
long start4 = System.currentTimeMillis(); |
526 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
527 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
528 |
|
|
529 |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
530 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
531 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
|
|
continue; |
|
|
} |
|
532 |
|
|
533 |
if (addr.distributor != null && addr.distributor.equals("LUKKET")) { |
if (addr.distributor != null && addr.distributor.equals("LUKKET")) { |
534 |
continue; |
continue; |
535 |
} |
} |
536 |
|
|
537 |
|
|
538 |
HundredePctBean bean = hundredePct.get(addr.postnr); |
HundredePctBean bean = hundredePct.get(addr.postnr); |
540 |
continue; |
continue; |
541 |
} |
} |
542 |
|
|
543 |
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
short modifyCounter = 0; |
544 |
addr.rute = bean.rute; |
modifyCounter += updateRouting100Pct(bean, addr.routingMandag); |
545 |
addr.koreliste = bean.koreliste; |
modifyCounter += updateRouting100Pct(bean, addr.routingTirsdag); |
546 |
addr.dbkBane = bean.dbkBane; |
modifyCounter += updateRouting100Pct(bean, addr.routingOnsdag); |
547 |
addr.distributor = bean.distributor; |
modifyCounter += updateRouting100Pct(bean, addr.routingTorsdag); |
548 |
|
modifyCounter += updateRouting100Pct(bean, addr.routingFredag); |
549 |
|
modifyCounter += updateRouting100Pct(bean, addr.routingLordag); |
550 |
|
modifyCounter += updateRouting100Pct(bean, addr.routingSondag); |
551 |
|
|
552 |
|
|
553 |
|
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) { |
554 |
|
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
555 |
|
addr.dbkBane = bean.dbkBane; |
556 |
|
addr.distributor = bean.distributor; |
557 |
|
} |
558 |
|
|
559 |
|
|
560 |
|
|
561 |
} |
} |
562 |
|
|
563 |
//////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////// |
564 |
long stop = System.currentTimeMillis(); |
long stop = System.currentTimeMillis(); |
565 |
System.out.println("Build, stage3 elapsed: " + (stop-start4) ); |
System.out.println("Build, stage4 elapsed: " + (stop-start4) ); |
566 |
System.out.println("Build -- Gathering statistics"); |
System.out.println("Build -- Gathering statistics"); |
567 |
|
|
568 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
574 |
stats.extendedCount++; |
stats.extendedCount++; |
575 |
break; |
break; |
576 |
case DAEKNING_100PCT: |
case DAEKNING_100PCT: |
577 |
|
hundredePctAdresser.add(addr); |
578 |
stats.hundredePctCount++; |
stats.hundredePctCount++; |
579 |
break; |
break; |
580 |
default: |
default: |
581 |
|
ikkeDaekkedeAdresser.add(addr); |
582 |
stats.ikkeDaekketCount++; |
stats.ikkeDaekketCount++; |
583 |
} |
} |
584 |
} |
} |
585 |
stats.totalCount = alleAdresser.size(); |
stats.totalCount = alleAdresser.size(); |
586 |
|
|
587 |
|
ikkeDaekkedeAdresser.trimToSize(); |
588 |
|
hundredePctAdresser.trimToSize(); |
589 |
|
Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet |
590 |
|
Collections.sort( hundredePctAdresser ); |
591 |
|
|
592 |
|
|
593 |
stats.elapsed = stop-start1; |
stats.elapsed = stop-start1; |
594 |
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ); |
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ); |
603 |
System.out.println("Build Completed"); |
System.out.println("Build Completed"); |
604 |
|
|
605 |
} |
} |
606 |
|
|
607 |
|
|
608 |
|
public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
609 |
|
if (source.rute != null) { |
610 |
|
return 0; |
611 |
|
} |
612 |
|
|
613 |
|
source.rute = calculateExtendedBkRoute(bean, target); |
614 |
|
source.rute = ruteHelper.getInstance(source.rute); |
615 |
|
|
616 |
|
if (source.rute != null) { |
617 |
|
source.koreliste = target.koreliste; |
618 |
|
return 1; |
619 |
|
} else { |
620 |
|
return 0; |
621 |
|
} |
622 |
|
} |
623 |
|
|
624 |
|
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
625 |
|
if (source.rute != null) { |
626 |
|
return 0; |
627 |
|
} |
628 |
|
|
629 |
|
source.rute = calculateExtendedDaoRoute(bean, target); |
630 |
|
source.rute = ruteHelper.getInstance(source.rute); |
631 |
|
|
632 |
|
if (source.rute != null) { |
633 |
|
source.koreliste = target.koreliste; |
634 |
|
return 1; |
635 |
|
} else { |
636 |
|
return 0; |
637 |
|
} |
638 |
|
|
639 |
|
} |
640 |
|
|
641 |
|
public short updateRouting100Pct(HundredePctBean bean, RoutingInfo routing) { |
642 |
|
if (routing.rute == null) { |
643 |
|
routing.rute = bean.rute; |
644 |
|
routing.koreliste = bean.koreliste; |
645 |
|
return 1; |
646 |
|
} else { |
647 |
|
return 0; |
648 |
|
} |
649 |
|
} |
650 |
|
|
651 |
public DataStatisticsBean getStatistics() { |
public DataStatisticsBean getStatistics() { |
652 |
return stats; |
return stats; |
653 |
} |
} |
654 |
|
|
655 |
|
public DatabaseLayer getDatabaseLayer() { |
656 |
|
return db; |
657 |
|
} |
658 |
|
|
659 |
public void clear() { |
public void clear() { |
660 |
searchPostnrVejnavnGadeid.clear(); |
searchPostnrVejnavnGadeid.clear(); |
661 |
searchGadeidentAdresser.clear(); |
searchGadeidentAdresser.clear(); |
|
alleAdresser.clear(); |
|
662 |
helperCache.clear(); |
helperCache.clear(); |
663 |
} |
} |
664 |
|
|
665 |
|
|
666 |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
private String calculateExtendedDaoRoute(ExtendedBean eb, RoutingInfo targetRoute) { |
667 |
if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
668 |
return null; |
return null; |
669 |
} |
} |
670 |
|
|
672 |
switch( eb.transport) { |
switch( eb.transport) { |
673 |
case "cykel": |
case "cykel": |
674 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
675 |
return "." + targetAddress.rute; |
return "." + targetRoute.rute; |
676 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 0.501) { |
677 |
return ".." + targetAddress.rute; |
return ".." + targetRoute.rute; |
678 |
} else if (eb.afstand < 0.701) { |
} else if (eb.afstand < 0.701) { |
679 |
return "..." + targetAddress.rute; |
return "..." + targetRoute.rute; |
680 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 1.001) { |
681 |
return "...." + targetAddress.rute; |
return "...." + targetRoute.rute; |
682 |
} |
} |
683 |
break; |
break; |
684 |
case "scooter": |
case "scooter": |
685 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
686 |
return "." + targetAddress.rute; |
return "." + targetRoute.rute; |
687 |
} else if (eb.afstand < 0.801) { |
} else if (eb.afstand < 0.801) { |
688 |
return ".." + targetAddress.rute; |
return ".." + targetRoute.rute; |
689 |
} else if (eb.afstand < 1.201) { |
} else if (eb.afstand < 1.201) { |
690 |
return "..." + targetAddress.rute; |
return "..." + targetRoute.rute; |
691 |
} else if (eb.afstand < 2.101) { |
} else if (eb.afstand < 2.101) { |
692 |
return "...." + targetAddress.rute; |
return "...." + targetRoute.rute; |
693 |
} |
} |
694 |
break; |
break; |
695 |
case "bil": |
case "bil": |
696 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
697 |
return "." + targetAddress.rute; |
return "." + targetRoute.rute; |
698 |
} else if (eb.afstand < 1.001) { |
} else if (eb.afstand < 1.001) { |
699 |
return ".." + targetAddress.rute; |
return ".." + targetRoute.rute; |
700 |
} else if (eb.afstand < 1.601) { |
} else if (eb.afstand < 1.601) { |
701 |
return "..." + targetAddress.rute; |
return "..." + targetRoute.rute; |
702 |
} else if (eb.afstand < 2.601) { |
} else if (eb.afstand < 2.601) { |
703 |
return "...." + targetAddress.rute; |
return "...." + targetRoute.rute; |
704 |
} |
} |
705 |
break; |
break; |
706 |
|
default: |
707 |
|
System.out.println("Ukendt transport type: " + eb ); |
708 |
} |
} |
709 |
return null; |
return null; |
710 |
} |
} |
711 |
|
|
712 |
public List<Address> getNonCoveredAddresses() { |
public List<Address> getNonCoveredAddresses() { |
713 |
List<Address> result = new ArrayList<Address>(60000); |
return ikkeDaekkedeAdresser; |
714 |
for (Address a : alleAdresser) { |
} |
715 |
if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
|
716 |
result.add(a); |
public List<Address> get100PctAddresses() { |
717 |
} |
return hundredePctAdresser; |
|
} |
|
|
Collections.sort(result ); |
|
|
return result; |
|
718 |
} |
} |
719 |
|
|
720 |
/////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////// |
721 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
|
722 |
|
|
723 |
|
private String calculateExtendedBkRoute(ExtendedBean eb, RoutingInfo targetRoute) { |
724 |
|
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
725 |
|
return null; |
726 |
|
} |
727 |
|
|
728 |
String inject; |
String inject; |
729 |
if (eb.afstand <= 0.500) { |
if (eb.afstand <= 0.500) { |
730 |
inject = "."; |
inject = "."; |
731 |
} else { |
} else { |
732 |
inject = ".."; |
inject = ".."; |
733 |
} |
} |
734 |
return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); |
return inject + targetRoute.rute; |
735 |
} |
} |
736 |
|
|
|
private Set<String> findVejAliaser(String vejnavn) { |
|
|
vejnavn = vejnavn.toLowerCase(); |
|
|
HashSet<String> aliasSet = new HashSet<String>(); |
|
|
aliasSet.add(vejnavn); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("alle", "allé") ); |
|
|
aliasSet.add(vejnavn.replace("allé", "alle") ); |
|
|
|
|
|
|
|
|
// forkortelser |
|
|
aliasSet.add(vejnavn.replace("dronningens", "dr") ); |
|
|
aliasSet.add(vejnavn.replace("dr.", "dronningens") ); |
|
|
aliasSet.add(vejnavn.replace("dr ", "dronningens") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("dronning", "dr") ); |
|
|
aliasSet.add(vejnavn.replace("dr.", "dronning") ); |
|
|
aliasSet.add(vejnavn.replace("dr ", "dronning") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("kng", "kongen") ); |
|
|
aliasSet.add(vejnavn.replace("kongen", "kng") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("kvt", "kvarter") ); |
|
|
aliasSet.add(vejnavn.replace("kvarter", "kvt") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
|
|
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("lille", "ll") ); |
|
|
aliasSet.add(vejnavn.replace("ll ", "lille") ); |
|
|
aliasSet.add(vejnavn.replace("ll.", "lille") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("store", "st") ); |
|
|
aliasSet.add(vejnavn.replace("st ", "store") ); |
|
|
aliasSet.add(vejnavn.replace("st.", "store") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("søndre", "sdr") ); |
|
|
aliasSet.add(vejnavn.replace("sdr", "søndre") ); |
|
|
aliasSet.add(vejnavn.replace("sønder", "sdr") ); |
|
|
aliasSet.add(vejnavn.replace("sdr", "sønder") ); |
|
|
|
|
|
|
|
|
aliasSet.add(vejnavn.replace("nørre", "nr") ); |
|
|
aliasSet.add(vejnavn.replace("nr", "nørre") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("nordre", "ndr") ); |
|
|
aliasSet.add(vejnavn.replace("ndr", "nordre") ); |
|
|
|
|
|
|
|
|
aliasSet.add(vejnavn.replace("vestre", "vester") ); |
|
|
aliasSet.add(vejnavn.replace("vester", "vestre") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("søndre", "sønder") ); |
|
|
aliasSet.add(vejnavn.replace("sønder", "søndre") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("østre", "øster") ); |
|
|
aliasSet.add(vejnavn.replace("øster", "østre") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("borgmester", "borgm") ); |
|
|
aliasSet.add(vejnavn.replace("borgm", "borgmester") ); |
|
|
|
|
|
|
|
|
aliasSet.add(vejnavn.replace("sankt", "skt") ); |
|
|
aliasSet.add(vejnavn.replace("sankt", "sct") ); |
|
|
aliasSet.add(vejnavn.replace("skt", "sankt") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("skt", "sct") ); |
|
|
aliasSet.add(vejnavn.replace("sct", "skt") ); |
|
|
|
|
|
|
|
|
|
|
|
// fornavn forkortelser |
|
|
aliasSet.add(vejnavn.replace("john", "j") ); |
|
|
aliasSet.add(vejnavn.replace("thomas", "th") ); |
|
|
aliasSet.add(vejnavn.replace("thorvald", "th") ); |
|
|
aliasSet.add(vejnavn.replace("frederik", "fr") ); |
|
|
aliasSet.add(vejnavn.replace("frederiks", "fr") ); |
|
|
|
|
|
|
|
|
aliasSet.add(vejnavn.replace("christian", "chr") ); |
|
|
aliasSet.add(vejnavn.replace("christians", "chr") ); |
|
|
aliasSet.add(vejnavn.replace("kristian", "kr") ); |
|
|
aliasSet.add(vejnavn.replace("kristians", "kr") ); |
|
|
|
|
|
|
|
|
// alternative stavninger |
|
|
aliasSet.add(vejnavn.replace("peder", "peter") ); |
|
|
aliasSet.add(vejnavn.replace("peter", "peder") ); |
|
|
|
|
|
|
|
|
|
|
|
// Romertal |
|
|
aliasSet.add(vejnavn.replace("1", "i") ); |
|
|
aliasSet.add(vejnavn.replace("i", "1") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("2", "ii") ); |
|
|
aliasSet.add(vejnavn.replace("ii", "2") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("3", "iii") ); |
|
|
aliasSet.add(vejnavn.replace("iii", "3") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("4", "iv") ); |
|
|
aliasSet.add(vejnavn.replace("iv", "4") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("5", "v") ); |
|
|
aliasSet.add(vejnavn.replace("v", "5") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("6", "vi") ); |
|
|
aliasSet.add(vejnavn.replace("vi", "6") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("7", "vii") ); |
|
|
aliasSet.add(vejnavn.replace("vii", "7") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("8", "viii") ); |
|
|
aliasSet.add(vejnavn.replace("viii", "8") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("9", "ix") ); |
|
|
aliasSet.add(vejnavn.replace("ix", "9") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("10", "x") ); |
|
|
aliasSet.add(vejnavn.replace("x", "10") ); |
|
|
|
|
|
|
|
|
//alternative måder at stave vej/gade/alle |
|
|
aliasSet.add(vejnavn.replace("vej", "ve") ); |
|
|
aliasSet.add(vejnavn.replace("vej", "vj") ); |
|
|
aliasSet.add(vejnavn.replace("vej", "v") ); |
|
|
aliasSet.add(vejnavn.replace("vej", "vejen") ); |
|
|
aliasSet.add(vejnavn.replace("vejen", "vej") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("v", "vej") );//Vi kan have vejnavne i DB der bare slutter på v istedet for vej |
|
|
|
|
|
aliasSet.add(vejnavn.replace("alle", "all") ); |
|
|
aliasSet.add(vejnavn.replace("allé", "all") ); |
|
|
aliasSet.add(vejnavn.replace("alle", "allú") ); //Fundet i logs.hentruteinfo |
|
|
aliasSet.add(vejnavn.replace("allé", "allú") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("gade", "gaed") ); //Fundet i logs.hentruteinfo |
|
|
aliasSet.add(vejnavn.replace("gade", "gde") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("plads", "pl") ); |
|
|
aliasSet.add(vejnavn.replace("vænget", "vænge") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("boulevard", "blvd") ); |
|
|
aliasSet.add(vejnavn.replace("blvd", "boulevard") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("boulevard", "boule") ); |
|
|
aliasSet.add(vejnavn.replace("boule", "boulevard") ); |
|
|
|
|
|
// Opbyg æøå varianter over alle fundne aliaser |
|
|
|
|
|
@SuppressWarnings("unchecked") |
|
|
HashSet<String> variants = (HashSet<String>) aliasSet.clone(); |
|
|
|
|
|
for (String vVejnavn : variants) { |
|
|
// danske tegn 1 |
|
|
aliasSet.add( vVejnavn.replace("æ", "ae") ); |
|
|
aliasSet.add( vVejnavn.replace("ø", "oe") ); |
|
|
aliasSet.add( vVejnavn.replace("å", "aa") ); |
|
|
aliasSet.add( vVejnavn.replace("ae", "æ") ); |
|
|
aliasSet.add( vVejnavn.replace("oe", "ø") ); |
|
|
aliasSet.add( vVejnavn.replace("aa", "å") ); |
|
|
|
|
|
//danske tegn 2 |
|
|
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); |
|
|
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") ); |
|
|
aliasSet.add( vVejnavn.replace("ø", "oe").replace("å", "aa") ); |
|
|
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") ); |
|
|
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") ); |
|
|
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
|
|
|
|
|
//danske tegn 3 |
|
|
aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") ); |
|
|
aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); |
|
|
|
|
|
|
|
|
//udenlandsketegn |
|
|
aliasSet.add(vejnavn.replace("u", "ü") ); |
|
|
aliasSet.add(vejnavn.replace("ü", "u") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("ä", "æ") ); |
|
|
aliasSet.add(vejnavn.replace("æ", "ä") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("ö", "ø") ); |
|
|
aliasSet.add(vejnavn.replace("ø", "ö") ); |
|
|
} |
|
|
|
|
|
return aliasSet; |
|
|
} |
|
737 |
|
|
738 |
public Set<Short> getPostnumre() { |
public Set<Short> getPostnumre() { |
739 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
741 |
|
|
742 |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
743 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
744 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
|
745 |
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()); |
|
|
} |
|
746 |
|
|
747 |
return newMap.entrySet(); |
return newMap.entrySet(); |
748 |
} |
} |
749 |
|
|
750 |
public Set<String> getHusnumre(int gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
751 |
|
|
752 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
753 |
|
|
754 |
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
755 |
set.addAll( gade.keySet() ); |
for(List<Address> litraList : gade.values()) { |
756 |
|
for (Address a: litraList) { |
757 |
|
set.add( a.husnr + a.husnrbogstav ); |
758 |
|
} |
759 |
|
} |
760 |
|
|
761 |
return set; |
return set; |
762 |
} |
} |
763 |
|
|
764 |
public Address getAdresse(int gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnrStr) { |
765 |
|
short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") ); |
766 |
|
String litra = husnrStr.replaceAll("\\d", ""); |
767 |
|
|
768 |
|
Map<Short,List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
769 |
|
List<Address> litraList = gade.get(husnr); |
770 |
|
|
771 |
|
for(Address addr : litraList) { |
772 |
|
if (addr.husnrbogstav.equals(litra)) { |
773 |
|
return addr; |
774 |
|
} |
775 |
|
} |
776 |
|
|
777 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
return null; |
|
return gade.get(husnr); |
|
778 |
|
|
779 |
} |
} |
780 |
|
|