1 |
torben |
2267 |
package dk.daoas.daoadresseservice;
|
2 |
|
|
|
3 |
torben |
2274 |
import java.sql.SQLException;
|
4 |
torben |
2339 |
import java.text.SimpleDateFormat;
|
5 |
torben |
2332 |
import java.util.ArrayList;
|
6 |
torben |
2333 |
import java.util.Collections;
|
7 |
torben |
2338 |
import java.util.Date;
|
8 |
torben |
2267 |
import java.util.HashMap;
|
9 |
torben |
2292 |
import java.util.HashSet;
|
10 |
torben |
2274 |
import java.util.List;
|
11 |
|
|
import java.util.Map;
|
12 |
torben |
2292 |
import java.util.Set;
|
13 |
torben |
2274 |
import java.util.concurrent.ConcurrentHashMap;
|
14 |
torben |
2267 |
|
15 |
torben |
2381 |
import org.apache.commons.lang3.StringUtils;
|
16 |
|
|
|
17 |
torben |
2346 |
import dk.daoas.daoadresseservice.admin.ServiceConfig;
|
18 |
torben |
2282 |
import dk.daoas.daoadresseservice.beans.Address;
|
19 |
torben |
2337 |
import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
|
20 |
torben |
2282 |
import dk.daoas.daoadresseservice.beans.ExtendedBean;
|
21 |
|
|
import dk.daoas.daoadresseservice.beans.HundredePctBean;
|
22 |
|
|
import dk.daoas.daoadresseservice.beans.SearchResult;
|
23 |
|
|
import dk.daoas.daoadresseservice.beans.SearchResult.Status;
|
24 |
torben |
2274 |
import dk.daoas.daoadresseservice.db.DatabaseLayer;
|
25 |
|
|
|
26 |
torben |
2267 |
public class AdressSearch {
|
27 |
|
|
|
28 |
torben |
2332 |
private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid;
|
29 |
|
|
private Map<Long, Map<String,Address>> searchGadeidentAdresser;
|
30 |
torben |
2274 |
|
31 |
torben |
2332 |
private List<Address> alleAdresser;
|
32 |
torben |
2267 |
|
33 |
torben |
2332 |
private Map<String,Long> helperCache;
|
34 |
torben |
2267 |
|
35 |
torben |
2350 |
private DataStatisticsBean stats = new DataStatisticsBean();
|
36 |
torben |
2303 |
|
37 |
torben |
2350 |
ServiceConfig config;
|
38 |
torben |
2280 |
|
39 |
torben |
2350 |
public AdressSearch(ServiceConfig config) {
|
40 |
|
|
this.config = config;
|
41 |
|
|
}
|
42 |
|
|
|
43 |
|
|
|
44 |
|
|
public SearchResult search(String postnrStr, String adresse) {
|
45 |
torben |
2288 |
|
46 |
torben |
2359 |
SearchResult result = new SearchResult();
|
47 |
|
|
|
48 |
torben |
2274 |
int postnr=0;
|
49 |
torben |
2359 |
|
50 |
torben |
2305 |
String helperSearchKey = "";
|
51 |
torben |
2267 |
|
52 |
torben |
2274 |
try {
|
53 |
|
|
postnr = Integer.parseInt(postnrStr);
|
54 |
|
|
} catch (Exception E) {
|
55 |
torben |
2359 |
result.status = Status.ERROR_UNKNOWN_POSTAL;
|
56 |
|
|
return result;
|
57 |
torben |
2274 |
}
|
58 |
|
|
|
59 |
|
|
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);
|
60 |
|
|
|
61 |
torben |
2267 |
if (postnrVeje == null) {
|
62 |
torben |
2359 |
result.status = Status.ERROR_UNKNOWN_POSTAL;
|
63 |
|
|
return result;
|
64 |
torben |
2267 |
}
|
65 |
|
|
|
66 |
torben |
2288 |
|
67 |
torben |
2372 |
result.splitResult = AddressUtils.splitAdresse(adresse);
|
68 |
torben |
2358 |
|
69 |
torben |
2267 |
|
70 |
torben |
2372 |
if (result.splitResult.husnr.length() == 0) {
|
71 |
torben |
2359 |
result.status = Status.ERROR_MISSING_HOUSENUMBER;
|
72 |
|
|
return result;
|
73 |
torben |
2274 |
}
|
74 |
torben |
2267 |
|
75 |
torben |
2372 |
String vasketVejnavn = AddressUtils.vaskVejnavn( result.splitResult.vej );
|
76 |
torben |
2358 |
|
77 |
torben |
2274 |
Long gadeident = postnrVeje.get(vasketVejnavn);
|
78 |
torben |
2301 |
|
79 |
torben |
2305 |
|
80 |
torben |
2298 |
if ( gadeident == null) {
|
81 |
torben |
2305 |
helperSearchKey = "" + postnr + "/" + vasketVejnavn;
|
82 |
|
|
gadeident = helperCache.get(helperSearchKey);
|
83 |
torben |
2301 |
}
|
84 |
|
|
|
85 |
torben |
2303 |
|
86 |
torben |
2383 |
// Brug OpenStreetMap før vi prøver google
|
87 |
|
|
// For google har en request limit, det har OSM ikke!
|
88 |
torben |
2301 |
if ( gadeident == null) {
|
89 |
torben |
2383 |
if (config.useOpenStreetMaps) {
|
90 |
|
|
result.osmVej = GeocodeHelper.openstreetmapHelper(config, postnr, result.splitResult.vej );
|
91 |
|
|
result.osm = true;
|
92 |
torben |
2304 |
|
93 |
torben |
2383 |
if (result.osmVej != null) {
|
94 |
|
|
String osmVasket = AddressUtils.vaskVejnavn( result.osmVej );
|
95 |
|
|
gadeident = postnrVeje.get(osmVasket);
|
96 |
torben |
2346 |
|
97 |
|
|
if (gadeident != null) {
|
98 |
|
|
helperCache.put(helperSearchKey, gadeident);
|
99 |
|
|
}
|
100 |
torben |
2303 |
}
|
101 |
torben |
2300 |
}
|
102 |
torben |
2298 |
}
|
103 |
|
|
|
104 |
torben |
2303 |
if ( gadeident == null) {
|
105 |
torben |
2383 |
if (config.useGoogle) {
|
106 |
|
|
result.googleVej = GeocodeHelper.googleHelper(config, postnr, result.splitResult.vej );
|
107 |
|
|
result.google = true;
|
108 |
torben |
2304 |
|
109 |
torben |
2383 |
if (result.googleVej != null) {
|
110 |
|
|
String googleVasket = AddressUtils.vaskVejnavn( result.googleVej );
|
111 |
|
|
gadeident = postnrVeje.get(googleVasket);
|
112 |
torben |
2346 |
|
113 |
|
|
if (gadeident != null) {
|
114 |
|
|
helperCache.put(helperSearchKey, gadeident);
|
115 |
|
|
}
|
116 |
torben |
2303 |
}
|
117 |
|
|
}
|
118 |
|
|
}
|
119 |
|
|
|
120 |
torben |
2383 |
|
121 |
|
|
|
122 |
torben |
2359 |
if (gadeident == null) {
|
123 |
|
|
result.status = Status.ERROR_UNKNOWN_STREETNAME;
|
124 |
|
|
return result;
|
125 |
torben |
2288 |
}
|
126 |
torben |
2274 |
|
127 |
torben |
2359 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident);
|
128 |
|
|
if (gade == null) { //Denne søgning må ikke fejle
|
129 |
|
|
result.status = Status.ERROR_INTERNAL;
|
130 |
|
|
return result;
|
131 |
|
|
}
|
132 |
torben |
2274 |
|
133 |
|
|
|
134 |
torben |
2372 |
String husnrSearch = "" + result.splitResult.husnr + result.splitResult.litra;
|
135 |
torben |
2274 |
Address addr = gade.get(husnrSearch);
|
136 |
torben |
2298 |
|
137 |
torben |
2274 |
if (addr == null) {
|
138 |
torben |
2359 |
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT;
|
139 |
|
|
return result;
|
140 |
torben |
2274 |
}
|
141 |
torben |
2276 |
|
142 |
torben |
2359 |
result.address = addr;
|
143 |
|
|
|
144 |
torben |
2381 |
|
145 |
|
|
if ( StringUtils.equals(addr.distributor, "LUKKET") ) {
|
146 |
torben |
2359 |
result.status = Status.STATUS_NOT_COVERED; //Skal vi have en special status til Lukkede adresser ?
|
147 |
|
|
return result;
|
148 |
|
|
}
|
149 |
|
|
|
150 |
torben |
2276 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
|
151 |
torben |
2359 |
result.status = Status.STATUS_NOT_COVERED;
|
152 |
|
|
return result;
|
153 |
torben |
2276 |
}
|
154 |
torben |
2359 |
|
155 |
torben |
2277 |
|
156 |
torben |
2359 |
result.status = Status.STATUS_OK;
|
157 |
|
|
|
158 |
|
|
return result;
|
159 |
torben |
2267 |
}
|
160 |
|
|
|
161 |
torben |
2274 |
|
162 |
|
|
public void buildSearchStructures() throws SQLException{
|
163 |
|
|
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>();
|
164 |
|
|
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>();
|
165 |
torben |
2303 |
helperCache = new ConcurrentHashMap<String,Long>();
|
166 |
|
|
|
167 |
torben |
2309 |
long start1 = System.currentTimeMillis();
|
168 |
torben |
2276 |
System.out.println("Build -- stage 1");
|
169 |
|
|
|
170 |
torben |
2274 |
alleAdresser = DatabaseLayer.getAllAdresses();
|
171 |
torben |
2276 |
|
172 |
torben |
2286 |
|
173 |
torben |
2285 |
/* Mapper mellem db Row ID og adresse noden */
|
174 |
|
|
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
|
175 |
|
|
|
176 |
torben |
2274 |
for (Address a : alleAdresser) {
|
177 |
|
|
idAddressMap.put(a.id, a);
|
178 |
|
|
|
179 |
|
|
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr);
|
180 |
|
|
|
181 |
|
|
if (postnrVeje == null) {
|
182 |
|
|
postnrVeje = new ConcurrentHashMap<String,Long>();
|
183 |
|
|
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje);
|
184 |
|
|
}
|
185 |
|
|
|
186 |
torben |
2281 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
|
187 |
|
|
Long gadeident = postnrVeje.get(vasketVejnavn);
|
188 |
torben |
2274 |
if (gadeident == null) {
|
189 |
torben |
2292 |
//postnrVeje.put(vasketVejnavn, a.gadeid);
|
190 |
|
|
|
191 |
|
|
Set<String> aliaser = findVejAliaser(a.vejnavn);
|
192 |
|
|
for(String alias : aliaser) {
|
193 |
|
|
String vasketAlias = AddressUtils.vaskVejnavn(alias);
|
194 |
|
|
postnrVeje.put(vasketAlias, a.gadeid);
|
195 |
|
|
}
|
196 |
|
|
|
197 |
torben |
2274 |
}
|
198 |
|
|
|
199 |
|
|
Map<String, Address> gade = searchGadeidentAdresser.get(a.gadeid);
|
200 |
|
|
if (gade == null) {
|
201 |
|
|
gade = new HashMap<String, Address>();
|
202 |
|
|
searchGadeidentAdresser.put(a.gadeid, gade);
|
203 |
|
|
}
|
204 |
|
|
String husnrSearch = "" + a.husnr + a.husnrbogstav;
|
205 |
torben |
2286 |
gade.put(husnrSearch, a);
|
206 |
torben |
2276 |
}
|
207 |
|
|
|
208 |
|
|
|
209 |
torben |
2279 |
////////////////////////////////////////////////////////////////////////////////////////
|
210 |
torben |
2309 |
long start2 = System.currentTimeMillis();
|
211 |
|
|
System.out.println("Build, stage1 elapsed: " + (start2-start1) );
|
212 |
torben |
2279 |
System.out.println("Build -- stage 2 udvidet dækning");
|
213 |
|
|
|
214 |
|
|
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist();
|
215 |
torben |
2276 |
for (ExtendedBean eb : extDao) {
|
216 |
torben |
2274 |
|
217 |
torben |
2276 |
Address orgAddress = idAddressMap.get(eb.orgId);
|
218 |
|
|
if (orgAddress == null)
|
219 |
|
|
continue;
|
220 |
|
|
|
221 |
|
|
Address targetAddress = idAddressMap.get(eb.targetId);
|
222 |
|
|
if (targetAddress == null)
|
223 |
|
|
continue;
|
224 |
|
|
|
225 |
torben |
2277 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) {
|
226 |
|
|
continue;
|
227 |
|
|
}
|
228 |
|
|
|
229 |
|
|
if (targetAddress.distributor.equals("LUKKET")) {
|
230 |
|
|
continue;
|
231 |
|
|
}
|
232 |
|
|
|
233 |
torben |
2276 |
orgAddress.extTarget = targetAddress;
|
234 |
|
|
orgAddress.extAfstand = eb.afstand;
|
235 |
|
|
|
236 |
torben |
2283 |
boolean covered = false;
|
237 |
|
|
if (targetAddress.distributor.equals("DAO")) {
|
238 |
|
|
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);
|
239 |
|
|
if (orgAddress.rute != null) {
|
240 |
|
|
orgAddress.koreliste = targetAddress.koreliste;
|
241 |
|
|
covered = true;
|
242 |
|
|
}
|
243 |
|
|
}
|
244 |
torben |
2276 |
|
245 |
torben |
2283 |
if (targetAddress.distributor.equals("BK")) {
|
246 |
|
|
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
|
247 |
|
|
if (orgAddress.koreliste != null) {
|
248 |
|
|
orgAddress.rute = targetAddress.rute;
|
249 |
|
|
covered = true;
|
250 |
|
|
}
|
251 |
|
|
}
|
252 |
|
|
|
253 |
|
|
if (covered) { //Kopier resten af felterne
|
254 |
torben |
2276 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET;
|
255 |
|
|
orgAddress.dbkBane = targetAddress.dbkBane;
|
256 |
|
|
|
257 |
|
|
/* Sådan gør den gamle service */
|
258 |
|
|
orgAddress.kommunekode = targetAddress.kommunekode;
|
259 |
|
|
orgAddress.vejkode = targetAddress.vejkode;
|
260 |
|
|
|
261 |
|
|
orgAddress.distributor = targetAddress.distributor;
|
262 |
|
|
}
|
263 |
torben |
2274 |
}
|
264 |
torben |
2286 |
|
265 |
|
|
// nu skal vi ikke bruge idAddressMap længere
|
266 |
|
|
idAddressMap = null;
|
267 |
|
|
|
268 |
torben |
2279 |
//////////////////////////////////////////////////////////////////////////////////////
|
269 |
torben |
2309 |
long start3 = System.currentTimeMillis();
|
270 |
|
|
System.out.println("Build, stage2 elapsed: " + (start3-start2) );
|
271 |
torben |
2279 |
System.out.println("Build -- stage 3 - 100pct");
|
272 |
torben |
2274 |
|
273 |
torben |
2332 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList();
|
274 |
torben |
2279 |
for (Address addr : alleAdresser) {
|
275 |
torben |
2286 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
|
276 |
torben |
2279 |
continue;
|
277 |
|
|
}
|
278 |
|
|
|
279 |
|
|
if (addr.distributor != null && addr.distributor.equals("LUKKET")) {
|
280 |
|
|
continue;
|
281 |
|
|
}
|
282 |
|
|
|
283 |
|
|
|
284 |
|
|
HundredePctBean bean = hundredePct.get(addr.postnr);
|
285 |
|
|
if (bean == null) {
|
286 |
|
|
continue;
|
287 |
|
|
}
|
288 |
|
|
|
289 |
|
|
addr.daekningsType = DaekningsType.DAEKNING_100PCT;
|
290 |
|
|
addr.rute = bean.rute;
|
291 |
|
|
addr.koreliste = bean.koreliste;
|
292 |
|
|
addr.dbkBane = bean.dbkBane;
|
293 |
|
|
addr.distributor = bean.distributor;
|
294 |
|
|
}
|
295 |
torben |
2276 |
|
296 |
torben |
2286 |
////////////////////////////////////////////////////////////////////////////////////
|
297 |
torben |
2309 |
long stop = System.currentTimeMillis();
|
298 |
|
|
System.out.println("Build, stage3 elapsed: " + (stop-start3) );
|
299 |
torben |
2286 |
System.out.println("Build -- Gathering statistics");
|
300 |
torben |
2337 |
|
301 |
torben |
2286 |
for (Address addr : alleAdresser) {
|
302 |
|
|
switch (addr.daekningsType) {
|
303 |
|
|
case DAEKNING_DIREKTE:
|
304 |
torben |
2337 |
stats.direkteCount++;
|
305 |
torben |
2286 |
break;
|
306 |
|
|
case DAEKNING_UDVIDET:
|
307 |
torben |
2337 |
stats.extendedCount++;
|
308 |
torben |
2286 |
break;
|
309 |
|
|
case DAEKNING_100PCT:
|
310 |
torben |
2337 |
stats.hundredePctCount++;
|
311 |
torben |
2286 |
break;
|
312 |
|
|
default:
|
313 |
torben |
2337 |
stats.ikkeDaekketCount++;
|
314 |
torben |
2286 |
}
|
315 |
torben |
2339 |
}
|
316 |
torben |
2286 |
|
317 |
torben |
2338 |
|
318 |
torben |
2339 |
stats.elapsed = stop-start1;
|
319 |
|
|
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
|
320 |
|
|
|
321 |
torben |
2337 |
System.out.println("Build: direkteCount: " + stats.direkteCount);
|
322 |
|
|
System.out.println("Build: extendedCount: " + stats.extendedCount);
|
323 |
|
|
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
|
324 |
|
|
System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
|
325 |
torben |
2286 |
|
326 |
torben |
2309 |
System.out.println("Build: Total Elapsed: " + (stop-start1) );
|
327 |
torben |
2281 |
System.out.println("Build Completed");
|
328 |
|
|
|
329 |
torben |
2274 |
}
|
330 |
|
|
|
331 |
torben |
2337 |
public DataStatisticsBean getStatistics() {
|
332 |
|
|
return stats;
|
333 |
|
|
}
|
334 |
torben |
2276 |
|
335 |
torben |
2337 |
public void clear() {
|
336 |
|
|
searchPostnrVejnavnGadeid.clear();
|
337 |
|
|
searchGadeidentAdresser.clear();
|
338 |
|
|
alleAdresser.clear();
|
339 |
|
|
helperCache.clear();
|
340 |
|
|
}
|
341 |
|
|
|
342 |
|
|
|
343 |
torben |
2283 |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
|
344 |
|
|
|
345 |
|
|
// ///////////////////////////////////////////////////////////////////
|
346 |
|
|
switch( eb.transport) {
|
347 |
|
|
case "cykel":
|
348 |
|
|
if (eb.afstand < 0.151) {
|
349 |
|
|
return "." + targetAddress.rute;
|
350 |
|
|
} else if (eb.afstand < 0.501) {
|
351 |
|
|
return ".." + targetAddress.rute;
|
352 |
|
|
} else if (eb.afstand < 0.701) {
|
353 |
|
|
return "..." + targetAddress.rute;
|
354 |
|
|
} else if (eb.afstand < 0.501) {
|
355 |
|
|
return "...." + targetAddress.rute;
|
356 |
torben |
2276 |
}
|
357 |
torben |
2283 |
break;
|
358 |
|
|
case "scooter":
|
359 |
|
|
if (eb.afstand < 0.151) {
|
360 |
|
|
return "." + targetAddress.rute;
|
361 |
|
|
} else if (eb.afstand < 0.801) {
|
362 |
|
|
return ".." + targetAddress.rute;
|
363 |
|
|
} else if (eb.afstand < 1.201) {
|
364 |
|
|
return "..." + targetAddress.rute;
|
365 |
|
|
} else if (eb.afstand < 2.101) {
|
366 |
|
|
return "...." + targetAddress.rute;
|
367 |
|
|
}
|
368 |
|
|
break;
|
369 |
|
|
case "bil":
|
370 |
|
|
if (eb.afstand < 0.151) {
|
371 |
|
|
return "." + targetAddress.rute;
|
372 |
|
|
} else if (eb.afstand < 1.001) {
|
373 |
|
|
return ".." + targetAddress.rute;
|
374 |
|
|
} else if (eb.afstand < 1.601) {
|
375 |
|
|
return "..." + targetAddress.rute;
|
376 |
|
|
} else if (eb.afstand < 2.601) {
|
377 |
|
|
return "...." + targetAddress.rute;
|
378 |
|
|
}
|
379 |
torben |
2276 |
break;
|
380 |
torben |
2283 |
}
|
381 |
torben |
2276 |
return null;
|
382 |
torben |
2332 |
}
|
383 |
torben |
2276 |
|
384 |
torben |
2332 |
public List<Address> getNonCoveredAddresses() {
|
385 |
|
|
List<Address> result = new ArrayList<Address>(60000);
|
386 |
|
|
for (Address a : alleAdresser) {
|
387 |
|
|
if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
|
388 |
|
|
result.add(a);
|
389 |
|
|
}
|
390 |
|
|
}
|
391 |
torben |
2333 |
Collections.sort(result );
|
392 |
torben |
2332 |
return result;
|
393 |
|
|
}
|
394 |
|
|
|
395 |
torben |
2283 |
///////////////////////////////////////////////////////////
|
396 |
|
|
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
|
397 |
|
|
String inject;
|
398 |
|
|
if (eb.afstand <= 0.500) {
|
399 |
|
|
inject = ".";
|
400 |
|
|
} else {
|
401 |
|
|
inject = "..";
|
402 |
|
|
}
|
403 |
|
|
return AddressUtils.injectIntoBk(targetAddress.koreliste, inject);
|
404 |
|
|
}
|
405 |
torben |
2276 |
|
406 |
torben |
2292 |
private Set<String> findVejAliaser(String vejnavn) {
|
407 |
torben |
2293 |
vejnavn = vejnavn.toLowerCase();
|
408 |
torben |
2310 |
HashSet<String> aliasSet = new HashSet<String>();
|
409 |
torben |
2292 |
aliasSet.add(vejnavn);
|
410 |
|
|
|
411 |
torben |
2312 |
aliasSet.add(vejnavn.replace("u", "ü") );
|
412 |
|
|
aliasSet.add(vejnavn.replace("ü", "u") );
|
413 |
|
|
|
414 |
torben |
2292 |
aliasSet.add(vejnavn.replace("alle", "allé") );
|
415 |
torben |
2310 |
aliasSet.add(vejnavn.replace("allé", "alle") );
|
416 |
torben |
2292 |
|
417 |
torben |
2295 |
aliasSet.add(vejnavn.replace("dronningens", "dr") );
|
418 |
|
|
aliasSet.add(vejnavn.replace("dr.", "dronningens") );
|
419 |
|
|
aliasSet.add(vejnavn.replace("dr ", "dronningens") );
|
420 |
|
|
|
421 |
|
|
aliasSet.add(vejnavn.replace("kvt", "kvarter") );
|
422 |
|
|
aliasSet.add(vejnavn.replace("kvarter", "kvt") );
|
423 |
|
|
|
424 |
torben |
2292 |
aliasSet.add(vejnavn.replace("gl", "gammel") );
|
425 |
|
|
aliasSet.add(vejnavn.replace("gammel", "gl") );
|
426 |
|
|
|
427 |
|
|
aliasSet.add(vejnavn.replace("lille", "ll") );
|
428 |
|
|
aliasSet.add(vejnavn.replace("ll ", "lille") );
|
429 |
|
|
aliasSet.add(vejnavn.replace("ll.", "lille") );
|
430 |
|
|
|
431 |
|
|
aliasSet.add(vejnavn.replace("store", "st") );
|
432 |
|
|
aliasSet.add(vejnavn.replace("st ", "store") );
|
433 |
|
|
aliasSet.add(vejnavn.replace("st.", "store") );
|
434 |
|
|
|
435 |
|
|
aliasSet.add(vejnavn.replace("søndre", "sdr") );
|
436 |
|
|
aliasSet.add(vejnavn.replace("sdr", "søndre") );
|
437 |
|
|
|
438 |
|
|
|
439 |
|
|
aliasSet.add(vejnavn.replace("nørre", "nr") );
|
440 |
|
|
aliasSet.add(vejnavn.replace("nr", "nørre") );
|
441 |
|
|
|
442 |
|
|
aliasSet.add(vejnavn.replace("nordre", "ndr") );
|
443 |
|
|
aliasSet.add(vejnavn.replace("ndr", "nordre") );
|
444 |
|
|
|
445 |
|
|
aliasSet.add(vejnavn.replace("sankt", "skt") );
|
446 |
torben |
2310 |
aliasSet.add(vejnavn.replace("sankt", "sct") );
|
447 |
torben |
2292 |
aliasSet.add(vejnavn.replace("skt", "sankt") );
|
448 |
|
|
|
449 |
|
|
aliasSet.add(vejnavn.replace("skt", "sct") );
|
450 |
torben |
2362 |
aliasSet.add(vejnavn.replace("sct", "skt") );
|
451 |
torben |
2292 |
|
452 |
torben |
2379 |
|
453 |
|
|
//alternative måder at stave vej/gade/alle
|
454 |
torben |
2362 |
aliasSet.add(vejnavn.replace("vej", "ve") );
|
455 |
|
|
aliasSet.add(vejnavn.replace("vej", "vj") );
|
456 |
torben |
2386 |
aliasSet.add(vejnavn.replace("vej", "v") );
|
457 |
torben |
2362 |
|
458 |
|
|
aliasSet.add(vejnavn.replace("alle", "all") );
|
459 |
|
|
aliasSet.add(vejnavn.replace("allé", "all") );
|
460 |
torben |
2382 |
aliasSet.add(vejnavn.replace("alle", "allú") ); //Fundet i logs.hentruteinfo
|
461 |
|
|
aliasSet.add(vejnavn.replace("allé", "allú") );
|
462 |
torben |
2362 |
|
463 |
torben |
2382 |
aliasSet.add(vejnavn.replace("gade", "gaed") ); //Fundet i logs.hentruteinfo
|
464 |
torben |
2379 |
|
465 |
|
|
|
466 |
torben |
2310 |
// Opbyg æøå varianter over alle fundne aliaser
|
467 |
|
|
|
468 |
|
|
@SuppressWarnings("unchecked")
|
469 |
|
|
HashSet<String> variants = (HashSet<String>) aliasSet.clone();
|
470 |
|
|
|
471 |
torben |
2313 |
for (String vVejnavn : variants) {
|
472 |
torben |
2310 |
// danske tegn 1
|
473 |
|
|
aliasSet.add( vVejnavn.replace("æ", "ae") );
|
474 |
|
|
aliasSet.add( vVejnavn.replace("ø", "oe") );
|
475 |
|
|
aliasSet.add( vVejnavn.replace("å", "aa") );
|
476 |
|
|
aliasSet.add( vVejnavn.replace("ae", "æ") );
|
477 |
|
|
aliasSet.add( vVejnavn.replace("oe", "ø") );
|
478 |
|
|
aliasSet.add( vVejnavn.replace("aa", "å") );
|
479 |
|
|
|
480 |
|
|
//danske tegn 2
|
481 |
|
|
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") );
|
482 |
|
|
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") );
|
483 |
|
|
aliasSet.add( vVejnavn.replace("ø", "ae").replace("å", "aa") );
|
484 |
|
|
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") );
|
485 |
|
|
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") );
|
486 |
|
|
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") );
|
487 |
|
|
|
488 |
|
|
//danske tegn 3
|
489 |
|
|
aliasSet.add( vejnavn.replace("æ", "ae").replace("ø", "oe").replace("å", "aa") );
|
490 |
|
|
aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") );
|
491 |
|
|
}
|
492 |
|
|
|
493 |
torben |
2292 |
return aliasSet;
|
494 |
|
|
}
|
495 |
torben |
2283 |
|
496 |
torben |
2292 |
|
497 |
torben |
2267 |
}
|