1 |
package dk.daoas.daoadresseservice; |
package dk.daoas.daoadresseservice; |
2 |
|
|
3 |
import java.sql.SQLException; |
import java.sql.SQLException; |
4 |
|
import java.util.ArrayList; |
5 |
|
import java.util.Collections; |
6 |
import java.util.HashMap; |
import java.util.HashMap; |
7 |
|
import java.util.HashSet; |
8 |
import java.util.List; |
import java.util.List; |
9 |
import java.util.Map; |
import java.util.Map; |
10 |
|
import java.util.Set; |
11 |
import java.util.concurrent.ConcurrentHashMap; |
import java.util.concurrent.ConcurrentHashMap; |
12 |
|
|
13 |
import dk.daoas.daoadresseservice.AddressUtils.SplitResult; |
import dk.daoas.daoadresseservice.AddressUtils.SplitResult; |
14 |
import dk.daoas.daoadresseservice.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.Address; |
15 |
|
import dk.daoas.daoadresseservice.beans.DataStatisticsBean; |
16 |
|
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
17 |
|
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
18 |
|
import dk.daoas.daoadresseservice.beans.SearchResult; |
19 |
|
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
20 |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
21 |
|
|
22 |
public class AdressSearch { |
public class AdressSearch { |
23 |
|
|
24 |
Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid; |
private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid; |
25 |
Map<Long, Map<String,Address>> searchGadeidentAdresser; |
private Map<Long, Map<String,Address>> searchGadeidentAdresser; |
26 |
|
|
27 |
List<Address> alleAdresser; |
private List<Address> alleAdresser; |
28 |
|
|
29 |
/* Mapper mellem db Row ID og adresse noden */ |
private Map<String,Long> helperCache; |
|
Map<Integer,Address> idAddressMap; |
|
30 |
|
|
31 |
|
private DataStatisticsBean stats = new DataStatisticsBean(); |
|
Map<Integer,HundredePctBean> hundredePct; |
|
32 |
|
|
33 |
|
|
34 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
35 |
|
|
36 |
int postnr=0; |
int postnr=0; |
37 |
|
boolean google = false; |
38 |
|
boolean osm = false; |
39 |
|
String helperSearchKey = ""; |
40 |
|
|
41 |
try { |
try { |
42 |
postnr = Integer.parseInt(postnrStr); |
postnr = Integer.parseInt(postnrStr); |
50 |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
51 |
} |
} |
52 |
|
|
53 |
|
|
54 |
SplitResult split = AddressUtils.splitAdresse(adresse); |
SplitResult split = AddressUtils.splitAdresse(adresse); |
55 |
String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); |
String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); |
56 |
|
|
57 |
if (split.husnr.length() == 0) { |
if (split.husnr.length() == 0) { |
58 |
return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); |
return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); |
59 |
} |
} |
60 |
|
|
61 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
Long gadeident = postnrVeje.get(vasketVejnavn); |
62 |
|
|
63 |
|
|
64 |
|
if ( gadeident == null) { |
65 |
|
helperSearchKey = "" + postnr + "/" + vasketVejnavn; |
66 |
|
gadeident = helperCache.get(helperSearchKey); |
67 |
|
} |
68 |
|
|
69 |
|
|
70 |
|
if ( gadeident == null) { |
71 |
|
String googleVej = GeocodeHelper.googleHelper(postnr, split.vej ); |
72 |
|
google = true; |
73 |
|
|
74 |
|
if (googleVej != null) { |
75 |
|
String googleVasket = AddressUtils.vaskVejnavn( googleVej ); |
76 |
|
gadeident = postnrVeje.get(googleVasket); |
77 |
|
|
78 |
|
if (gadeident != null) { |
79 |
|
helperCache.put(helperSearchKey, gadeident); |
80 |
|
} |
81 |
|
} |
82 |
|
} |
83 |
|
|
84 |
|
if ( gadeident == null) { |
85 |
|
String osmVej = GeocodeHelper.openstreetmapHelper(postnr, split.vej ); |
86 |
|
osm = true; |
87 |
|
|
88 |
|
if (osmVej != null) { |
89 |
|
String osmVasket = AddressUtils.vaskVejnavn( osmVej ); |
90 |
|
gadeident = postnrVeje.get(osmVasket); |
91 |
|
|
92 |
|
if (gadeident != null) { |
93 |
|
helperCache.put(helperSearchKey, gadeident); |
94 |
|
} |
95 |
|
} |
96 |
|
} |
97 |
|
|
98 |
if (gadeident == null) { |
if (gadeident == null) { |
99 |
return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); |
return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); |
100 |
} |
} |
101 |
|
|
102 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle |
103 |
|
|
104 |
|
|
105 |
String husnrSearch = "" + split.husnr + split.litra; |
String husnrSearch = "" + split.husnr + split.litra; |
106 |
Address addr = gade.get(husnrSearch); |
Address addr = gade.get(husnrSearch); |
107 |
|
|
108 |
if (addr == null) { |
if (addr == null) { |
109 |
return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); |
return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); |
110 |
} |
} |
115 |
|
|
116 |
if (addr.distributor.equals("LUKKET")) { |
if (addr.distributor.equals("LUKKET")) { |
117 |
return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? |
return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? |
118 |
} |
} |
|
|
|
119 |
|
|
120 |
return new SearchResult(addr); |
SearchResult res = new SearchResult(addr); |
121 |
|
res.google = google; |
122 |
|
res.osm = osm; |
123 |
|
return res; |
124 |
} |
} |
125 |
|
|
126 |
|
|
127 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
128 |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
129 |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
130 |
idAddressMap = new HashMap<Integer,Address>(); |
helperCache = new ConcurrentHashMap<String,Long>(); |
131 |
|
|
132 |
|
long start1 = System.currentTimeMillis(); |
133 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
134 |
|
|
135 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
alleAdresser = DatabaseLayer.getAllAdresses(); |
136 |
|
|
137 |
|
|
138 |
|
/* Mapper mellem db Row ID og adresse noden */ |
139 |
|
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
140 |
|
|
141 |
for (Address a : alleAdresser) { |
for (Address a : alleAdresser) { |
142 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
143 |
|
|
148 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
149 |
} |
} |
150 |
|
|
151 |
Long gadeident = postnrVeje.get(a.vasketVejnavn); |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
152 |
|
Long gadeident = postnrVeje.get(vasketVejnavn); |
153 |
if (gadeident == null) { |
if (gadeident == null) { |
154 |
postnrVeje.put(a.vasketVejnavn, a.gadeid); |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
155 |
|
|
156 |
|
Set<String> aliaser = findVejAliaser(a.vejnavn); |
157 |
|
for(String alias : aliaser) { |
158 |
|
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
159 |
|
postnrVeje.put(vasketAlias, a.gadeid); |
160 |
|
} |
161 |
|
|
162 |
} |
} |
163 |
|
|
164 |
Map<String, Address> gade = searchGadeidentAdresser.get(a.gadeid); |
Map<String, Address> gade = searchGadeidentAdresser.get(a.gadeid); |
167 |
searchGadeidentAdresser.put(a.gadeid, gade); |
searchGadeidentAdresser.put(a.gadeid, gade); |
168 |
} |
} |
169 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
170 |
gade.put(husnrSearch, a); |
gade.put(husnrSearch, a); |
171 |
} |
} |
172 |
|
|
173 |
|
|
174 |
//////////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////////// |
175 |
|
long start2 = System.currentTimeMillis(); |
176 |
|
System.out.println("Build, stage1 elapsed: " + (start2-start1) ); |
177 |
System.out.println("Build -- stage 2 udvidet dækning"); |
System.out.println("Build -- stage 2 udvidet dækning"); |
178 |
|
|
179 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
198 |
orgAddress.extTarget = targetAddress; |
orgAddress.extTarget = targetAddress; |
199 |
orgAddress.extAfstand = eb.afstand; |
orgAddress.extAfstand = eb.afstand; |
200 |
|
|
201 |
orgAddress.rute = calculateExtendedRoute(eb,orgAddress,targetAddress); |
boolean covered = false; |
202 |
|
if (targetAddress.distributor.equals("DAO")) { |
203 |
|
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
204 |
|
if (orgAddress.rute != null) { |
205 |
|
orgAddress.koreliste = targetAddress.koreliste; |
206 |
|
covered = true; |
207 |
|
} |
208 |
|
} |
209 |
|
|
210 |
|
if (targetAddress.distributor.equals("BK")) { |
211 |
|
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
212 |
|
if (orgAddress.koreliste != null) { |
213 |
|
orgAddress.rute = targetAddress.rute; |
214 |
|
covered = true; |
215 |
|
} |
216 |
|
} |
217 |
|
|
218 |
if (orgAddress.rute != null) { |
if (covered) { //Kopier resten af felterne |
219 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
|
orgAddress.koreliste = targetAddress.koreliste; |
|
220 |
orgAddress.dbkBane = targetAddress.dbkBane; |
orgAddress.dbkBane = targetAddress.dbkBane; |
221 |
|
|
222 |
/* Sådan gør den gamle service */ |
/* Sådan gør den gamle service */ |
225 |
|
|
226 |
orgAddress.distributor = targetAddress.distributor; |
orgAddress.distributor = targetAddress.distributor; |
227 |
} |
} |
|
|
|
|
|
|
228 |
} |
} |
229 |
|
|
230 |
|
// nu skal vi ikke bruge idAddressMap længere |
231 |
|
idAddressMap = null; |
232 |
|
|
233 |
////////////////////////////////////////////////////////////////////////////////////// |
////////////////////////////////////////////////////////////////////////////////////// |
234 |
|
long start3 = System.currentTimeMillis(); |
235 |
|
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
236 |
System.out.println("Build -- stage 3 - 100pct"); |
System.out.println("Build -- stage 3 - 100pct"); |
237 |
|
|
238 |
hundredePct = DatabaseLayer.get100PctList(); |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
239 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
240 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
241 |
continue; |
continue; |
242 |
} |
} |
243 |
|
|
258 |
addr.distributor = bean.distributor; |
addr.distributor = bean.distributor; |
259 |
} |
} |
260 |
|
|
261 |
|
//////////////////////////////////////////////////////////////////////////////////// |
262 |
|
long stop = System.currentTimeMillis(); |
263 |
|
System.out.println("Build, stage3 elapsed: " + (stop-start3) ); |
264 |
|
System.out.println("Build -- Gathering statistics"); |
265 |
|
|
266 |
|
for (Address addr : alleAdresser) { |
267 |
|
switch (addr.daekningsType) { |
268 |
|
case DAEKNING_DIREKTE: |
269 |
|
stats.direkteCount++; |
270 |
|
break; |
271 |
|
case DAEKNING_UDVIDET: |
272 |
|
stats.extendedCount++; |
273 |
|
break; |
274 |
|
case DAEKNING_100PCT: |
275 |
|
stats.hundredePctCount++; |
276 |
|
break; |
277 |
|
default: |
278 |
|
stats.ikkeDaekketCount++; |
279 |
|
} |
280 |
|
} |
281 |
|
|
282 |
|
System.out.println("Build: direkteCount: " + stats.direkteCount); |
283 |
|
System.out.println("Build: extendedCount: " + stats.extendedCount); |
284 |
|
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
285 |
|
System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount); |
286 |
|
|
287 |
|
System.out.println("Build: Total Elapsed: " + (stop-start1) ); |
288 |
|
System.out.println("Build Completed"); |
289 |
|
|
290 |
} |
} |
291 |
|
|
292 |
|
public DataStatisticsBean getStatistics() { |
293 |
|
return stats; |
294 |
|
} |
295 |
|
|
296 |
private String calculateExtendedRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
public void clear() { |
297 |
switch (targetAddress.distributor) { |
searchPostnrVejnavnGadeid.clear(); |
298 |
case "DAO": |
searchGadeidentAdresser.clear(); |
299 |
// /////////////////////////////////////////////////////////////////// |
alleAdresser.clear(); |
300 |
switch( eb.transport) { |
helperCache.clear(); |
301 |
case "cykel": |
} |
302 |
if (eb.afstand < 0.151) { |
|
303 |
return "." + targetAddress.rute; |
|
304 |
} else if (eb.afstand < 0.501) { |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
305 |
return ".." + targetAddress.rute; |
|
306 |
} else if (eb.afstand < 0.701) { |
// /////////////////////////////////////////////////////////////////// |
307 |
return "..." + targetAddress.rute; |
switch( eb.transport) { |
308 |
} else if (eb.afstand < 0.501) { |
case "cykel": |
309 |
return "...." + targetAddress.rute; |
if (eb.afstand < 0.151) { |
310 |
} |
return "." + targetAddress.rute; |
311 |
break; |
} else if (eb.afstand < 0.501) { |
312 |
case "scooter": |
return ".." + targetAddress.rute; |
313 |
if (eb.afstand < 0.151) { |
} else if (eb.afstand < 0.701) { |
314 |
return "." + targetAddress.rute; |
return "..." + targetAddress.rute; |
315 |
} else if (eb.afstand < 0.801) { |
} else if (eb.afstand < 0.501) { |
316 |
return ".." + targetAddress.rute; |
return "...." + targetAddress.rute; |
317 |
} else if (eb.afstand < 1.201) { |
} |
318 |
return "..." + targetAddress.rute; |
break; |
319 |
} else if (eb.afstand < 2.101) { |
case "scooter": |
320 |
return "...." + targetAddress.rute; |
if (eb.afstand < 0.151) { |
321 |
} |
return "." + targetAddress.rute; |
322 |
break; |
} else if (eb.afstand < 0.801) { |
323 |
case "bil": |
return ".." + targetAddress.rute; |
324 |
if (eb.afstand < 0.151) { |
} else if (eb.afstand < 1.201) { |
325 |
return "." + targetAddress.rute; |
return "..." + targetAddress.rute; |
326 |
} else if (eb.afstand < 1.001) { |
} else if (eb.afstand < 2.101) { |
327 |
return ".." + targetAddress.rute; |
return "...." + targetAddress.rute; |
328 |
} else if (eb.afstand < 1.601) { |
} |
329 |
return "..." + targetAddress.rute; |
break; |
330 |
} else if (eb.afstand < 2.601) { |
case "bil": |
331 |
return "...." + targetAddress.rute; |
if (eb.afstand < 0.151) { |
332 |
} |
return "." + targetAddress.rute; |
333 |
break; |
} else if (eb.afstand < 1.001) { |
334 |
|
return ".." + targetAddress.rute; |
335 |
|
} else if (eb.afstand < 1.601) { |
336 |
|
return "..." + targetAddress.rute; |
337 |
|
} else if (eb.afstand < 2.601) { |
338 |
|
return "...." + targetAddress.rute; |
339 |
} |
} |
340 |
break; |
break; |
341 |
|
} |
342 |
/////////////////////////////////////////////////////////// |
return null; |
343 |
|
} |
344 |
case "BK": |
|
345 |
String inject; |
public List<Address> getNonCoveredAddresses() { |
346 |
if (eb.afstand <= 0.500) { |
List<Address> result = new ArrayList<Address>(60000); |
347 |
inject = "."; |
for (Address a : alleAdresser) { |
348 |
} else { |
if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
349 |
inject = ".."; |
result.add(a); |
350 |
} |
} |
|
return AddressUtils.injectIntoBk(targetAddress.rute, inject); |
|
351 |
} |
} |
352 |
return null; |
Collections.sort(result ); |
353 |
} |
return result; |
354 |
|
} |
355 |
|
|
356 |
|
/////////////////////////////////////////////////////////// |
357 |
|
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
358 |
|
String inject; |
359 |
|
if (eb.afstand <= 0.500) { |
360 |
|
inject = "."; |
361 |
|
} else { |
362 |
|
inject = ".."; |
363 |
|
} |
364 |
|
return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); |
365 |
|
} |
366 |
|
|
367 |
|
private Set<String> findVejAliaser(String vejnavn) { |
368 |
|
vejnavn = vejnavn.toLowerCase(); |
369 |
|
HashSet<String> aliasSet = new HashSet<String>(); |
370 |
|
aliasSet.add(vejnavn); |
371 |
|
|
372 |
|
aliasSet.add(vejnavn.replace("u", "ü") ); |
373 |
|
aliasSet.add(vejnavn.replace("ü", "u") ); |
374 |
|
|
375 |
|
aliasSet.add(vejnavn.replace("alle", "allé") ); |
376 |
|
aliasSet.add(vejnavn.replace("allé", "alle") ); |
377 |
|
|
378 |
|
aliasSet.add(vejnavn.replace("dronningens", "dr") ); |
379 |
|
aliasSet.add(vejnavn.replace("dr.", "dronningens") ); |
380 |
|
aliasSet.add(vejnavn.replace("dr ", "dronningens") ); |
381 |
|
|
382 |
|
aliasSet.add(vejnavn.replace("kvt", "kvarter") ); |
383 |
|
aliasSet.add(vejnavn.replace("kvarter", "kvt") ); |
384 |
|
|
385 |
|
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
386 |
|
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
387 |
|
|
388 |
|
aliasSet.add(vejnavn.replace("lille", "ll") ); |
389 |
|
aliasSet.add(vejnavn.replace("ll ", "lille") ); |
390 |
|
aliasSet.add(vejnavn.replace("ll.", "lille") ); |
391 |
|
|
392 |
|
aliasSet.add(vejnavn.replace("store", "st") ); |
393 |
|
aliasSet.add(vejnavn.replace("st ", "store") ); |
394 |
|
aliasSet.add(vejnavn.replace("st.", "store") ); |
395 |
|
|
396 |
|
aliasSet.add(vejnavn.replace("søndre", "sdr") ); |
397 |
|
aliasSet.add(vejnavn.replace("sdr", "søndre") ); |
398 |
|
|
399 |
|
|
400 |
|
aliasSet.add(vejnavn.replace("nørre", "nr") ); |
401 |
|
aliasSet.add(vejnavn.replace("nr", "nørre") ); |
402 |
|
|
403 |
|
aliasSet.add(vejnavn.replace("nordre", "ndr") ); |
404 |
|
aliasSet.add(vejnavn.replace("ndr", "nordre") ); |
405 |
|
|
406 |
|
aliasSet.add(vejnavn.replace("sankt", "skt") ); |
407 |
|
aliasSet.add(vejnavn.replace("sankt", "sct") ); |
408 |
|
aliasSet.add(vejnavn.replace("skt", "sankt") ); |
409 |
|
|
410 |
|
aliasSet.add(vejnavn.replace("skt", "sct") ); |
411 |
|
aliasSet.add(vejnavn.replace("sct", "skt") ); |
412 |
|
|
413 |
|
// Opbyg æøå varianter over alle fundne aliaser |
414 |
|
|
415 |
|
@SuppressWarnings("unchecked") |
416 |
|
HashSet<String> variants = (HashSet<String>) aliasSet.clone(); |
417 |
|
|
418 |
|
for (String vVejnavn : variants) { |
419 |
|
// danske tegn 1 |
420 |
|
aliasSet.add( vVejnavn.replace("æ", "ae") ); |
421 |
|
aliasSet.add( vVejnavn.replace("ø", "oe") ); |
422 |
|
aliasSet.add( vVejnavn.replace("å", "aa") ); |
423 |
|
aliasSet.add( vVejnavn.replace("ae", "æ") ); |
424 |
|
aliasSet.add( vVejnavn.replace("oe", "ø") ); |
425 |
|
aliasSet.add( vVejnavn.replace("aa", "å") ); |
426 |
|
|
427 |
|
//danske tegn 2 |
428 |
|
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); |
429 |
|
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") ); |
430 |
|
aliasSet.add( vVejnavn.replace("ø", "ae").replace("å", "aa") ); |
431 |
|
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") ); |
432 |
|
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") ); |
433 |
|
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
434 |
|
|
435 |
|
//danske tegn 3 |
436 |
|
aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") ); |
437 |
|
aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); |
438 |
|
} |
439 |
|
|
440 |
|
return aliasSet; |
441 |
|
} |
442 |
|
|
443 |
|
|
444 |
} |
} |