| 1 |
package dk.daoas.daoadresseservice;
|
| 2 |
|
| 3 |
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;
|
| 9 |
import java.util.List;
|
| 10 |
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;
|
| 16 |
|
| 17 |
import org.apache.commons.lang3.StringUtils;
|
| 18 |
|
| 19 |
import dk.daoas.daoadresseservice.admin.ServiceConfig;
|
| 20 |
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;
|
| 25 |
import dk.daoas.daoadresseservice.beans.HundredePctBean;
|
| 26 |
import dk.daoas.daoadresseservice.beans.SearchRequest;
|
| 27 |
import dk.daoas.daoadresseservice.beans.SearchResult;
|
| 28 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status;
|
| 29 |
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 AddressSearch {
|
| 36 |
|
| 37 |
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 |
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) {
|
| 95 |
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 |
|
| 108 |
|
| 109 |
try {
|
| 110 |
request.postnr = Short.parseShort(postnrStr);
|
| 111 |
} catch (Exception E) {
|
| 112 |
result.status = Status.ERROR_UNKNOWN_POSTAL;
|
| 113 |
return result;
|
| 114 |
}
|
| 115 |
|
| 116 |
|
| 117 |
request.streetNames = searchPostnrVejnavnGadeid.get(request.postnr);
|
| 118 |
|
| 119 |
if (request.streetNames == null) {
|
| 120 |
result.status = Status.ERROR_UNKNOWN_POSTAL;
|
| 121 |
return result;
|
| 122 |
}
|
| 123 |
|
| 124 |
|
| 125 |
result.splitResult = AddressUtils.splitAdresse(adresse);
|
| 126 |
request.vejnavn = result.splitResult.vej;
|
| 127 |
|
| 128 |
|
| 129 |
|
| 130 |
if (result.splitResult.husnr.length() == 0) {
|
| 131 |
result.status = Status.ERROR_MISSING_HOUSENUMBER;
|
| 132 |
return result;
|
| 133 |
}
|
| 134 |
|
| 135 |
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 |
* <strike>Denne sektion er MEGET experimental da den øger antallet af kald til google/OSM væsentligt</strike>*/
|
| 157 |
if (gadeident == null) {
|
| 158 |
final int MAX_TRIES = 4;
|
| 159 |
|
| 160 |
String vejnavnParts[] = request.vejnavn.split(" ");
|
| 161 |
|
| 162 |
for (int i=1; i<=MAX_TRIES && i<vejnavnParts.length; i++) {
|
| 163 |
String subVejnavn = DaoUtils.joinHelper(vejnavnParts, i);
|
| 164 |
|
| 165 |
request.vejnavn = subVejnavn;
|
| 166 |
result.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn );
|
| 167 |
|
| 168 |
gadeident = lookupStretname(request, result, false);//prøv opslag MEN UDEN GOOGLE/OSM !!!
|
| 169 |
|
| 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 |
}
|
| 180 |
|
| 181 |
|
| 182 |
|
| 183 |
if (gadeident == null) {
|
| 184 |
result.status = Status.ERROR_UNKNOWN_STREETNAME;
|
| 185 |
return result;
|
| 186 |
}
|
| 187 |
|
| 188 |
result.gadeident = gadeident;
|
| 189 |
|
| 190 |
|
| 191 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident);
|
| 192 |
if (gade == null) { //Denne søgning må ikke fejle
|
| 193 |
result.status = Status.ERROR_INTERNAL;
|
| 194 |
return result;
|
| 195 |
}
|
| 196 |
|
| 197 |
|
| 198 |
|
| 199 |
//Kunne evt klares med Iterables.get fra Guava/Collections
|
| 200 |
Address firstAddress = gade.values().iterator().next().get(0); //Første husnr -> første litra
|
| 201 |
result.vej = firstAddress.vejnavn;
|
| 202 |
|
| 203 |
short husnrSearch = Short.parseShort(result.splitResult.husnr );
|
| 204 |
List<Address> litraList = gade.get(husnrSearch);
|
| 205 |
|
| 206 |
|
| 207 |
if (litraList == null) { //Husnr ikke fundet
|
| 208 |
|
| 209 |
if (naermesteHusnr) {
|
| 210 |
TreeMap<Short, List<Address>> gadeTreeMap = (TreeMap<Short, List<Address>>) gade;
|
| 211 |
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 |
}
|
| 222 |
|
| 223 |
Address addr = null;
|
| 224 |
for(Address a : litraList) {
|
| 225 |
if ( a.husnrbogstav.equals( result.splitResult.litra ) ) {
|
| 226 |
addr = a;
|
| 227 |
break;
|
| 228 |
}
|
| 229 |
}
|
| 230 |
|
| 231 |
if (addr == null) { //litra ikke fundet
|
| 232 |
if (config.nearestLitra == true || naermesteHusnr == true) {
|
| 233 |
result.nearestLitra = true;
|
| 234 |
addr = litraList.get(0);
|
| 235 |
} else {
|
| 236 |
//husnr fundet men litra blev ikke fundet
|
| 237 |
result.status = Status.ERROR_UNKNOWN_ADDRESSPOINT;
|
| 238 |
return result;
|
| 239 |
}
|
| 240 |
}
|
| 241 |
|
| 242 |
result.address = addr;
|
| 243 |
|
| 244 |
|
| 245 |
if ( StringUtils.equals(addr.distributor, "LUKKET") ) {
|
| 246 |
result.status = Status.STATUS_NOT_COVERED; //Skal vi have en special status til Lukkede adresser ?
|
| 247 |
return result;
|
| 248 |
}
|
| 249 |
|
| 250 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) {
|
| 251 |
result.status = Status.STATUS_NOT_COVERED;
|
| 252 |
return result;
|
| 253 |
}
|
| 254 |
|
| 255 |
|
| 256 |
result.status = Status.STATUS_OK;
|
| 257 |
|
| 258 |
return result;
|
| 259 |
}
|
| 260 |
|
| 261 |
|
| 262 |
private Integer lookupStretname(SearchRequest request, SearchResult result, boolean useExternal) {
|
| 263 |
String helperSearchKey = "";
|
| 264 |
|
| 265 |
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 |
if (gadeident == null) {
|
| 281 |
String vej = metaphoneHelper.proposeStreetName(request, result);
|
| 282 |
if (vej != null) {
|
| 283 |
gadeident = request.streetNames.get(vej);
|
| 284 |
}
|
| 285 |
}
|
| 286 |
|
| 287 |
|
| 288 |
// Brug OpenStreetMap før vi prøver google
|
| 289 |
// For google har en request limit, det har OSM ikke!
|
| 290 |
if ( gadeident == null && useExternal) {
|
| 291 |
String vej = osmHelper.proposeStreetName(request, result);
|
| 292 |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
|
| 293 |
}
|
| 294 |
|
| 295 |
if ( gadeident == null && useExternal) {
|
| 296 |
String vej = googleHelper.proposeStreetName(request, result);
|
| 297 |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey);
|
| 298 |
}
|
| 299 |
return gadeident;
|
| 300 |
}
|
| 301 |
|
| 302 |
private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) {
|
| 303 |
if (vej == null)
|
| 304 |
return null;
|
| 305 |
|
| 306 |
String vejVasket = AddressUtils.vaskVejnavn( vej );
|
| 307 |
Integer gadeident = postnrVeje.get(vejVasket);
|
| 308 |
|
| 309 |
if (gadeident != null) {
|
| 310 |
helperCache.put(helperSearchKey, gadeident);
|
| 311 |
}
|
| 312 |
return gadeident;
|
| 313 |
|
| 314 |
}
|
| 315 |
|
| 316 |
public Map<String,Integer> getStretsByPostal(short zip) {
|
| 317 |
return searchPostnrVejnavnGadeid.get(zip);
|
| 318 |
}
|
| 319 |
|
| 320 |
|
| 321 |
|
| 322 |
public void buildSearchStructures() throws SQLException{
|
| 323 |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>();
|
| 324 |
searchGadeidentAdresser = new HashMap<Integer, Map<Short, List<Address>>>();
|
| 325 |
helperCache = new ConcurrentHashMap<String,Integer>();
|
| 326 |
|
| 327 |
// //////////////////////
|
| 328 |
// Start stage1
|
| 329 |
|
| 330 |
long start1 = System.currentTimeMillis();
|
| 331 |
System.out.println("Build -- stage 1");
|
| 332 |
|
| 333 |
List<Address> alleAdresser = db.getAllAdresses();
|
| 334 |
|
| 335 |
|
| 336 |
/* Mapper mellem db Row ID og adresse noden - skal bruges i stage3*/
|
| 337 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() );
|
| 338 |
|
| 339 |
|
| 340 |
DeduplicateHelper<Short> shortHelper = new DeduplicateHelper<Short>();
|
| 341 |
DeduplicateHelper<Integer> intHelper = new DeduplicateHelper<Integer>();
|
| 342 |
|
| 343 |
AliasGenerator aliasGenerator = new AliasGenerator();
|
| 344 |
|
| 345 |
ArrayList<ArrayList<Address>> litraListCache = new ArrayList<ArrayList<Address>>();
|
| 346 |
|
| 347 |
for (Address a : alleAdresser) {
|
| 348 |
idAddressMap.put(a.id, a);
|
| 349 |
|
| 350 |
Short postnr = shortHelper.getInstance(a.postnr);
|
| 351 |
|
| 352 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(postnr);
|
| 353 |
|
| 354 |
if (postnrVeje == null) {
|
| 355 |
postnrVeje = new HashMap<String,Integer>(10240); //lige nu indeholder den største 9500 entries
|
| 356 |
searchPostnrVejnavnGadeid.put(postnr, postnrVeje);
|
| 357 |
}
|
| 358 |
|
| 359 |
|
| 360 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);
|
| 361 |
Integer gadeident = postnrVeje.get(vasketVejnavn);
|
| 362 |
if (gadeident == null) {
|
| 363 |
//postnrVeje.put(vasketVejnavn, a.gadeid);
|
| 364 |
|
| 365 |
gadeident = intHelper.getInstance( a.gadeid );
|
| 366 |
|
| 367 |
Set<String> aliaser = aliasGenerator.findVejAliaser(a.vejnavn);
|
| 368 |
for(String alias : aliaser) {
|
| 369 |
postnrVeje.put(alias, gadeident);
|
| 370 |
}
|
| 371 |
|
| 372 |
}
|
| 373 |
|
| 374 |
|
| 375 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeident);
|
| 376 |
if (gade == null) {
|
| 377 |
gade = new TreeMap<Short, List<Address> >();
|
| 378 |
searchGadeidentAdresser.put(gadeident, gade);
|
| 379 |
}
|
| 380 |
|
| 381 |
List<Address> litraList = gade.get(a.husnr);
|
| 382 |
if (litraList == null) {
|
| 383 |
litraList = new ArrayList<Address>();
|
| 384 |
gade.put(a.husnr, litraList);
|
| 385 |
|
| 386 |
litraListCache.add( (ArrayList<Address>) litraList);
|
| 387 |
}
|
| 388 |
litraList.add(a);
|
| 389 |
}
|
| 390 |
|
| 391 |
for (ArrayList<Address> list: litraListCache) {
|
| 392 |
list.trimToSize();
|
| 393 |
}
|
| 394 |
|
| 395 |
|
| 396 |
litraListCache.clear(); //frigiv hukommelse inden stage2
|
| 397 |
aliasGenerator.clear();
|
| 398 |
shortHelper.clear();
|
| 399 |
intHelper.clear();
|
| 400 |
|
| 401 |
|
| 402 |
////////////////////////////////////////////////////////////////////////////////////////
|
| 403 |
long start2 = System.currentTimeMillis();
|
| 404 |
System.out.println("Build, stage1 elapsed: " + (start2-start1) );
|
| 405 |
System.out.println("Build -- stage 2 alias tabel");
|
| 406 |
|
| 407 |
int vaskCount = 0;
|
| 408 |
List<AliasBean> aliasList = db.getAliasList();
|
| 409 |
for (AliasBean alias : aliasList) {
|
| 410 |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr);
|
| 411 |
|
| 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 |
Integer gadeident = postnrVeje.get(vasketVej);
|
| 421 |
if (gadeident == null) {
|
| 422 |
//Kender ikke den oprindelige vej
|
| 423 |
continue;
|
| 424 |
}
|
| 425 |
|
| 426 |
Integer aliasIdent = postnrVeje.get(vasketAlias);
|
| 427 |
|
| 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 |
aliasList.clear();//cleanup inden stage3
|
| 437 |
|
| 438 |
|
| 439 |
////////////////////////////////////////////////////////////////////////////////////////
|
| 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 |
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>();
|
| 445 |
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>();
|
| 446 |
|
| 447 |
List<ExtendedBean> extDao = db.getExtendedAdresslist();
|
| 448 |
for (ExtendedBean eb : extDao) {
|
| 449 |
|
| 450 |
Address orgAddress = idAddressMap.get(eb.orgId);
|
| 451 |
if (orgAddress == null) {
|
| 452 |
continue;
|
| 453 |
}
|
| 454 |
|
| 455 |
/*if (orgAddress.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) {
|
| 456 |
//kan være at adressen er blevet markeret dækket og - find-nærmeste data ikke er opdateret i mellemtiden
|
| 457 |
continue;
|
| 458 |
}*/
|
| 459 |
|
| 460 |
Address targetAddress = idAddressMap.get(eb.targetId);
|
| 461 |
if (targetAddress == null) {
|
| 462 |
continue;
|
| 463 |
}
|
| 464 |
|
| 465 |
|
| 466 |
if ( StringUtils.equals(orgAddress.distributor, "LUKKET") ) {
|
| 467 |
continue;
|
| 468 |
}
|
| 469 |
|
| 470 |
|
| 471 |
|
| 472 |
if ( StringUtils.equals(targetAddress.distributor, "LUKKET") ) {
|
| 473 |
continue;
|
| 474 |
}
|
| 475 |
|
| 476 |
|
| 477 |
|
| 478 |
short modifyCounter = 0;
|
| 479 |
|
| 480 |
if (targetAddress.distributor.equals("DAO")) {
|
| 481 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingMandag, targetAddress.routingMandag, ruteHelper);
|
| 482 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, ruteHelper);
|
| 483 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, ruteHelper);
|
| 484 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, ruteHelper);
|
| 485 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingFredag, targetAddress.routingFredag, ruteHelper);
|
| 486 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingLordag, targetAddress.routingLordag, ruteHelper);
|
| 487 |
modifyCounter += updateRoutingExtendedDAO(eb, orgAddress.routingSondag, targetAddress.routingSondag, ruteHelper);
|
| 488 |
}
|
| 489 |
|
| 490 |
if (targetAddress.distributor.equals("BK")) {
|
| 491 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingMandag, targetAddress.routingMandag, korelisteHelper);
|
| 492 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTirsdag, targetAddress.routingTirsdag, korelisteHelper);
|
| 493 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingOnsdag, targetAddress.routingOnsdag, korelisteHelper);
|
| 494 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingTorsdag, targetAddress.routingTorsdag, korelisteHelper);
|
| 495 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingFredag, targetAddress.routingFredag, korelisteHelper);
|
| 496 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingLordag, targetAddress.routingLordag, korelisteHelper);
|
| 497 |
modifyCounter += updateRoutingExtendedBK(eb, orgAddress.routingSondag, targetAddress.routingSondag, korelisteHelper);
|
| 498 |
}
|
| 499 |
|
| 500 |
|
| 501 |
if (modifyCounter > 0) {
|
| 502 |
orgAddress.extTarget = targetAddress;
|
| 503 |
orgAddress.extAfstand = eb.afstand;
|
| 504 |
}
|
| 505 |
|
| 506 |
if (modifyCounter>0 && orgAddress.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET) { //Kopier resten af felterne
|
| 507 |
orgAddress.daekningsType = DaekningsType.DAEKNING_UDVIDET;
|
| 508 |
orgAddress.dbkBane = targetAddress.dbkBane;
|
| 509 |
|
| 510 |
/* Sådan gør den gamle service */
|
| 511 |
/* 20150520 THN- hvis vi bibeholder de originale kommune+vejkoder kan vi bruge DAVID til join i databasen*/
|
| 512 |
//orgAddress.kommunekode = targetAddress.kommunekode;
|
| 513 |
//orgAddress.vejkode = targetAddress.vejkode;
|
| 514 |
|
| 515 |
|
| 516 |
orgAddress.distributor = targetAddress.distributor;
|
| 517 |
}
|
| 518 |
}
|
| 519 |
|
| 520 |
// cleanup inden stage 4
|
| 521 |
idAddressMap = null;
|
| 522 |
ruteHelper = null;
|
| 523 |
korelisteHelper = null;
|
| 524 |
|
| 525 |
//////////////////////////////////////////////////////////////////////////////////////
|
| 526 |
long start4 = System.currentTimeMillis();
|
| 527 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) );
|
| 528 |
System.out.println("Build -- stage 4 - 100pct");
|
| 529 |
|
| 530 |
Map<Short,HundredePctBean> hundredePct = db.get100PctList();
|
| 531 |
for (Address addr : alleAdresser) {
|
| 532 |
|
| 533 |
|
| 534 |
if (addr.distributor != null && addr.distributor.equals("LUKKET")) {
|
| 535 |
continue;
|
| 536 |
}
|
| 537 |
|
| 538 |
|
| 539 |
HundredePctBean bean = hundredePct.get(addr.postnr);
|
| 540 |
if (bean == null) {
|
| 541 |
continue;
|
| 542 |
}
|
| 543 |
|
| 544 |
short modifyCounter = 0;
|
| 545 |
modifyCounter += updateRouting100Pct(bean, addr.routingMandag);
|
| 546 |
modifyCounter += updateRouting100Pct(bean, addr.routingTirsdag);
|
| 547 |
modifyCounter += updateRouting100Pct(bean, addr.routingOnsdag);
|
| 548 |
modifyCounter += updateRouting100Pct(bean, addr.routingTorsdag);
|
| 549 |
modifyCounter += updateRouting100Pct(bean, addr.routingFredag);
|
| 550 |
modifyCounter += updateRouting100Pct(bean, addr.routingLordag);
|
| 551 |
modifyCounter += updateRouting100Pct(bean, addr.routingSondag);
|
| 552 |
|
| 553 |
|
| 554 |
if (addr.daekningsType == DaekningsType.DAEKNING_IKKEDAEKKET && modifyCounter>0) {
|
| 555 |
addr.daekningsType = DaekningsType.DAEKNING_100PCT;
|
| 556 |
addr.dbkBane = bean.dbkBane;
|
| 557 |
addr.distributor = bean.distributor;
|
| 558 |
}
|
| 559 |
|
| 560 |
|
| 561 |
|
| 562 |
}
|
| 563 |
|
| 564 |
////////////////////////////////////////////////////////////////////////////////////
|
| 565 |
long stop = System.currentTimeMillis();
|
| 566 |
System.out.println("Build, stage4 elapsed: " + (stop-start4) );
|
| 567 |
System.out.println("Build -- Gathering statistics");
|
| 568 |
|
| 569 |
for (Address addr : alleAdresser) {
|
| 570 |
switch (addr.daekningsType) {
|
| 571 |
case DAEKNING_DIREKTE:
|
| 572 |
stats.direkteCount++;
|
| 573 |
break;
|
| 574 |
case DAEKNING_UDVIDET:
|
| 575 |
stats.extendedCount++;
|
| 576 |
break;
|
| 577 |
case DAEKNING_100PCT:
|
| 578 |
hundredePctAdresser.add(addr);
|
| 579 |
stats.hundredePctCount++;
|
| 580 |
break;
|
| 581 |
default:
|
| 582 |
ikkeDaekkedeAdresser.add(addr);
|
| 583 |
stats.ikkeDaekketCount++;
|
| 584 |
}
|
| 585 |
}
|
| 586 |
stats.totalCount = alleAdresser.size();
|
| 587 |
|
| 588 |
ikkeDaekkedeAdresser.trimToSize();
|
| 589 |
hundredePctAdresser.trimToSize();
|
| 590 |
Collections.sort( ikkeDaekkedeAdresser ); //Bruger Comparable interfacet
|
| 591 |
Collections.sort( hundredePctAdresser );
|
| 592 |
|
| 593 |
|
| 594 |
stats.elapsed = stop-start1;
|
| 595 |
stats.buildTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format( new Date() );
|
| 596 |
|
| 597 |
System.out.println("Build: totalCount: " + stats.totalCount);
|
| 598 |
System.out.println("Build: direkteCount: " + stats.direkteCount);
|
| 599 |
System.out.println("Build: extendedCount: " + stats.extendedCount);
|
| 600 |
System.out.println("Build: hundredePctCount: " + stats.hundredePctCount);
|
| 601 |
System.out.println("Build: ikkeDaekketCount: " + stats.ikkeDaekketCount);
|
| 602 |
|
| 603 |
System.out.println("Build: Total Elapsed: " + (stop-start1) );
|
| 604 |
System.out.println("Build Completed");
|
| 605 |
|
| 606 |
}
|
| 607 |
|
| 608 |
public short updateRoutingExtendedBK(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> korelisteHelper) {
|
| 609 |
if (source.rute != null) {
|
| 610 |
return 0;
|
| 611 |
}
|
| 612 |
|
| 613 |
source.koreliste = calculateExtendedBkKoreliste(bean, target);
|
| 614 |
source.koreliste = korelisteHelper.getInstance(source.koreliste);
|
| 615 |
|
| 616 |
if (source.koreliste != null) {
|
| 617 |
source.rute = target.rute;
|
| 618 |
return 1;
|
| 619 |
} else {
|
| 620 |
return 0;
|
| 621 |
}
|
| 622 |
}
|
| 623 |
|
| 624 |
public short updateRoutingExtendedDAO(ExtendedBean bean, RoutingInfo source, RoutingInfo target, DeduplicateHelper<String> ruteHelper) {
|
| 625 |
if (source.rute != null) {
|
| 626 |
return 0;
|
| 627 |
}
|
| 628 |
|
| 629 |
source.rute = calculateExtendedDaoRoute(bean, target);
|
| 630 |
source.rute = ruteHelper.getInstance(source.rute);
|
| 631 |
|
| 632 |
if (source.rute != null) {
|
| 633 |
source.koreliste = target.koreliste;
|
| 634 |
return 1;
|
| 635 |
} else {
|
| 636 |
return 0;
|
| 637 |
}
|
| 638 |
|
| 639 |
}
|
| 640 |
|
| 641 |
public short updateRouting100Pct(HundredePctBean bean, RoutingInfo routing) {
|
| 642 |
if (routing.rute == null) {
|
| 643 |
routing.rute = bean.rute;
|
| 644 |
routing.koreliste = bean.koreliste;
|
| 645 |
return 1;
|
| 646 |
} else {
|
| 647 |
return 0;
|
| 648 |
}
|
| 649 |
}
|
| 650 |
|
| 651 |
public DataStatisticsBean getStatistics() {
|
| 652 |
return stats;
|
| 653 |
}
|
| 654 |
|
| 655 |
public DatabaseLayer getDatabaseLayer() {
|
| 656 |
return db;
|
| 657 |
}
|
| 658 |
|
| 659 |
public void clear() {
|
| 660 |
searchPostnrVejnavnGadeid.clear();
|
| 661 |
searchGadeidentAdresser.clear();
|
| 662 |
helperCache.clear();
|
| 663 |
}
|
| 664 |
|
| 665 |
|
| 666 |
private String calculateExtendedDaoRoute(ExtendedBean eb, RoutingInfo targetRoute) {
|
| 667 |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
|
| 668 |
return null;
|
| 669 |
}
|
| 670 |
|
| 671 |
// ///////////////////////////////////////////////////////////////////
|
| 672 |
switch( eb.transport) {
|
| 673 |
case "cykel":
|
| 674 |
if (eb.afstand < 0.151) {
|
| 675 |
return "." + targetRoute.rute;
|
| 676 |
} else if (eb.afstand < 0.501) {
|
| 677 |
return ".." + targetRoute.rute;
|
| 678 |
} else if (eb.afstand < 0.701) {
|
| 679 |
return "..." + targetRoute.rute;
|
| 680 |
} else if (eb.afstand < 1.001) {
|
| 681 |
return "...." + targetRoute.rute;
|
| 682 |
}
|
| 683 |
break;
|
| 684 |
case "scooter":
|
| 685 |
if (eb.afstand < 0.151) {
|
| 686 |
return "." + targetRoute.rute;
|
| 687 |
} else if (eb.afstand < 0.801) {
|
| 688 |
return ".." + targetRoute.rute;
|
| 689 |
} else if (eb.afstand < 1.201) {
|
| 690 |
return "..." + targetRoute.rute;
|
| 691 |
} else if (eb.afstand < 2.101) {
|
| 692 |
return "...." + targetRoute.rute;
|
| 693 |
}
|
| 694 |
break;
|
| 695 |
case "bil":
|
| 696 |
if (eb.afstand < 0.151) {
|
| 697 |
return "." + targetRoute.rute;
|
| 698 |
} else if (eb.afstand < 1.001) {
|
| 699 |
return ".." + targetRoute.rute;
|
| 700 |
} else if (eb.afstand < 1.601) {
|
| 701 |
return "..." + targetRoute.rute;
|
| 702 |
} else if (eb.afstand < 2.601) {
|
| 703 |
return "...." + targetRoute.rute;
|
| 704 |
}
|
| 705 |
break;
|
| 706 |
default:
|
| 707 |
System.out.println("Ukendt transport type: " + eb );
|
| 708 |
}
|
| 709 |
return null;
|
| 710 |
}
|
| 711 |
|
| 712 |
public List<Address> getNonCoveredAddresses() {
|
| 713 |
return ikkeDaekkedeAdresser;
|
| 714 |
}
|
| 715 |
|
| 716 |
public List<Address> get100PctAddresses() {
|
| 717 |
return hundredePctAdresser;
|
| 718 |
}
|
| 719 |
|
| 720 |
///////////////////////////////////////////////////////////
|
| 721 |
private String calculateExtendedBkKoreliste(ExtendedBean eb, RoutingInfo targetRoute) {
|
| 722 |
if (targetRoute.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
|
| 723 |
return null;
|
| 724 |
}
|
| 725 |
|
| 726 |
String inject;
|
| 727 |
if (eb.afstand <= 0.500) {
|
| 728 |
inject = ".";
|
| 729 |
} else {
|
| 730 |
inject = "..";
|
| 731 |
}
|
| 732 |
return AddressUtils.injectIntoBk(targetRoute.koreliste, inject);
|
| 733 |
}
|
| 734 |
|
| 735 |
|
| 736 |
public Set<Short> getPostnumre() {
|
| 737 |
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() );
|
| 738 |
}
|
| 739 |
|
| 740 |
public Set<Entry<String,Integer>> getVejnavne(short postnr) {
|
| 741 |
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr);
|
| 742 |
|
| 743 |
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>( map );//Lav et nyt TreeMap for at sikre sortering
|
| 744 |
|
| 745 |
return newMap.entrySet();
|
| 746 |
}
|
| 747 |
|
| 748 |
public Set<String> getHusnumre(int gadeid) {
|
| 749 |
|
| 750 |
Map<Short, List<Address>> gade = searchGadeidentAdresser.get(gadeid);
|
| 751 |
|
| 752 |
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() );
|
| 753 |
for(List<Address> litraList : gade.values()) {
|
| 754 |
for (Address a: litraList) {
|
| 755 |
set.add( a.husnr + a.husnrbogstav );
|
| 756 |
}
|
| 757 |
}
|
| 758 |
|
| 759 |
return set;
|
| 760 |
}
|
| 761 |
|
| 762 |
public Address getAdresse(int gadeid, String husnrStr) {
|
| 763 |
short husnr = Short.parseShort( husnrStr.replaceAll("[^\\d]","") );
|
| 764 |
String litra = husnrStr.replaceAll("\\d", "");
|
| 765 |
|
| 766 |
Map<Short,List<Address>> gade = searchGadeidentAdresser.get(gadeid);
|
| 767 |
List<Address> litraList = gade.get(husnr);
|
| 768 |
|
| 769 |
for(Address addr : litraList) {
|
| 770 |
if (addr.husnrbogstav.equals(litra)) {
|
| 771 |
return addr;
|
| 772 |
}
|
| 773 |
}
|
| 774 |
|
| 775 |
return null;
|
| 776 |
|
| 777 |
}
|
| 778 |
|
| 779 |
}
|
Parent Directory
| 
Revision Log