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 |
2274 |
import java.util.List;
|
10 |
|
|
import java.util.Map;
|
11 |
torben |
2484 |
import java.util.Map.Entry;
|
12 |
torben |
2292 |
import java.util.Set;
|
13 |
torben |
2484 |
import java.util.TreeMap;
|
14 |
|
|
import java.util.TreeSet;
|
15 |
torben |
2274 |
import java.util.concurrent.ConcurrentHashMap;
|
16 |
torben |
2267 |
|
17 |
torben |
2381 |
import org.apache.commons.lang3.StringUtils;
|
18 |
|
|
|
19 |
torben |
2346 |
import dk.daoas.daoadresseservice.admin.ServiceConfig;
|
20 |
torben |
2282 |
import dk.daoas.daoadresseservice.beans.Address;
|
21 |
torben |
2395 |
import dk.daoas.daoadresseservice.beans.AliasBean;
|
22 |
torben |
2337 |
import dk.daoas.daoadresseservice.beans.DataStatisticsBean;
|
23 |
torben |
2282 |
import dk.daoas.daoadresseservice.beans.ExtendedBean;
|
24 |
|
|
import dk.daoas.daoadresseservice.beans.HundredePctBean;
|
25 |
torben |
2411 |
import dk.daoas.daoadresseservice.beans.SearchRequest;
|
26 |
torben |
2282 |
import dk.daoas.daoadresseservice.beans.SearchResult;
|
27 |
|
|
import dk.daoas.daoadresseservice.beans.SearchResult.Status;
|
28 |
torben |
2274 |
import dk.daoas.daoadresseservice.db.DatabaseLayer;
|
29 |
torben |
2557 |
import dk.daoas.daoadresseservice.util.DaoUtils;
|
30 |
torben |
2491 |
import dk.daoas.daoadresseservice.util.DeduplicateHelper;
|
31 |
torben |
2495 |
import dk.daoas.daoadresseservice.util.NaturalOrderComparator;
|
32 |
torben |
2785 |
import dk.daoas.daoadresseservice.util.NearestShortTreeMap;
|
33 |
torben |
2274 |
|
34 |
torben |
2410 |
public class AddressSearch {
|
35 |
torben |
2267 |
|
36 |
torben |
2490 |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid;
|
37 |
torben |
2835 |
private Map<Integer, Map<Short, List<Address>>> searchGadeidentAdresser; // Gadeident -> husnrumre -> litra
|
38 |
torben |
2783 |
|
39 |
torben |
2837 |
private ArrayList<Address> ikkeDaekkedeAdresser = new ArrayList<Address>(60000);
|
40 |
|
|
private ArrayList<Address> hundredePctAdresser = new ArrayList<Address>(120000);
|
41 |
torben |
2267 |
|
42 |
torben |
2490 |
private Map<String,Integer> helperCache;
|
43 |
torben |
2267 |
|
44 |
torben |
2350 |
private DataStatisticsBean stats = new DataStatisticsBean();
|
45 |
torben |
2303 |
|
46 |
torben |
2608 |
private DatabaseLayer db;
|
47 |
torben |
2784 |
private ServiceConfig config;
|
48 |
torben |
2608 |
|
49 |
torben |
2280 |
|
50 |
torben |
2411 |
StreetnameHelper levenshteinHelper;
|
51 |
torben |
2778 |
StreetnameHelper metaphoneHelper;
|
52 |
torben |
2409 |
StreetnameHelper googleHelper;
|
53 |
|
|
StreetnameHelper osmHelper;
|
54 |
|
|
|
55 |
torben |
2411 |
|
56 |
torben |
2608 |
public AddressSearch(DatabaseLayer db, ServiceConfig config) {
|
57 |
torben |
2409 |
|
58 |
torben |
2608 |
this.db = db;
|
59 |
torben |
2784 |
this.config = config;
|
60 |
torben |
2608 |
|
61 |
torben |
2943 |
levenshteinHelper = new LevenshteinStreetnameHelper();
|
62 |
torben |
2778 |
metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config);
|
63 |
torben |
2409 |
googleHelper = new GoogleStreetnameHelper( config );
|
64 |
|
|
osmHelper = new OSMStreetnameHelper( config );
|
65 |
torben |
2350 |
}
|
66 |
|
|
|
67 |
torben |
2783 |
public Address getAddressSafe(int gadeid, short husnr, String litra) throws Exception {
|
68 |
torben |
2758 |
|
69 |
torben |
2835 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid);
|
70 |
torben |
2758 |
|
71 |
|
|
if (gade == null) {
|
72 |
|
|
throw new Exception("GadeID ikke fundet");
|
73 |
|
|
}
|
74 |
|
|
|
75 |
torben |
2835 |
List<Address> litraList = gade.get(husnr);
|
76 |
torben |
2758 |
|
77 |
torben |
2835 |
Address addr = null;
|
78 |
|
|
for(Address a : litraList) {
|
79 |
|
|
if (a.husnrbogstav.equals(litra) ) {
|
80 |
|
|
addr = a;
|
81 |
|
|
break;
|
82 |
|
|
}
|
83 |
|
|
}
|
84 |
torben |
2783 |
|
85 |
torben |
2758 |
if (addr == null) {
|
86 |
|
|
throw new Exception("Adresse ikke ikke fundet");
|
87 |
|
|
}
|
88 |
|
|
|
89 |
|
|
return addr;
|
90 |
|
|
}
|
91 |
torben |
2350 |
|
92 |
torben |
2785 |
|
93 |
|
|
public SearchResult search(String postnrStr, String adresse) {
|
94 |
|
|
return search(postnrStr, adresse, false);
|
95 |
|
|
}
|
96 |
torben |
2758 |
|
97 |
torben |
2785 |
|
98 |
|
|
public SearchResult search(String postnrStr, String adresse, boolean naermesteHusnr) {
|
99 |
torben |
2504 |
|
100 |
|
|
postnrStr = postnrStr.trim();
|
101 |
|
|
adresse = adresse.trim();
|
102 |
|
|
|
103 |
|
|
|
104 |
torben |
2411 |
SearchRequest request = new SearchRequest();
|
105 |
torben |
2359 |
SearchResult result = new SearchResult();
|
106 |
|
|
|
107 |
torben |
2267 |
|
108 |
torben |
2274 |
try {
|
109 |
torben |
2494 |
request.postnr = Short.parseShort(postnrStr);
|
110 |
torben |
2274 |
} catch (Exception E) {
|
111 |
torben |
2359 |
result.status = Status.ERROR_UNKNOWN_POSTAL;
|
112 |
|
|
return result;
|
113 |
torben |
2274 |
}
|
114 |
|
|
|
115 |
|
|
|
116 |
torben |
2411 |
request.streetNames = searchPostnrVejnavnGadeid.get(request.postnr);
|
117 |
|
|
|
118 |
|
|
if (request.streetNames == null) {
|
119 |
torben |
2359 |
result.status = Status.ERROR_UNKNOWN_POSTAL;
|
120 |
|
|
return result;
|
121 |
torben |
2267 |
}
|
122 |
|
|
|
123 |
torben |
2288 |
|
124 |
torben |
2372 |
result.splitResult = AddressUtils.splitAdresse(adresse);
|
125 |
torben |
2411 |
request.vejnavn = result.splitResult.vej;
|
126 |
|
|
|
127 |
torben |
2358 |
|
128 |
torben |
2267 |
|
129 |
torben |
2372 |
if (result.splitResult.husnr.length() == 0) {
|
130 |
torben |
2359 |
result.status = Status.ERROR_MISSING_HOUSENUMBER;
|
131 |
|
|
return result;
|
132 |
torben |
2274 |
}
|
133 |
torben |
2267 |
|
134 |
torben |
2550 |
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
|
135 |
torben |
2358 |
|
136 |
torben |
2415 |
|
137 |
torben |
2550 |
if (result.vasketVejnavn.indexOf("pakkebo") > -1
|
138 |
|
|
|| result.vasketVejnavn.indexOf("pakkepost") > -1
|
139 |
|
|
|| result.vasketVejnavn.indexOf("postbo") > -1 // postbox/postboks
|
140 |
|
|
|| result.vasketVejnavn.indexOf("døgnpost") > -1
|
141 |
|
|
|| result.vasketVejnavn.indexOf("døgnbo") > -1 // døgnbox // døgnboks
|
142 |
|
|
|| result.vasketVejnavn.equals("id")
|
143 |
torben |
2416 |
) {
|
144 |
torben |
2414 |
result.status = Status.ERROR_POSTBOX;
|
145 |
|
|
return result;
|
146 |
|
|
}
|
147 |
|
|
|
148 |
torben |
2556 |
// LookupStreetname er en indkapsling af alm + levenstein + google + osm
|
149 |
torben |
2558 |
Integer gadeident = lookupStretname(request, result, true);
|
150 |
torben |
2301 |
|
151 |
torben |
2305 |
|
152 |
torben |
2556 |
/*
|
153 |
torben |
2557 |
* Hvis der ikke er direkte hits, prøver vi at skære ord af vejnavn
|
154 |
torben |
2556 |
*
|
155 |
torben |
2557 |
* <strike>Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt</strike>*/
|
156 |
torben |
2388 |
if (gadeident == null) {
|
157 |
torben |
2557 |
final int MAX_TRIES = 4;
|
158 |
|
|
|
159 |
torben |
2556 |
String vejnavnParts[] = request.vejnavn.split(" ");
|
160 |
|
|
|
161 |
torben |
2557 |
for (int i=1; i<=MAX_TRIES && i<vejnavnParts.length; i++) {
|
162 |
torben |
2556 |
String subVejnavn = DaoUtils.joinHelper(vejnavnParts, i);
|
163 |
|
|
|
164 |
|
|
request.vejnavn = subVejnavn;
|
165 |
|
|
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
|
166 |
|
|
|
167 |
torben |
2558 |
gadeident = lookupStretname(request, result, false);//prøv opslag MEN UDEN GOOGLE/OSM !!!
|
168 |
torben |
2556 |
|
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 |
torben |
2557 |
}
|
179 |
torben |
2303 |
|
180 |
torben |
2383 |
|
181 |
|
|
|
182 |
torben |
2359 |
if (gadeident == null) {
|
183 |
|
|
result.status = Status.ERROR_UNKNOWN_STREETNAME;
|
184 |
|
|
return result;
|
185 |
torben |
2288 |
}
|
186 |
torben |
2274 |
|
187 |
torben |
2397 |
result.gadeident = gadeident;
|
188 |
torben |
2395 |
|
189 |
torben |
2397 |
|
190 |
torben |
2835 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident);
|
191 |
torben |
2359 |
if (gade == null) { //Denne søgning må ikke fejle
|
192 |
|
|
result.status = Status.ERROR_INTERNAL;
|
193 |
|
|
return result;
|
194 |
|
|
}
|
195 |
torben |
2274 |
|
196 |
|
|
|
197 |
torben |
2835 |
|
198 |
torben |
2405 |
//Kunne evt klares med Iterables.get fra Guava/Collections
|
199 |
torben |
2835 |
Address firstAddress = gade.values().iterator().next().get(0); //Første husnr -> første litra
|
200 |
torben |
2405 |
result.vej = firstAddress.vejnavn;
|
201 |
|
|
|
202 |
torben |
2783 |
short husnrSearch = Short.parseShort(result.splitResult.husnr );
|
203 |
torben |
2835 |
List<Address> litraList = gade.get(husnrSearch);
|
204 |
torben |
2783 |
|
205 |
torben |
2298 |
|
206 |
torben |
2783 |
if (litraList == null) { //Husnr ikke fundet
|
207 |
torben |
2785 |
|
208 |
|
|
if (naermesteHusnr) {
|
209 |
torben |
2835 |
TreeMap<Short, List<Address>> gadeTreeMap = (TreeMap<Short, List<Address>>) gade;
|
210 |
torben |
2785 |
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 |
torben |
2274 |
}
|
221 |
torben |
2276 |
|
222 |
torben |
2835 |
Address addr = null;
|
223 |
|
|
for(Address a : litraList) {
|
224 |
|
|
if ( a.husnrbogstav.equals( result.splitResult.litra ) ) {
|
225 |
|
|
addr = a;
|
226 |
|
|
break;
|
227 |
|
|
}
|
228 |
|
|
}
|
229 |
torben |
2783 |
|
230 |
torben |
2785 |
if (addr == null) { //litra ikke fundet
|
231 |
torben |
2804 |
if (config.nearestLitra == true || naermesteHusnr == true) {
|
232 |
torben |
2784 |
result.nearestLitra = true;
|
233 |
torben |
2835 |
addr = litraList.get(0);
|
234 |
torben |
2784 |
} else {
|
235 |
|
|
//husnr fundet men litra blev ikke fundet
|
236 |
|
|
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT;
|
237 |
|
|
return result;
|
238 |
|
|
}
|
239 |
torben |
2783 |
}
|
240 |
|
|
|
241 |
torben |
2359 |
result.address = addr;
|
242 |
|
|
|
243 |
torben |
2381 |
|
244 |
|
|
if ( StringUtils.equals(addr.distributor, "LUKKET") ) {
|
245 |
torben |
2359 |
result.status = Status.STATUS_NOT_COVERED; //Skal vi have en special status til Lukkede adresser ?
|
246 |
|
|
return result;
|
247 |
|
|
}
|
248 |
|
|
|
249 |
torben |
2276 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
|
250 |
torben |
2359 |
result.status = Status.STATUS_NOT_COVERED;
|
251 |
|
|
return result;
|
252 |
torben |
2276 |
}
|
253 |
torben |
2359 |
|
254 |
torben |
2277 |
|
255 |
torben |
2359 |
result.status = Status.STATUS_OK;
|
256 |
|
|
|
257 |
|
|
return result;
|
258 |
torben |
2267 |
}
|
259 |
torben |
2556 |
|
260 |
|
|
|
261 |
torben |
2558 |
private Integer lookupStretname(SearchRequest request, SearchResult result, boolean useExternal) {
|
262 |
|
|
String helperSearchKey = "";
|
263 |
|
|
|
264 |
torben |
2556 |
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 |
torben |
2778 |
if (gadeident == null) {
|
280 |
torben |
2788 |
String vej = metaphoneHelper.proposeStreetName(request, result);
|
281 |
torben |
2778 |
if (vej != null) {
|
282 |
|
|
gadeident = request.streetNames.get(vej);
|
283 |
|
|
}
|
284 |
|
|
}
|
285 |
torben |
2556 |
|
286 |
torben |
2778 |
|
287 |
torben |
2556 |
// Brug OpenStreetMap før vi prøver google
|
288 |
|
|
// For google har en request limit, det har OSM ikke!
|
289 |
torben |
2557 |
if ( gadeident == null && useExternal) {
|
290 |
torben |
2556 |
String vej = osmHelper.proposeStreetName(request, result);
|
291 |
|
|
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
|
292 |
|
|
}
|
293 |
|
|
|
294 |
torben |
2557 |
if ( gadeident == null && useExternal) {
|
295 |
torben |
2556 |
String vej = googleHelper.proposeStreetName(request, result);
|
296 |
|
|
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
|
297 |
|
|
}
|
298 |
|
|
return gadeident;
|
299 |
|
|
}
|
300 |
torben |
2267 |
|
301 |
torben |
2490 |
private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) {
|
302 |
torben |
2395 |
if (vej == null)
|
303 |
|
|
return null;
|
304 |
|
|
|
305 |
|
|
String vejVasket = AddressUtils.vaskVejnavn( vej );
|
306 |
torben |
2490 |
Integer gadeident = postnrVeje.get(vejVasket);
|
307 |
torben |
2395 |
|
308 |
|
|
if (gadeident != null) {
|
309 |
|
|
helperCache.put(helperSearchKey, gadeident);
|
310 |
|
|
}
|
311 |
|
|
return gadeident;
|
312 |
|
|
|
313 |
|
|
}
|
314 |
torben |
2274 |
|
315 |
torben |
2540 |
public Map<String,Integer> getStretsByPostal(short zip) {
|
316 |
torben |
2411 |
return searchPostnrVejnavnGadeid.get(zip);
|
317 |
|
|
}
|
318 |
torben |
2395 |
|
319 |
|
|
|
320 |
|
|
|
321 |
torben |
2274 |
public void buildSearchStructures() throws SQLException{
|
322 |
torben |
2490 |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>();
|
323 |
torben |
2835 |
searchGadeidentAdresser = new HashMap<Integer, Map<Short, List<Address>>>();
|
324 |
torben |
2490 |
helperCache = new ConcurrentHashMap<String,Integer>();
|
325 |
torben |
2303 |
|
326 |
torben |
2816 |
// //////////////////////
|
327 |
|
|
// Start stage1
|
328 |
|
|
|
329 |
torben |
2309 |
long start1 = System.currentTimeMillis();
|
330 |
torben |
2276 |
System.out.println("Build -- stage 1");
|
331 |
|
|
|
332 |
torben |
2831 |
List<Address> alleAdresser = db.getAllAdresses();
|
333 |
torben |
2276 |
|
334 |
torben |
2286 |
|
335 |
torben |
2817 |
/* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/
|
336 |
torben |
2285 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
|
337 |
|
|
|
338 |
torben |
2815 |
|
339 |
torben |
2788 |
DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>();
|
340 |
|
|
DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>();
|
341 |
|
|
|
342 |
torben |
2807 |
AliasGenerator aliasGenerator = new AliasGenerator();
|
343 |
torben |
2801 |
|
344 |
torben |
2835 |
ArrayList<ArrayList<Address>> litraListCache = new ArrayList<ArrayList<Address>>();
|
345 |
torben |
2807 |
|
346 |
torben |
2274 |
for (Address a : alleAdresser) {
|
347 |
|
|
idAddressMap.put(a.id, a);
|
348 |
|
|
|
349 |
torben |
2788 |
Short postnr = shortHelper.getInstance(a.postnr);
|
350 |
torben |
2274 |
|
351 |
torben |
2788 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);
|
352 |
|
|
|
353 |
torben |
2274 |
if (postnrVeje == null) {
|
354 |
torben |
2801 |
postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries
|
355 |
torben |
2788 |
searchPostnrVejnavnGadeid.put(postnr, postnrVeje);
|
356 |
torben |
2274 |
}
|
357 |
torben |
2491 |
|
358 |
torben |
2274 |
|
359 |
torben |
2281 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
|
360 |
torben |
2490 |
Integer gadeident = postnrVeje.get(vasketVejnavn);
|
361 |
torben |
2396 |
if (gadeident == null) {
|
362 |
torben |
2292 |
//postnrVeje.put(vasketVejnavn, a.gadeid);
|
363 |
|
|
|
364 |
torben |
2788 |
gadeident = intHelper.getInstance( a.gadeid );
|
365 |
torben |
2396 |
|
366 |
torben |
2807 |
Set<String> aliaser = aliasGenerator.findVejAliaser(a.vejnavn);
|
367 |
torben |
2815 |
for(String alias : aliaser) {
|
368 |
|
|
postnrVeje.put(alias, gadeident);
|
369 |
torben |
2801 |
}
|
370 |
|
|
|
371 |
torben |
2274 |
}
|
372 |
|
|
|
373 |
torben |
2801 |
|
374 |
torben |
2835 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident);
|
375 |
torben |
2274 |
if (gade == null) {
|
376 |
torben |
2835 |
gade = new TreeMap<Short, List<Address> >();
|
377 |
torben |
2396 |
searchGadeidentAdresser.put(gadeident, gade);
|
378 |
torben |
2274 |
}
|
379 |
torben |
2783 |
|
380 |
torben |
2835 |
List<Address> litraList = gade.get(a.husnr);
|
381 |
torben |
2783 |
if (litraList == null) {
|
382 |
torben |
2835 |
litraList = new ArrayList<Address>();
|
383 |
torben |
2783 |
gade.put(a.husnr, litraList);
|
384 |
torben |
2835 |
|
385 |
|
|
litraListCache.add( (ArrayList<Address>) litraList);
|
386 |
torben |
2783 |
}
|
387 |
torben |
2835 |
litraList.add(a);
|
388 |
torben |
2276 |
}
|
389 |
torben |
2814 |
|
390 |
torben |
2835 |
for (ArrayList<Address> list: litraListCache) {
|
391 |
|
|
list.trimToSize();
|
392 |
|
|
}
|
393 |
torben |
2815 |
|
394 |
torben |
2835 |
|
395 |
|
|
litraListCache.clear(); //frigiv hukommelse inden stage2
|
396 |
|
|
aliasGenerator.clear();
|
397 |
torben |
2816 |
shortHelper.clear();
|
398 |
|
|
intHelper.clear();
|
399 |
torben |
2805 |
|
400 |
torben |
2801 |
|
401 |
torben |
2279 |
////////////////////////////////////////////////////////////////////////////////////////
|
402 |
torben |
2309 |
long start2 = System.currentTimeMillis();
|
403 |
|
|
System.out.println("Build, stage1 elapsed: " + (start2-start1) );
|
404 |
torben |
2395 |
System.out.println("Build -- stage 2 alias tabel");
|
405 |
torben |
2279 |
|
406 |
torben |
2395 |
int vaskCount = 0;
|
407 |
torben |
2608 |
List<AliasBean> aliasList = db.getAliasList();
|
408 |
torben |
2395 |
for (AliasBean alias : aliasList) {
|
409 |
torben |
2490 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
|
410 |
torben |
2395 |
|
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 |
torben |
2490 |
Integer gadeident = postnrVeje.get(vasketVej);
|
420 |
torben |
2395 |
if (gadeident == null) {
|
421 |
|
|
//Kender ikke den oprindelige vej
|
422 |
|
|
continue;
|
423 |
|
|
}
|
424 |
|
|
|
425 |
torben |
2490 |
Integer aliasIdent = postnrVeje.get(vasketAlias);
|
426 |
torben |
2395 |
|
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 |
torben |
2818 |
aliasList.clear();//cleanup inden stage3
|
436 |
torben |
2395 |
|
437 |
torben |
2818 |
|
438 |
torben |
2395 |
////////////////////////////////////////////////////////////////////////////////////////
|
439 |
|
|
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 |
torben |
2491 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
|
444 |
|
|
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
|
445 |
|
|
|
446 |
torben |
2608 |
List<ExtendedBean> extDao = db.getExtendedAdresslist();
|
447 |
torben |
2276 |
for (ExtendedBean eb : extDao) {
|
448 |
torben |
2274 |
|
449 |
torben |
2276 |
Address orgAddress = idAddressMap.get(eb.orgId);
|
450 |
|
|
if (orgAddress == null)
|
451 |
|
|
continue;
|
452 |
|
|
|
453 |
torben |
2966 |
/*if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
|
454 |
torben |
2498 |
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden
|
455 |
|
|
continue;
|
456 |
torben |
2966 |
}*/
|
457 |
torben |
2498 |
|
458 |
torben |
2276 |
Address targetAddress = idAddressMap.get(eb.targetId);
|
459 |
torben |
2498 |
if (targetAddress == null) {
|
460 |
torben |
2276 |
continue;
|
461 |
torben |
2498 |
}
|
462 |
torben |
2276 |
|
463 |
torben |
2498 |
|
464 |
|
|
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) {
|
465 |
torben |
2277 |
continue;
|
466 |
|
|
}
|
467 |
|
|
|
468 |
torben |
2498 |
|
469 |
|
|
|
470 |
|
|
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) {
|
471 |
torben |
2277 |
continue;
|
472 |
|
|
}
|
473 |
|
|
|
474 |
torben |
2276 |
orgAddress.extTarget = targetAddress;
|
475 |
|
|
orgAddress.extAfstand = eb.afstand;
|
476 |
|
|
|
477 |
torben |
2283 |
boolean covered = false;
|
478 |
|
|
if (targetAddress.distributor.equals("DAO")) {
|
479 |
torben |
2966 |
orgAddress.routingMandag.rute = calculateExtendedDaoRoute(eb, targetAddress);
|
480 |
|
|
orgAddress.routingMandag.rute = ruteHelper.getInstance(orgAddress.routingMandag.rute);
|
481 |
torben |
2491 |
|
482 |
torben |
2966 |
if (orgAddress.routingMandag.rute != null) {
|
483 |
|
|
orgAddress.routingMandag.koreliste = targetAddress.routingMandag.koreliste;
|
484 |
torben |
2283 |
covered = true;
|
485 |
|
|
}
|
486 |
|
|
}
|
487 |
torben |
2276 |
|
488 |
torben |
2283 |
if (targetAddress.distributor.equals("BK")) {
|
489 |
torben |
2966 |
orgAddress.routingMandag.koreliste = calculateExtendedBkKoreliste(eb, targetAddress);
|
490 |
|
|
orgAddress.routingMandag.koreliste = korelisteHelper.getInstance(orgAddress.routingMandag.koreliste);
|
491 |
torben |
2491 |
|
492 |
torben |
2966 |
if (orgAddress.routingMandag.koreliste != null) {
|
493 |
|
|
orgAddress.routingMandag.rute = targetAddress.routingMandag.rute;
|
494 |
torben |
2283 |
covered = true;
|
495 |
|
|
}
|
496 |
|
|
}
|
497 |
|
|
|
498 |
|
|
if (covered) { //Kopier resten af felterne
|
499 |
torben |
2276 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET;
|
500 |
|
|
orgAddress.dbkBane = targetAddress.dbkBane;
|
501 |
|
|
|
502 |
|
|
/* Sådan gør den gamle service */
|
503 |
torben |
2549 |
/* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/
|
504 |
|
|
//orgAddress.kommunekode = targetAddress.kommunekode;
|
505 |
|
|
//orgAddress.vejkode = targetAddress.vejkode;
|
506 |
torben |
2276 |
|
507 |
torben |
2549 |
|
508 |
torben |
2276 |
orgAddress.distributor = targetAddress.distributor;
|
509 |
|
|
}
|
510 |
torben |
2274 |
}
|
511 |
torben |
2286 |
|
512 |
torben |
2818 |
// cleanup inden stage 4
|
513 |
torben |
2286 |
idAddressMap = null;
|
514 |
torben |
2818 |
ruteHelper = null;
|
515 |
|
|
korelisteHelper = null;
|
516 |
torben |
2286 |
|
517 |
torben |
2279 |
//////////////////////////////////////////////////////////////////////////////////////
|
518 |
torben |
2395 |
long start4 = System.currentTimeMillis();
|
519 |
|
|
System.out.println("Build, stage3 elapsed: " + (start4-start3) );
|
520 |
|
|
System.out.println("Build -- stage 4 - 100pct");
|
521 |
torben |
2274 |
|
522 |
torben |
2608 |
Map<Short,HundredePctBean> hundredePct = db.get100PctList();
|
523 |
torben |
2279 |
for (Address addr : alleAdresser) {
|
524 |
torben |
2286 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
|
525 |
torben |
2279 |
continue;
|
526 |
|
|
}
|
527 |
|
|
|
528 |
|
|
if (addr.distributor != null && addr.distributor.equals("LUKKET")) {
|
529 |
|
|
continue;
|
530 |
|
|
}
|
531 |
|
|
|
532 |
|
|
|
533 |
|
|
HundredePctBean bean = hundredePct.get(addr.postnr);
|
534 |
|
|
if (bean == null) {
|
535 |
|
|
continue;
|
536 |
|
|
}
|
537 |
|
|
|
538 |
|
|
addr.daekningsType = DaekningsType.DAEKNING_100PCT;
|
539 |
torben |
2966 |
addr.routingMandag.rute = bean.rute;
|
540 |
|
|
addr.routingMandag.koreliste = bean.koreliste;
|
541 |
torben |
2279 |
addr.dbkBane = bean.dbkBane;
|
542 |
|
|
addr.distributor = bean.distributor;
|
543 |
|
|
}
|
544 |
torben |
2276 |
|
545 |
torben |
2286 |
////////////////////////////////////////////////////////////////////////////////////
|
546 |
torben |
2309 |
long stop = System.currentTimeMillis();
|
547 |
torben |
2763 |
System.out.println("Build, stage4 elapsed: " + (stop-start4) );
|
548 |
torben |
2286 |
System.out.println("Build -- Gathering statistics");
|
549 |
torben |
2337 |
|
550 |
torben |
2286 |
for (Address addr : alleAdresser) {
|
551 |
|
|
switch (addr.daekningsType) {
|
552 |
|
|
case DAEKNING_DIREKTE:
|
553 |
torben |
2337 |
stats.direkteCount++;
|
554 |
torben |
2286 |
break;
|
555 |
|
|
case DAEKNING_UDVIDET:
|
556 |
torben |
2337 |
stats.extendedCount++;
|
557 |
torben |
2286 |
break;
|
558 |
|
|
case DAEKNING_100PCT:
|
559 |
torben |
2831 |
hundredePctAdresser.add(addr);
|
560 |
torben |
2337 |
stats.hundredePctCount++;
|
561 |
torben |
2286 |
break;
|
562 |
|
|
default:
|
563 |
torben |
2831 |
ikkeDaekkedeAdresser.add(addr);
|
564 |
torben |
2337 |
stats.ikkeDaekketCount++;
|
565 |
torben |
2286 |
}
|
566 |
torben |
2339 |
}
|
567 |
torben |
2598 |
stats.totalCount = alleAdresser.size();
|
568 |
torben |
2286 |
|
569 |
torben |
2837 |
ikkeDaekkedeAdresser.trimToSize();
|
570 |
|
|
hundredePctAdresser.trimToSize();
|
571 |
torben |
2832 |
Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet
|
572 |
|
|
Collections.sort( hundredePctAdresser );
|
573 |
torben |
2831 |
|
574 |
torben |
2338 |
|
575 |
torben |
2339 |
stats.elapsed = stop-start1;
|
576 |
|
|
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
|
577 |
|
|
|
578 |
torben |
2598 |
System.out.println("Build: totalCount: " + stats.totalCount);
|
579 |
torben |
2337 |
System.out.println("Build: direkteCount: " + stats.direkteCount);
|
580 |
|
|
System.out.println("Build: extendedCount: " + stats.extendedCount);
|
581 |
|
|
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
|
582 |
|
|
System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
|
583 |
torben |
2286 |
|
584 |
torben |
2309 |
System.out.println("Build: Total Elapsed: " + (stop-start1) );
|
585 |
torben |
2281 |
System.out.println("Build Completed");
|
586 |
|
|
|
587 |
torben |
2274 |
}
|
588 |
|
|
|
589 |
torben |
2337 |
public DataStatisticsBean getStatistics() {
|
590 |
|
|
return stats;
|
591 |
|
|
}
|
592 |
torben |
2276 |
|
593 |
torben |
2608 |
public DatabaseLayer getDatabaseLayer() {
|
594 |
|
|
return db;
|
595 |
|
|
}
|
596 |
|
|
|
597 |
torben |
2337 |
public void clear() {
|
598 |
|
|
searchPostnrVejnavnGadeid.clear();
|
599 |
|
|
searchGadeidentAdresser.clear();
|
600 |
|
|
helperCache.clear();
|
601 |
|
|
}
|
602 |
|
|
|
603 |
|
|
|
604 |
torben |
2943 |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address targetAddress) {
|
605 |
torben |
2966 |
if (targetAddress.routingMandag.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
|
606 |
torben |
2443 |
return null;
|
607 |
|
|
}
|
608 |
torben |
2283 |
|
609 |
|
|
// ///////////////////////////////////////////////////////////////////
|
610 |
|
|
switch( eb.transport) {
|
611 |
|
|
case "cykel":
|
612 |
|
|
if (eb.afstand < 0.151) {
|
613 |
torben |
2966 |
return "." + targetAddress.routingMandag.rute;
|
614 |
torben |
2283 |
} else if (eb.afstand < 0.501) {
|
615 |
torben |
2966 |
return ".." + targetAddress.routingMandag.rute;
|
616 |
torben |
2283 |
} else if (eb.afstand < 0.701) {
|
617 |
torben |
2966 |
return "..." + targetAddress.routingMandag.rute;
|
618 |
torben |
2761 |
} else if (eb.afstand < 1.001) {
|
619 |
torben |
2966 |
return "...." + targetAddress.routingMandag.rute;
|
620 |
torben |
2276 |
}
|
621 |
torben |
2283 |
break;
|
622 |
|
|
case "scooter":
|
623 |
|
|
if (eb.afstand < 0.151) {
|
624 |
torben |
2966 |
return "." + targetAddress.routingMandag.rute;
|
625 |
torben |
2283 |
} else if (eb.afstand < 0.801) {
|
626 |
torben |
2966 |
return ".." + targetAddress.routingMandag.rute;
|
627 |
torben |
2283 |
} else if (eb.afstand < 1.201) {
|
628 |
torben |
2966 |
return "..." + targetAddress.routingMandag.rute;
|
629 |
torben |
2283 |
} else if (eb.afstand < 2.101) {
|
630 |
torben |
2966 |
return "...." + targetAddress.routingMandag.rute;
|
631 |
torben |
2283 |
}
|
632 |
|
|
break;
|
633 |
|
|
case "bil":
|
634 |
|
|
if (eb.afstand < 0.151) {
|
635 |
torben |
2966 |
return "." + targetAddress.routingMandag.rute;
|
636 |
torben |
2283 |
} else if (eb.afstand < 1.001) {
|
637 |
torben |
2966 |
return ".." + targetAddress.routingMandag.rute;
|
638 |
torben |
2283 |
} else if (eb.afstand < 1.601) {
|
639 |
torben |
2966 |
return "..." + targetAddress.routingMandag.rute;
|
640 |
torben |
2283 |
} else if (eb.afstand < 2.601) {
|
641 |
torben |
2966 |
return "...." + targetAddress.routingMandag.rute;
|
642 |
torben |
2283 |
}
|
643 |
torben |
2276 |
break;
|
644 |
torben |
2775 |
default:
|
645 |
|
|
System.out.println("Ukendt transport type: " + eb );
|
646 |
torben |
2283 |
}
|
647 |
torben |
2276 |
return null;
|
648 |
torben |
2332 |
}
|
649 |
torben |
2276 |
|
650 |
torben |
2332 |
public List<Address> getNonCoveredAddresses() {
|
651 |
torben |
2831 |
return ikkeDaekkedeAdresser;
|
652 |
torben |
2332 |
}
|
653 |
|
|
|
654 |
torben |
2638 |
public List<Address> get100PctAddresses() {
|
655 |
torben |
2831 |
return hundredePctAdresser;
|
656 |
torben |
2638 |
}
|
657 |
|
|
|
658 |
torben |
2283 |
///////////////////////////////////////////////////////////
|
659 |
torben |
2943 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, Address targetAddress) {
|
660 |
torben |
2966 |
if (targetAddress.routingMandag.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
|
661 |
torben |
2943 |
return null;
|
662 |
|
|
}
|
663 |
|
|
|
664 |
torben |
2283 |
String inject;
|
665 |
|
|
if (eb.afstand <= 0.500) {
|
666 |
|
|
inject = ".";
|
667 |
|
|
} else {
|
668 |
|
|
inject = "..";
|
669 |
|
|
}
|
670 |
torben |
2966 |
return AddressUtils.injectIntoBk(targetAddress.routingMandag.koreliste, inject);
|
671 |
torben |
2283 |
}
|
672 |
torben |
2276 |
|
673 |
torben |
2283 |
|
674 |
torben |
2489 |
public Set<Short> getPostnumre() {
|
675 |
|
|
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
|
676 |
torben |
2484 |
}
|
677 |
torben |
2292 |
|
678 |
torben |
2493 |
public Set<Entry<String,Integer>> getVejnavne(short postnr) {
|
679 |
torben |
2490 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr);
|
680 |
torben |
2484 |
|
681 |
torben |
2626 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering
|
682 |
|
|
|
683 |
torben |
2484 |
return newMap.entrySet();
|
684 |
|
|
}
|
685 |
|
|
|
686 |
torben |
2493 |
public Set<String> getHusnumre(int gadeid) {
|
687 |
torben |
2484 |
|
688 |
torben |
2835 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid);
|
689 |
torben |
2495 |
|
690 |
|
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
|
691 |
torben |
2835 |
for(List<Address> litraList : gade.values()) {
|
692 |
|
|
for (Address a: litraList) {
|
693 |
torben |
2783 |
set.add( a.husnr + a.husnrbogstav );
|
694 |
|
|
}
|
695 |
|
|
}
|
696 |
torben |
2495 |
|
697 |
|
|
return set;
|
698 |
torben |
2484 |
}
|
699 |
|
|
|
700 |
torben |
2783 |
public Address getAdresse(int gadeid, String husnrStr) {
|
701 |
torben |
2787 |
short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
|
702 |
|
|
String litra = husnrStr.replaceAll("\\d", "");
|
703 |
torben |
2484 |
|
704 |
torben |
2835 |
Map<Short,List<Address>> gade = searchGadeidentAdresser.get(gadeid);
|
705 |
|
|
List<Address> litraList = gade.get(husnr);
|
706 |
torben |
2783 |
|
707 |
torben |
2835 |
for(Address addr : litraList) {
|
708 |
|
|
if (addr.husnrbogstav.equals(litra)) {
|
709 |
|
|
return addr;
|
710 |
|
|
}
|
711 |
|
|
}
|
712 |
|
|
|
713 |
|
|
return null;
|
714 |
|
|
|
715 |
torben |
2484 |
}
|
716 |
|
|
|
717 |
torben |
2267 |
}
|