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