1 |
package dk.daoas.daoadresseservice; |
package dk.daoas.daoadresseservice; |
2 |
|
|
3 |
import java.sql.SQLException; |
import java.sql.SQLException; |
4 |
|
import java.text.SimpleDateFormat; |
5 |
|
import java.util.ArrayList; |
6 |
|
import java.util.Collections; |
7 |
|
import java.util.Date; |
8 |
import java.util.HashMap; |
import java.util.HashMap; |
9 |
import java.util.List; |
import java.util.List; |
10 |
import java.util.Map; |
import java.util.Map; |
11 |
|
import java.util.Map.Entry; |
12 |
|
import java.util.Set; |
13 |
|
import java.util.TreeMap; |
14 |
|
import java.util.TreeSet; |
15 |
import java.util.concurrent.ConcurrentHashMap; |
import java.util.concurrent.ConcurrentHashMap; |
16 |
|
|
17 |
import dk.daoas.daoadresseservice.AddressUtils.SplitResult; |
import org.apache.commons.lang3.StringUtils; |
18 |
|
|
19 |
|
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; |
23 |
|
import dk.daoas.daoadresseservice.beans.DataStatisticsBean; |
24 |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
25 |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
26 |
|
import dk.daoas.daoadresseservice.beans.SearchRequest; |
27 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
28 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
29 |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
30 |
|
import dk.daoas.daoadresseservice.util.DaoUtils; |
31 |
|
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
32 |
|
import dk.daoas.daoadresseservice.util.NaturalOrderComparator; |
33 |
|
import dk.daoas.daoadresseservice.util.NearestShortTreeMap; |
34 |
|
|
35 |
public class AdressSearch { |
public class AddressSearch { |
|
|
|
|
Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid; |
|
|
Map<Long, Map<String,Address>> searchGadeidentAdresser; |
|
36 |
|
|
37 |
List<Address> alleAdresser; |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
38 |
|
private Map<Integer, Map<Short, List<Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra |
39 |
|
|
40 |
|
private ArrayList<Address> ikkeDaekkedeAdresser = new ArrayList<Address>(60000); |
41 |
|
private ArrayList<Address> hundredePctAdresser = new ArrayList<Address>(120000); |
42 |
|
|
43 |
|
private Map<String,Integer> helperCache; |
44 |
|
|
45 |
|
private DataStatisticsBean stats = new DataStatisticsBean(); |
46 |
|
|
47 |
Map<Integer,HundredePctBean> hundredePct; |
private DatabaseLayer db; |
48 |
|
private ServiceConfig config; |
49 |
|
|
50 |
|
|
51 |
|
StreetnameHelper levenshteinHelper; |
52 |
|
StreetnameHelper metaphoneHelper; |
53 |
|
StreetnameHelper googleHelper; |
54 |
|
StreetnameHelper osmHelper; |
55 |
|
|
56 |
|
|
57 |
|
public AddressSearch(DatabaseLayer db, ServiceConfig config) { |
58 |
|
|
59 |
|
this.db = db; |
60 |
|
this.config = config; |
61 |
|
|
62 |
|
levenshteinHelper = new LevenshteinStreetnameHelper(); |
63 |
|
metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config); |
64 |
|
googleHelper = new GoogleStreetnameHelper( config ); |
65 |
|
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 |
long start1 = System.currentTimeMillis(); |
return search(postnrStr, adresse, false); |
96 |
|
} |
97 |
|
|
98 |
|
|
99 |
|
public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr) { |
100 |
|
|
101 |
|
postnrStr = postnrStr.trim(); |
102 |
|
adresse = adresse.trim(); |
103 |
|
|
104 |
|
|
105 |
|
SearchRequest request = new SearchRequest(); |
106 |
|
SearchResult result = new SearchResult(); |
107 |
|
|
|
int postnr=0; |
|
108 |
|
|
109 |
try { |
try { |
110 |
postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
111 |
} catch (Exception E) { |
} catch (Exception E) { |
112 |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
113 |
|
return result; |
114 |
} |
} |
|
long start2 = System.currentTimeMillis(); |
|
115 |
|
|
|
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr); |
|
116 |
|
|
117 |
if (postnrVeje == null) { |
request.streetNames = searchPostnrVejnavnGadeid.get(request.postnr); |
118 |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
|
119 |
|
if (request.streetNames == null) { |
120 |
|
result.status = Status.ERROR_UNKNOWN_POSTAL; |
121 |
|
return result; |
122 |
} |
} |
123 |
|
|
|
long start3 = System.currentTimeMillis(); |
|
124 |
|
|
125 |
SplitResult split = AddressUtils.splitAdresse(adresse); |
result.splitResult = AddressUtils.splitAdresse(adresse); |
126 |
String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); |
request.vejnavn = result.splitResult.vej; |
127 |
|
|
128 |
|
|
129 |
|
|
130 |
if (split.husnr.length() == 0) { |
if (result.splitResult.husnr.length() == 0) { |
131 |
return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); |
result.status = Status.ERROR_MISSING_HOUSENUMBER; |
132 |
|
return result; |
133 |
} |
} |
|
long start4 = System.currentTimeMillis(); |
|
134 |
|
|
135 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
136 |
|
|
137 |
|
|
138 |
|
if (result.vasketVejnavn.indexOf("pakkebo") > -1 |
139 |
|
|| result.vasketVejnavn.indexOf("pakkepost") > -1 |
140 |
|
|| result.vasketVejnavn.indexOf("postbo") > -1 // postbox/postboks |
141 |
|
|| result.vasketVejnavn.indexOf("døgnpost") > -1 |
142 |
|
|| result.vasketVejnavn.indexOf("døgnbo") > -1 // døgnbox // døgnboks |
143 |
|
|| result.vasketVejnavn.equals("id") |
144 |
|
) { |
145 |
|
result.status = Status.ERROR_POSTBOX; |
146 |
|
return result; |
147 |
|
} |
148 |
|
|
149 |
|
// LookupStreetname er en indkapsling af alm + levenstein + google + osm |
150 |
|
Integer gadeident = lookupStretname(request, result, true); |
151 |
|
|
152 |
|
|
153 |
|
/* |
154 |
|
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn |
155 |
|
**/ |
156 |
if (gadeident == null) { |
if (gadeident == null) { |
157 |
return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); |
final int MAX_TRIES = 4; |
158 |
|
|
159 |
|
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 |
|
request.vejnavn = subVejnavn; |
165 |
|
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
166 |
|
|
167 |
|
gadeident = lookupStretname(request, result, false);//prøv opslag MEN UDEN GOOGLE/OSM !!! |
168 |
|
|
169 |
|
//hvis vi fandt vejen ud fra substrengen |
170 |
|
if (gadeident != null) { |
171 |
|
break; |
172 |
|
} |
173 |
|
|
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 |
} |
} |
|
long start5 = System.currentTimeMillis(); |
|
179 |
|
|
180 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle |
|
181 |
|
|
182 |
long start6 = System.currentTimeMillis(); |
if (gadeident == null) { |
183 |
|
result.status = Status.ERROR_UNKNOWN_STREETNAME; |
184 |
|
return result; |
185 |
|
} |
186 |
|
|
187 |
String husnrSearch = "" + split.husnr + split.litra; |
result.gadeident = gadeident; |
188 |
Address addr = gade.get(husnrSearch); |
|
189 |
long start7 = System.currentTimeMillis(); |
|
190 |
if (addr == null) { |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident); |
191 |
return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); |
if (gade == null) { //Denne søgning må ikke fejle |
192 |
|
result.status = Status.ERROR_INTERNAL; |
193 |
|
return result; |
194 |
} |
} |
195 |
|
|
196 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
|
197 |
return new SearchResult(Status.STATUS_NOT_COVERED); |
|
198 |
|
//Kunne evt klares med Iterables.get fra Guava/Collections |
199 |
|
Address firstAddress = gade.values().iterator().next().get(0); //Første husnr -> første litra |
200 |
|
result.vej = firstAddress.vejnavn; |
201 |
|
|
202 |
|
short husnrSearch = Short.parseShort(result.splitResult.husnr ); |
203 |
|
List<Address> litraList = gade.get(husnrSearch); |
204 |
|
|
205 |
|
|
206 |
|
if (litraList == null) { //Husnr ikke fundet |
207 |
|
|
208 |
|
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.distributor.equals("LUKKET")) { |
if (addr == null) { //litra ikke fundet |
231 |
return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? |
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 |
System.out.println("Search2: " + (start2-start1) ); |
result.address = addr; |
242 |
System.out.println("Search3: " + (start3-start1) ); |
|
243 |
System.out.println("Search4: " + (start4-start1) ); |
|
244 |
System.out.println("Search5: " + (start5-start1) ); |
if ( StringUtils.equals(addr.distributor, "LUKKET") ) { |
245 |
System.out.println("Search6: " + (start6-start1) ); |
result.status = Status.STATUS_NOT_COVERED; //Skal vi have en special status til Lukkede adresser ? |
246 |
System.out.println("Search7: " + (start7-start1) ); |
return result; |
247 |
|
} |
248 |
|
|
249 |
|
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { |
250 |
|
result.status = Status.STATUS_NOT_COVERED; |
251 |
|
return result; |
252 |
|
} |
253 |
|
|
|
|
|
254 |
|
|
255 |
return new SearchResult(addr); |
result.status = Status.STATUS_OK; |
256 |
|
|
257 |
|
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 |
|
// google har en hard request limit, men OSM har en fair usage policy! |
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) { |
302 |
|
if (vej == null) |
303 |
|
return null; |
304 |
|
|
305 |
|
String vejVasket = AddressUtils.vaskVejnavn( vej ); |
306 |
|
Integer gadeident = postnrVeje.get(vejVasket); |
307 |
|
|
308 |
|
if (gadeident != null) { |
309 |
|
helperCache.put(helperSearchKey, gadeident); |
310 |
|
} |
311 |
|
return gadeident; |
312 |
|
|
313 |
|
} |
314 |
|
|
315 |
|
public Map<String,Integer> getStretsByPostal(short zip) { |
316 |
|
return searchPostnrVejnavnGadeid.get(zip); |
317 |
|
} |
318 |
|
|
319 |
|
|
320 |
|
|
321 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
322 |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
323 |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Integer, Map<Short, List<Address>>>(); |
324 |
|
helperCache = new ConcurrentHashMap<String,Integer>(); |
325 |
|
|
326 |
|
// ////////////////////// |
327 |
|
// Start stage1 |
328 |
|
|
329 |
|
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 |
|
|
338 |
|
|
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,Long> 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,Long>(); |
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 |
|
|
359 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
360 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
361 |
if (gadeident == null) { |
if (gadeident == null) { |
362 |
postnrVeje.put(vasketVejnavn, a.gadeid); |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
363 |
|
|
364 |
|
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 |
|
|
371 |
} |
} |
372 |
|
|
373 |
Map<String, Address> gade = searchGadeidentAdresser.get(a.gadeid); |
|
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(a.gadeid, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
378 |
|
} |
379 |
|
|
380 |
|
List<Address> litraList = gade.get(a.husnr); |
381 |
|
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(); |
403 |
|
System.out.println("Build, stage1 elapsed: " + (start2-start1) ); |
404 |
|
System.out.println("Build -- stage 2 alias tabel"); |
405 |
|
|
406 |
|
int vaskCount = 0; |
407 |
|
List<AliasBean> aliasList = db.getAliasList(); |
408 |
|
for (AliasBean alias : aliasList) { |
409 |
|
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
410 |
|
|
411 |
|
if (postnrVeje == null) { |
412 |
|
//Burde ikke kunne ske - men better safe than sorry |
413 |
|
continue; |
414 |
|
} |
415 |
|
|
416 |
|
String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn); |
417 |
|
String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn); |
418 |
|
|
419 |
|
Integer gadeident = postnrVeje.get(vasketVej); |
420 |
|
if (gadeident == null) { |
421 |
|
//Kender ikke den oprindelige vej |
422 |
|
continue; |
423 |
} |
} |
424 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
|
425 |
gade.put(husnrSearch, a); |
Integer aliasIdent = postnrVeje.get(vasketAlias); |
426 |
|
|
427 |
|
if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet |
428 |
|
postnrVeje.put(vasketAlias, gadeident); |
429 |
|
vaskCount++; |
430 |
|
} |
431 |
|
|
432 |
} |
} |
433 |
|
System.out.println("Anvendte " + vaskCount + " aliaser fra databasen"); |
434 |
|
|
435 |
|
aliasList.clear();//cleanup inden stage3 |
436 |
|
|
437 |
|
|
438 |
//////////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////////// |
439 |
System.out.println("Build -- stage 2 udvidet dækning"); |
long start3 = System.currentTimeMillis(); |
440 |
|
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
441 |
|
System.out.println("Build -- stage 3 udvidet dækning"); |
442 |
|
|
443 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
444 |
|
|
445 |
|
List<ExtendedBean> extDao = db.getExtendedAdresslist(); |
446 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
447 |
|
|
448 |
Address orgAddress = idAddressMap.get(eb.orgId); |
Address orgAddress = idAddressMap.get(eb.orgId); |
449 |
if (orgAddress == null) |
if (orgAddress == null) { |
450 |
continue; |
continue; |
451 |
|
} |
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 |
|
|
|
orgAddress.extTarget = targetAddress; |
|
|
orgAddress.extAfstand = eb.afstand; |
|
474 |
|
|
475 |
boolean covered = false; |
|
476 |
|
short modifyCounter = 0; |
477 |
|
|
478 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
479 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); |
480 |
if (orgAddress.rute != null) { |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); |
481 |
orgAddress.koreliste = targetAddress.koreliste; |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); |
482 |
covered = true; |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); |
483 |
} |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); |
484 |
|
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); |
485 |
|
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); |
486 |
} |
} |
487 |
|
|
488 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
489 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper); |
490 |
if (orgAddress.koreliste != null) { |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper); |
491 |
orgAddress.rute = targetAddress.rute; |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper); |
492 |
covered = true; |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper); |
493 |
} |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper); |
494 |
|
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper); |
495 |
|
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper); |
496 |
} |
} |
497 |
|
|
498 |
if (covered) { //Kopier resten af felterne |
|
499 |
|
if (modifyCounter > 0) { |
500 |
|
orgAddress.extTarget = targetAddress; |
501 |
|
orgAddress.extAfstand = eb.afstand; |
502 |
|
} |
503 |
|
|
504 |
|
if (modifyCounter>0 && orgAddress.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { //Kopier resten af felterne |
505 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET; |
506 |
orgAddress.dbkBane = targetAddress.dbkBane; |
orgAddress.dbkBane = targetAddress.dbkBane; |
507 |
|
|
508 |
/* Sådan gør den gamle service */ |
/* Sådan gør den gamle service */ |
509 |
orgAddress.kommunekode = targetAddress.kommunekode; |
/* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/ |
510 |
orgAddress.vejkode = targetAddress.vejkode; |
//orgAddress.kommunekode = targetAddress.kommunekode; |
511 |
|
//orgAddress.vejkode = targetAddress.vejkode; |
512 |
|
|
513 |
|
|
514 |
orgAddress.distributor = targetAddress.distributor; |
orgAddress.distributor = targetAddress.distributor; |
515 |
} |
} |
516 |
} |
} |
517 |
|
|
518 |
// nu skal vi ikke bruge idAddressMap længere |
// cleanup inden stage 4 |
519 |
idAddressMap = null; |
idAddressMap = null; |
520 |
|
ruteHelper = null; |
521 |
|
|
522 |
////////////////////////////////////////////////////////////////////////////////////// |
////////////////////////////////////////////////////////////////////////////////////// |
523 |
System.out.println("Build -- stage 3 - 100pct"); |
long start4 = System.currentTimeMillis(); |
524 |
|
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
525 |
|
System.out.println("Build -- stage 4 - 100pct"); |
526 |
|
|
527 |
hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = db.get100PctList(); |
528 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
529 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
|
|
continue; |
|
|
} |
|
530 |
|
|
531 |
if (addr.distributor != null && addr.distributor.equals("LUKKET")) { |
if (addr.distributor != null && addr.distributor.equals("LUKKET")) { |
532 |
continue; |
continue; |
533 |
} |
} |
534 |
|
|
535 |
|
|
536 |
HundredePctBean bean = hundredePct.get(addr.postnr); |
HundredePctBean bean = hundredePct.get(addr.postnr); |
538 |
continue; |
continue; |
539 |
} |
} |
540 |
|
|
541 |
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
short modifyCounter = 0; |
542 |
addr.rute = bean.rute; |
modifyCounter += updateRouting100Pct(bean, addr.routingMandag); |
543 |
addr.koreliste = bean.koreliste; |
modifyCounter += updateRouting100Pct(bean, addr.routingTirsdag); |
544 |
addr.dbkBane = bean.dbkBane; |
modifyCounter += updateRouting100Pct(bean, addr.routingOnsdag); |
545 |
addr.distributor = bean.distributor; |
modifyCounter += updateRouting100Pct(bean, addr.routingTorsdag); |
546 |
|
modifyCounter += updateRouting100Pct(bean, addr.routingFredag); |
547 |
|
modifyCounter += updateRouting100Pct(bean, addr.routingLordag); |
548 |
|
modifyCounter += updateRouting100Pct(bean, addr.routingSondag); |
549 |
|
|
550 |
|
|
551 |
|
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) { |
552 |
|
addr.daekningsType = DaekningsType.DAEKNING_100PCT; |
553 |
|
addr.dbkBane = bean.dbkBane; |
554 |
|
addr.distributor = bean.distributor; |
555 |
|
} |
556 |
|
|
557 |
|
|
558 |
|
|
559 |
} |
} |
560 |
|
|
561 |
//////////////////////////////////////////////////////////////////////////////////// |
//////////////////////////////////////////////////////////////////////////////////// |
562 |
|
long stop = System.currentTimeMillis(); |
563 |
|
System.out.println("Build, stage4 elapsed: " + (stop-start4) ); |
564 |
System.out.println("Build -- Gathering statistics"); |
System.out.println("Build -- Gathering statistics"); |
565 |
|
|
|
int direkteCount = 0; |
|
|
int extendedCount = 0; |
|
|
int hundredePctCount = 0; |
|
|
int ikkeDaekketCount = 0; |
|
|
|
|
566 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
567 |
switch (addr.daekningsType) { |
switch (addr.daekningsType) { |
568 |
case DAEKNING_DIREKTE: |
case DAEKNING_DIREKTE: |
569 |
direkteCount++; |
stats.direkteCount++; |
570 |
break; |
break; |
571 |
case DAEKNING_UDVIDET: |
case DAEKNING_UDVIDET: |
572 |
extendedCount++; |
stats.extendedCount++; |
573 |
break; |
break; |
574 |
case DAEKNING_100PCT: |
case DAEKNING_100PCT: |
575 |
hundredePctCount++; |
hundredePctAdresser.add(addr); |
576 |
|
stats.hundredePctCount++; |
577 |
break; |
break; |
578 |
default: |
default: |
579 |
ikkeDaekketCount++; |
ikkeDaekkedeAdresser.add(addr); |
580 |
|
stats.ikkeDaekketCount++; |
581 |
} |
} |
582 |
} |
} |
583 |
|
stats.totalCount = alleAdresser.size(); |
584 |
|
|
585 |
|
ikkeDaekkedeAdresser.trimToSize(); |
586 |
|
hundredePctAdresser.trimToSize(); |
587 |
|
Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet |
588 |
|
Collections.sort( hundredePctAdresser ); |
589 |
|
|
590 |
|
|
591 |
System.out.println("Build: direkteCount: " + direkteCount); |
stats.elapsed = stop-start1; |
592 |
System.out.println("Build: extendedCount: " + extendedCount); |
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() ); |
|
System.out.println("Build: hundredePctCount: " + hundredePctCount); |
|
|
System.out.println("Build: ikkeDaekketCount: " + ikkeDaekketCount); |
|
593 |
|
|
594 |
|
System.out.println("Build: totalCount: " + stats.totalCount); |
595 |
|
System.out.println("Build: direkteCount: " + stats.direkteCount); |
596 |
|
System.out.println("Build: extendedCount: " + stats.extendedCount); |
597 |
|
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount); |
598 |
|
System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount); |
599 |
|
|
600 |
|
System.out.println("Build: Total Elapsed: " + (stop-start1) ); |
601 |
System.out.println("Build Completed"); |
System.out.println("Build Completed"); |
602 |
|
|
603 |
} |
} |
604 |
|
|
605 |
|
|
606 |
|
public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
607 |
|
if (source.rute != null) { |
608 |
|
return 0; |
609 |
|
} |
610 |
|
|
611 |
|
source.rute = calculateExtendedBkRoute(bean, target); |
612 |
|
source.rute = ruteHelper.getInstance(source.rute); |
613 |
|
|
614 |
|
if (source.rute != null) { |
615 |
|
source.koreliste = target.koreliste; |
616 |
|
return 1; |
617 |
|
} else { |
618 |
|
return 0; |
619 |
|
} |
620 |
|
} |
621 |
|
|
622 |
|
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) { |
623 |
|
if (source.rute != null) { |
624 |
|
return 0; |
625 |
|
} |
626 |
|
|
627 |
|
source.rute = calculateExtendedDaoRoute(bean, target); |
628 |
|
source.rute = ruteHelper.getInstance(source.rute); |
629 |
|
|
630 |
|
if (source.rute != null) { |
631 |
|
source.koreliste = target.koreliste; |
632 |
|
return 1; |
633 |
|
} else { |
634 |
|
return 0; |
635 |
|
} |
636 |
|
|
637 |
|
} |
638 |
|
|
639 |
|
public short updateRouting100Pct(HundredePctBean bean, RoutingInfo routing) { |
640 |
|
if (routing.rute == null) { |
641 |
|
routing.rute = bean.rute; |
642 |
|
routing.koreliste = bean.koreliste; |
643 |
|
return 1; |
644 |
|
} else { |
645 |
|
return 0; |
646 |
|
} |
647 |
|
} |
648 |
|
|
649 |
|
public DataStatisticsBean getStatistics() { |
650 |
|
return stats; |
651 |
|
} |
652 |
|
|
653 |
|
public DatabaseLayer getDatabaseLayer() { |
654 |
|
return db; |
655 |
|
} |
656 |
|
|
657 |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
public void clear() { |
658 |
|
searchPostnrVejnavnGadeid.clear(); |
659 |
|
searchGadeidentAdresser.clear(); |
660 |
|
helperCache.clear(); |
661 |
|
} |
662 |
|
|
663 |
|
|
664 |
|
private String calculateExtendedDaoRoute(ExtendedBean eb, RoutingInfo targetRoute) { |
665 |
|
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
666 |
|
return null; |
667 |
|
} |
668 |
|
|
669 |
|
if (eb.transport == null) { |
670 |
|
System.out.println("NULL transport type ved rute " + targetRoute.rute ); |
671 |
|
return null; |
672 |
|
} |
673 |
|
|
674 |
// /////////////////////////////////////////////////////////////////// |
// /////////////////////////////////////////////////////////////////// |
675 |
switch( eb.transport) { |
switch( eb.transport) { |
676 |
case "cykel": |
case "cykel": |
677 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
678 |
return "." + targetAddress.rute; |
return "." + targetRoute.rute; |
679 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 0.501) { |
680 |
return ".." + targetAddress.rute; |
return ".." + targetRoute.rute; |
681 |
} else if (eb.afstand < 0.701) { |
} else if (eb.afstand < 0.701) { |
682 |
return "..." + targetAddress.rute; |
return "..." + targetRoute.rute; |
683 |
} else if (eb.afstand < 0.501) { |
} else if (eb.afstand < 1.001) { |
684 |
return "...." + targetAddress.rute; |
return "...." + targetRoute.rute; |
685 |
} |
} |
686 |
break; |
break; |
687 |
case "scooter": |
case "scooter": |
688 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
689 |
return "." + targetAddress.rute; |
return "." + targetRoute.rute; |
690 |
} else if (eb.afstand < 0.801) { |
} else if (eb.afstand < 0.801) { |
691 |
return ".." + targetAddress.rute; |
return ".." + targetRoute.rute; |
692 |
} else if (eb.afstand < 1.201) { |
} else if (eb.afstand < 1.201) { |
693 |
return "..." + targetAddress.rute; |
return "..." + targetRoute.rute; |
694 |
} else if (eb.afstand < 2.101) { |
} else if (eb.afstand < 2.101) { |
695 |
return "...." + targetAddress.rute; |
return "...." + targetRoute.rute; |
696 |
} |
} |
697 |
break; |
break; |
698 |
case "bil": |
case "bil": |
699 |
if (eb.afstand < 0.151) { |
if (eb.afstand < 0.151) { |
700 |
return "." + targetAddress.rute; |
return "." + targetRoute.rute; |
701 |
} else if (eb.afstand < 1.001) { |
} else if (eb.afstand < 1.001) { |
702 |
return ".." + targetAddress.rute; |
return ".." + targetRoute.rute; |
703 |
} else if (eb.afstand < 1.601) { |
} else if (eb.afstand < 1.601) { |
704 |
return "..." + targetAddress.rute; |
return "..." + targetRoute.rute; |
705 |
} else if (eb.afstand < 2.601) { |
} else if (eb.afstand < 2.601) { |
706 |
return "...." + targetAddress.rute; |
return "...." + targetRoute.rute; |
707 |
} |
} |
708 |
break; |
break; |
709 |
|
default: |
710 |
|
System.out.println("Ukendt transport type: " + eb ); |
711 |
} |
} |
712 |
return null; |
return null; |
713 |
} |
} |
714 |
|
|
715 |
|
public List<Address> getNonCoveredAddresses() { |
716 |
|
return ikkeDaekkedeAdresser; |
717 |
|
} |
718 |
|
|
719 |
|
public List<Address> get100PctAddresses() { |
720 |
|
return hundredePctAdresser; |
721 |
|
} |
722 |
|
|
723 |
/////////////////////////////////////////////////////////// |
/////////////////////////////////////////////////////////// |
724 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
|
725 |
|
|
726 |
|
private String calculateExtendedBkRoute(ExtendedBean eb, RoutingInfo targetRoute) { |
727 |
|
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
728 |
|
return null; |
729 |
|
} |
730 |
|
|
731 |
String inject; |
String inject; |
732 |
if (eb.afstand <= 0.500) { |
if (eb.afstand <= 0.500) { |
733 |
inject = "."; |
inject = "."; |
734 |
} else { |
} else { |
735 |
inject = ".."; |
inject = ".."; |
736 |
} |
} |
737 |
return AddressUtils.injectIntoBk(targetAddress.koreliste, inject); |
return inject + targetRoute.rute; |
738 |
|
} |
739 |
|
|
740 |
|
|
741 |
|
public Set<Short> getPostnumre() { |
742 |
|
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
743 |
|
} |
744 |
|
|
745 |
|
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
746 |
|
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
747 |
|
|
748 |
|
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering |
749 |
|
|
750 |
|
return newMap.entrySet(); |
751 |
} |
} |
752 |
|
|
753 |
|
public Set<String> getHusnumre(int gadeid) { |
754 |
|
|
755 |
|
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
756 |
|
|
757 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
758 |
|
for(List<Address> litraList : gade.values()) { |
759 |
|
for (Address a: litraList) { |
760 |
|
set.add( a.husnr + a.husnrbogstav ); |
761 |
|
} |
762 |
|
} |
763 |
|
|
764 |
|
return set; |
765 |
|
} |
766 |
|
|
767 |
|
public Address getAdresse(int gadeid, String husnrStr) { |
768 |
|
short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") ); |
769 |
|
String litra = husnrStr.replaceAll("\\d", ""); |
770 |
|
|
771 |
|
Map<Short,List<Address>> gade = searchGadeidentAdresser.get(gadeid); |
772 |
|
List<Address> litraList = gade.get(husnr); |
773 |
|
|
774 |
|
for(Address addr : litraList) { |
775 |
|
if (addr.husnrbogstav.equals(litra)) { |
776 |
|
return addr; |
777 |
|
} |
778 |
|
} |
779 |
|
|
780 |
|
return null; |
781 |
|
|
782 |
|
} |
783 |
|
|
784 |
} |
} |