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; |
26 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
27 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
28 |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
29 |
|
import dk.daoas.daoadresseservice.util.DaoUtils; |
30 |
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
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 { |
public class AddressSearch { |
35 |
|
|
36 |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
37 |
private Map<Integer, Map<String,Address>> searchGadeidentAdresser; |
private Map<Integer, Map<Short, List<Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra |
38 |
|
|
39 |
private List<Address> alleAdresser; |
private List<Address> ikkeDaekkedeAdresser = new ArrayList<Address>(60000); |
40 |
|
private List<Address> hundredePctAdresser = new ArrayList<Address>(120000); |
41 |
|
|
42 |
private Map<String,Integer> helperCache; |
private Map<String,Integer> helperCache; |
43 |
|
|
44 |
private DataStatisticsBean stats = new DataStatisticsBean(); |
private DataStatisticsBean stats = new DataStatisticsBean(); |
45 |
|
|
46 |
ServiceConfig config; |
private DatabaseLayer db; |
47 |
|
private ServiceConfig config; |
48 |
|
|
49 |
|
|
50 |
StreetnameHelper levenshteinHelper; |
StreetnameHelper levenshteinHelper; |
51 |
|
StreetnameHelper metaphoneHelper; |
52 |
StreetnameHelper googleHelper; |
StreetnameHelper googleHelper; |
53 |
StreetnameHelper osmHelper; |
StreetnameHelper osmHelper; |
54 |
|
|
55 |
|
|
56 |
public AddressSearch(ServiceConfig config) { |
public AddressSearch(DatabaseLayer db, ServiceConfig config) { |
57 |
|
|
58 |
|
this.db = db; |
59 |
this.config = config; |
this.config = config; |
60 |
|
|
61 |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
62 |
|
metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config); |
63 |
googleHelper = new GoogleStreetnameHelper( config ); |
googleHelper = new GoogleStreetnameHelper( config ); |
64 |
osmHelper = new OSMStreetnameHelper( config ); |
osmHelper = new OSMStreetnameHelper( config ); |
65 |
} |
} |
66 |
|
|
67 |
|
public Address getAddressSafe(int gadeid, short husnr, String litra) throws Exception { |
68 |
|
|
69 |
|
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
70 |
|
|
71 |
|
if (gade == null) { |
72 |
|
throw new Exception("GadeID ikke fundet"); |
73 |
|
} |
74 |
|
|
75 |
|
List<Address> litraList = gade.get(husnr); |
76 |
|
|
77 |
|
Address addr = null; |
78 |
|
for(Address a : litraList) { |
79 |
|
if (a.husnrbogstav.equals(litra) ) { |
80 |
|
addr = a; |
81 |
|
break; |
82 |
|
} |
83 |
|
} |
84 |
|
|
85 |
|
if (addr == null) { |
86 |
|
throw new Exception("Adresse ikke ikke fundet"); |
87 |
|
} |
88 |
|
|
89 |
|
return addr; |
90 |
|
} |
91 |
|
|
92 |
|
|
93 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
94 |
|
return search(postnrStr, adresse, false); |
95 |
|
} |
96 |
|
|
97 |
|
|
98 |
|
public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr) { |
99 |
|
|
100 |
|
postnrStr = postnrStr.trim(); |
101 |
|
adresse = adresse.trim(); |
102 |
|
|
103 |
|
|
104 |
SearchRequest request = new SearchRequest(); |
SearchRequest request = new SearchRequest(); |
105 |
SearchResult result = new SearchResult(); |
SearchResult result = new SearchResult(); |
106 |
|
|
|
|
|
|
String helperSearchKey = ""; |
|
107 |
|
|
108 |
try { |
try { |
109 |
request.postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
110 |
} catch (Exception E) { |
} catch (Exception E) { |
111 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
112 |
return result; |
return result; |
131 |
return result; |
return result; |
132 |
} |
} |
133 |
|
|
134 |
request.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
135 |
|
|
136 |
|
|
137 |
if (request.vasketVejnavn.indexOf("pakkebo") > -1 |
if (result.vasketVejnavn.indexOf("pakkebo") > -1 |
138 |
|| request.vasketVejnavn.indexOf("døgnpost") > -1 |
|| result.vasketVejnavn.indexOf("pakkepost") > -1 |
139 |
|| request.vasketVejnavn.indexOf("døgnbo") > -1 |
|| result.vasketVejnavn.indexOf("postbo") > -1 // postbox/postboks |
140 |
|| request.vasketVejnavn.equals("id") |
|| result.vasketVejnavn.indexOf("døgnpost") > -1 |
141 |
|
|| result.vasketVejnavn.indexOf("døgnbo") > -1 // døgnbox // døgnboks |
142 |
|
|| result.vasketVejnavn.equals("id") |
143 |
) { |
) { |
144 |
result.status = Status.ERROR_POSTBOX; |
result.status = Status.ERROR_POSTBOX; |
145 |
return result; |
return result; |
146 |
} |
} |
147 |
|
|
148 |
Integer gadeident = request.streetNames.get(request.vasketVejnavn); |
// LookupStreetname er en indkapsling af alm + levenstein + google + osm |
149 |
|
Integer gadeident = lookupStretname(request, result, true); |
150 |
|
|
|
if ( gadeident == null) { |
|
|
helperSearchKey = "" + request.postnr + "/" + request.vasketVejnavn; |
|
|
gadeident = helperCache.get(helperSearchKey); |
|
|
} |
|
151 |
|
|
152 |
|
/* |
153 |
|
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn |
154 |
|
* |
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 |
String vej = levenshteinHelper.proposeStreetName(request, result); |
final int MAX_TRIES = 4; |
158 |
if (vej != null) { |
|
159 |
gadeident = request.streetNames.get(vej); |
String vejnavnParts[] = request.vejnavn.split(" "); |
160 |
} |
|
161 |
} |
for (int i=1; i<=MAX_TRIES && i<vejnavnParts.length; i++) { |
162 |
|
String subVejnavn = DaoUtils.joinHelper(vejnavnParts, i); |
163 |
|
|
164 |
// Brug OpenStreetMap før vi prøver google |
request.vejnavn = subVejnavn; |
165 |
// For google har en request limit, det har OSM ikke! |
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
166 |
if ( gadeident == null) { |
|
167 |
String vej = osmHelper.proposeStreetName(request, result); |
gadeident = lookupStretname(request, result, false);//prøv opslag MEN UDEN GOOGLE/OSM !!! |
168 |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
|
169 |
} |
//hvis vi fandt vejen ud fra substrengen |
170 |
|
if (gadeident != null) { |
171 |
if ( gadeident == null) { |
break; |
172 |
String vej = googleHelper.proposeStreetName(request, result); |
} |
173 |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
|
174 |
|
//hvis vi ikke fandt kopierer vi vejnavn fra split igen |
175 |
|
request.vejnavn = result.splitResult.vej; |
176 |
|
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
177 |
|
} |
178 |
} |
} |
179 |
|
|
180 |
|
|
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; |
256 |
|
|
257 |
return result; |
return result; |
258 |
} |
} |
259 |
|
|
260 |
|
|
261 |
|
private Integer lookupStretname(SearchRequest request, SearchResult result, boolean useExternal) { |
262 |
|
String helperSearchKey = ""; |
263 |
|
|
264 |
|
Integer gadeident = request.streetNames.get(result.vasketVejnavn); |
265 |
|
|
266 |
|
|
267 |
|
if ( gadeident == null) { |
268 |
|
helperSearchKey = "" + request.postnr + "/" + result.vasketVejnavn; |
269 |
|
gadeident = helperCache.get(helperSearchKey); |
270 |
|
} |
271 |
|
|
272 |
|
if (gadeident == null) { |
273 |
|
String vej = levenshteinHelper.proposeStreetName(request, result); |
274 |
|
if (vej != null) { |
275 |
|
gadeident = request.streetNames.get(vej); |
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 |
288 |
|
// For google har en request limit, det har OSM ikke! |
289 |
|
if ( gadeident == null && useExternal) { |
290 |
|
String vej = osmHelper.proposeStreetName(request, result); |
291 |
|
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
292 |
|
} |
293 |
|
|
294 |
|
if ( gadeident == null && useExternal) { |
295 |
|
String vej = googleHelper.proposeStreetName(request, result); |
296 |
|
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
297 |
|
} |
298 |
|
return gadeident; |
299 |
|
} |
300 |
|
|
301 |
private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) { |
private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) { |
302 |
if (vej == null) |
if (vej == null) |
312 |
|
|
313 |
} |
} |
314 |
|
|
315 |
public Map<String,Integer> getStretsByPostal(int zip) { |
public Map<String,Integer> getStretsByPostal(short zip) { |
316 |
return searchPostnrVejnavnGadeid.get(zip); |
return searchPostnrVejnavnGadeid.get(zip); |
317 |
} |
} |
318 |
|
|
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 |
|
if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
454 |
|
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden |
455 |
|
continue; |
456 |
|
} |
457 |
|
|
458 |
Address targetAddress = idAddressMap.get(eb.targetId); |
Address targetAddress = idAddressMap.get(eb.targetId); |
459 |
if (targetAddress == null) |
if (targetAddress == null) { |
460 |
continue; |
continue; |
461 |
|
} |
462 |
|
|
463 |
|
|
464 |
if (orgAddress.distributor != null && orgAddress.distributor.equals("LUKKET")) { |
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) { |
465 |
continue; |
continue; |
466 |
} |
} |
467 |
|
|
468 |
if (targetAddress.distributor.equals("LUKKET")) { |
|
469 |
|
|
470 |
|
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) { |
471 |
continue; |
continue; |
472 |
} |
} |
473 |
|
|
476 |
|
|
477 |
boolean covered = false; |
boolean covered = false; |
478 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
479 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
orgAddress.ruteMandag = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
480 |
orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); |
orgAddress.ruteMandag = ruteHelper.getInstance(orgAddress.ruteMandag); |
481 |
|
|
482 |
if (orgAddress.rute != null) { |
if (orgAddress.ruteMandag != null) { |
483 |
orgAddress.koreliste = targetAddress.koreliste; |
orgAddress.korelisteMandag = targetAddress.korelisteMandag; |
484 |
covered = true; |
covered = true; |
485 |
} |
} |
486 |
} |
} |
487 |
|
|
488 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
489 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
orgAddress.korelisteMandag = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
490 |
orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); |
orgAddress.korelisteMandag = korelisteHelper.getInstance(orgAddress.korelisteMandag); |
491 |
|
|
492 |
if (orgAddress.koreliste != null) { |
if (orgAddress.korelisteMandag != null) { |
493 |
orgAddress.rute = targetAddress.rute; |
orgAddress.ruteMandag = targetAddress.ruteMandag; |
494 |
covered = true; |
covered = true; |
495 |
} |
} |
496 |
} |
} |
500 |
orgAddress.dbkBane = targetAddress.dbkBane; |
orgAddress.dbkBane = targetAddress.dbkBane; |
501 |
|
|
502 |
/* Sådan gør den gamle service */ |
/* Sådan gør den gamle service */ |
503 |
orgAddress.kommunekode = targetAddress.kommunekode; |
/* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/ |
504 |
orgAddress.vejkode = targetAddress.vejkode; |
//orgAddress.kommunekode = targetAddress.kommunekode; |
505 |
|
//orgAddress.vejkode = targetAddress.vejkode; |
506 |
|
|
507 |
|
|
508 |
orgAddress.distributor = targetAddress.distributor; |
orgAddress.distributor = targetAddress.distributor; |
509 |
} |
} |
510 |
} |
} |
511 |
|
|
512 |
// nu skal vi ikke bruge idAddressMap længere |
// cleanup inden stage 4 |
513 |
idAddressMap = null; |
idAddressMap = null; |
514 |
|
ruteHelper = null; |
515 |
|
korelisteHelper = null; |
516 |
|
|
517 |
////////////////////////////////////////////////////////////////////////////////////// |
////////////////////////////////////////////////////////////////////////////////////// |
518 |
long start4 = System.currentTimeMillis(); |
long start4 = System.currentTimeMillis(); |
519 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
520 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
521 |
|
|
522 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
523 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
524 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
525 |
continue; |
continue; |
536 |
} |
} |
537 |
|
|
538 |
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
539 |
addr.rute = bean.rute; |
addr.ruteMandag = bean.rute; |
540 |
addr.koreliste = bean.koreliste; |
addr.korelisteMandag = bean.koreliste; |
541 |
addr.dbkBane = bean.dbkBane; |
addr.dbkBane = bean.dbkBane; |
542 |
addr.distributor = bean.distributor; |
addr.distributor = bean.distributor; |
543 |
} |
} |
544 |
|
|
545 |
//////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////// |
546 |
long stop = System.currentTimeMillis(); |
long stop = System.currentTimeMillis(); |
547 |
System.out.println("Build, stage3 elapsed: " + (stop-start4) ); |
System.out.println("Build, stage4 elapsed: " + (stop-start4) ); |
548 |
System.out.println("Build -- Gathering statistics"); |
System.out.println("Build -- Gathering statistics"); |
549 |
|
|
550 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
556 |
stats.extendedCount++; |
stats.extendedCount++; |
557 |
break; |
break; |
558 |
case DAEKNING_100PCT: |
case DAEKNING_100PCT: |
559 |
|
hundredePctAdresser.add(addr); |
560 |
stats.hundredePctCount++; |
stats.hundredePctCount++; |
561 |
break; |
break; |
562 |
default: |
default: |
563 |
|
ikkeDaekkedeAdresser.add(addr); |
564 |
stats.ikkeDaekketCount++; |
stats.ikkeDaekketCount++; |
565 |
} |
} |
566 |
} |
} |
567 |
|
stats.totalCount = alleAdresser.size(); |
568 |
|
|
569 |
|
Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet |
570 |
|
Collections.sort( hundredePctAdresser ); |
571 |
|
|
572 |
|
|
573 |
stats.elapsed = stop-start1; |
stats.elapsed = stop-start1; |
574 |
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() ); |
575 |
|
|
576 |
|
System.out.println("Build: totalCount: " + stats.totalCount); |
577 |
System.out.println("Build: direkteCount: " + stats.direkteCount); |
System.out.println("Build: direkteCount: " + stats.direkteCount); |
578 |
System.out.println("Build: extendedCount: " + stats.extendedCount); |
System.out.println("Build: extendedCount: " + stats.extendedCount); |
579 |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
588 |
return stats; |
return stats; |
589 |
} |
} |
590 |
|
|
591 |
|
public DatabaseLayer getDatabaseLayer() { |
592 |
|
return db; |
593 |
|
} |
594 |
|
|
595 |
public void clear() { |
public void clear() { |
596 |
searchPostnrVejnavnGadeid.clear(); |
searchPostnrVejnavnGadeid.clear(); |
597 |
searchGadeidentAdresser.clear(); |
searchGadeidentAdresser.clear(); |
|
alleAdresser.clear(); |
|
598 |
helperCache.clear(); |
helperCache.clear(); |
599 |
} |
} |
600 |
|
|
601 |
|
|
602 |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
603 |
if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
if (targetAddress.ruteMandag == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
604 |
return null; |
return null; |
605 |
} |
} |
606 |
|
|
608 |
switch( eb.transport) { |
switch( eb.transport) { |
609 |
case "cykel": |
case "cykel": |
610 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
611 |
return "." + targetAddress.rute; |
return "." + targetAddress.ruteMandag; |
612 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 0.501) { |
613 |
return ".." + targetAddress.rute; |
return ".." + targetAddress.ruteMandag; |
614 |
} else if (eb.afstand < 0.701) { |
} else if (eb.afstand < 0.701) { |
615 |
return "..." + targetAddress.rute; |
return "..." + targetAddress.ruteMandag; |
616 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 1.001) { |
617 |
return "...." + targetAddress.rute; |
return "...." + targetAddress.ruteMandag; |
618 |
} |
} |
619 |
break; |
break; |
620 |
case "scooter": |
case "scooter": |
621 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
622 |
return "." + targetAddress.rute; |
return "." + targetAddress.ruteMandag; |
623 |
} else if (eb.afstand < 0.801) { |
} else if (eb.afstand < 0.801) { |
624 |
return ".." + targetAddress.rute; |
return ".." + targetAddress.ruteMandag; |
625 |
} else if (eb.afstand < 1.201) { |
} else if (eb.afstand < 1.201) { |
626 |
return "..." + targetAddress.rute; |
return "..." + targetAddress.ruteMandag; |
627 |
} else if (eb.afstand < 2.101) { |
} else if (eb.afstand < 2.101) { |
628 |
return "...." + targetAddress.rute; |
return "...." + targetAddress.ruteMandag; |
629 |
} |
} |
630 |
break; |
break; |
631 |
case "bil": |
case "bil": |
632 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
633 |
return "." + targetAddress.rute; |
return "." + targetAddress.ruteMandag; |
634 |
} else if (eb.afstand < 1.001) { |
} else if (eb.afstand < 1.001) { |
635 |
return ".." + targetAddress.rute; |
return ".." + targetAddress.ruteMandag; |
636 |
} else if (eb.afstand < 1.601) { |
} else if (eb.afstand < 1.601) { |
637 |
return "..." + targetAddress.rute; |
return "..." + targetAddress.ruteMandag; |
638 |
} else if (eb.afstand < 2.601) { |
} else if (eb.afstand < 2.601) { |
639 |
return "...." + targetAddress.rute; |
return "...." + targetAddress.ruteMandag; |
640 |
} |
} |
641 |
break; |
break; |
642 |
|
default: |
643 |
|
System.out.println("Ukendt transport type: " + eb ); |
644 |
} |
} |
645 |
return null; |
return null; |
646 |
} |
} |
647 |
|
|
648 |
public List<Address> getNonCoveredAddresses() { |
public List<Address> getNonCoveredAddresses() { |
649 |
List<Address> result = new ArrayList<Address>(60000); |
return ikkeDaekkedeAdresser; |
650 |
for (Address a : alleAdresser) { |
} |
651 |
if ( a.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
|
652 |
result.add(a); |
public List<Address> get100PctAddresses() { |
653 |
} |
return hundredePctAdresser; |
|
} |
|
|
Collections.sort(result ); |
|
|
return result; |
|
654 |
} |
} |
655 |
|
|
656 |
/////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////// |
661 |
} else { |
} else { |
662 |
inject = ".."; |
inject = ".."; |
663 |
} |
} |
664 |
return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); |
return AddressUtils.injectIntoBk(targetAddress.korelisteMandag, inject); |
665 |
} |
} |
666 |
|
|
|
private Set<String> findVejAliaser(String vejnavn) { |
|
|
vejnavn = vejnavn.toLowerCase(); |
|
|
HashSet<String> aliasSet = new HashSet<String>(); |
|
|
aliasSet.add(vejnavn); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("u", "ü") ); |
|
|
aliasSet.add(vejnavn.replace("ü", "u") ); |
|
|
|
|
|
aliasSet.add(vejnavn.replace("alle", "allé") ); |
|
|
aliasSet.add(vejnavn.replace("allé", "alle") ); |
|
|
|
|
|
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("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("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") ); |
|
|
|
|
|
|
|
|
// 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("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") ); |
|
|
|
|
|
|
|
|
// 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", "å") ); |
|
|
} |
|
|
|
|
|
return aliasSet; |
|
|
} |
|
667 |
|
|
668 |
public Set<Short> getPostnumre() { |
public Set<Short> getPostnumre() { |
669 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
670 |
} |
} |
671 |
|
|
672 |
public Set<Entry<String,Integer>> getVejnavne(int postnr) { |
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
673 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
674 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
|
675 |
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()); |
|
|
} |
|
676 |
|
|
677 |
return newMap.entrySet(); |
return newMap.entrySet(); |
678 |
} |
} |
679 |
|
|
680 |
public Set<String> getHusnumre(long gadeid) { |
public Set<String> getHusnumre(int gadeid) { |
681 |
|
|
682 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
683 |
return new TreeSet<String>( gade.keySet() ); |
|
684 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
685 |
|
for(List<Address> litraList : gade.values()) { |
686 |
|
for (Address a: litraList) { |
687 |
|
set.add( a.husnr + a.husnrbogstav ); |
688 |
|
} |
689 |
|
} |
690 |
|
|
691 |
|
return set; |
692 |
} |
} |
693 |
|
|
694 |
public Address getAdresse(long gadeid, String husnr) { |
public Address getAdresse(int gadeid, String husnrStr) { |
695 |
|
short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") ); |
696 |
|
String litra = husnrStr.replaceAll("\\d", ""); |
697 |
|
|
698 |
|
Map<Short,List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
699 |
|
List<Address> litraList = gade.get(husnr); |
700 |
|
|
701 |
|
for(Address addr : litraList) { |
702 |
|
if (addr.husnrbogstav.equals(litra)) { |
703 |
|
return addr; |
704 |
|
} |
705 |
|
} |
706 |
|
|
707 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
return null; |
|
return gade.get(husnr); |
|
708 |
|
|
709 |
} |
} |
710 |
|
|