9 |
import java.util.HashSet; |
import java.util.HashSet; |
10 |
import java.util.List; |
import java.util.List; |
11 |
import java.util.Map; |
import java.util.Map; |
12 |
|
import java.util.Map.Entry; |
13 |
import java.util.Set; |
import java.util.Set; |
14 |
|
import java.util.TreeMap; |
15 |
|
import java.util.TreeSet; |
16 |
import java.util.concurrent.ConcurrentHashMap; |
import java.util.concurrent.ConcurrentHashMap; |
17 |
|
|
18 |
import org.apache.commons.lang3.StringUtils; |
import org.apache.commons.lang3.StringUtils; |
23 |
import dk.daoas.daoadresseservice.beans.DataStatisticsBean; |
import dk.daoas.daoadresseservice.beans.DataStatisticsBean; |
24 |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
import dk.daoas.daoadresseservice.beans.ExtendedBean; |
25 |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
import dk.daoas.daoadresseservice.beans.HundredePctBean; |
26 |
|
import dk.daoas.daoadresseservice.beans.SearchRequest; |
27 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
28 |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
import dk.daoas.daoadresseservice.beans.SearchResult.Status; |
29 |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
import dk.daoas.daoadresseservice.db.DatabaseLayer; |
30 |
|
import dk.daoas.daoadresseservice.util.DeduplicateHelper; |
31 |
|
import dk.daoas.daoadresseservice.util.NaturalOrderComparator; |
32 |
|
|
33 |
public class AddressSearch { |
public class AddressSearch { |
34 |
|
|
35 |
private Map<Integer, Map<String,Long>> searchPostnrVejnavnGadeid; |
private Map<Short, Map<String,Integer>> searchPostnrVejnavnGadeid; |
36 |
private Map<Long, Map<String,Address>> searchGadeidentAdresser; |
private Map<Integer, Map<String,Address>> searchGadeidentAdresser; |
37 |
|
|
38 |
private List<Address> alleAdresser; |
private List<Address> alleAdresser; |
39 |
|
|
40 |
private Map<String,Long> helperCache; |
private Map<String,Integer> helperCache; |
41 |
|
|
42 |
private DataStatisticsBean stats = new DataStatisticsBean(); |
private DataStatisticsBean stats = new DataStatisticsBean(); |
43 |
|
|
44 |
ServiceConfig config; |
ServiceConfig config; |
45 |
|
|
46 |
|
StreetnameHelper levenshteinHelper; |
47 |
StreetnameHelper googleHelper; |
StreetnameHelper googleHelper; |
48 |
StreetnameHelper osmHelper; |
StreetnameHelper osmHelper; |
49 |
|
|
50 |
|
|
51 |
public AddressSearch(ServiceConfig config) { |
public AddressSearch(ServiceConfig config) { |
52 |
this.config = config; |
this.config = config; |
53 |
|
|
54 |
|
levenshteinHelper = new LevenshteinStreetnameHelper( this ); |
55 |
googleHelper = new GoogleStreetnameHelper( config ); |
googleHelper = new GoogleStreetnameHelper( config ); |
56 |
osmHelper = new OSMStreetnameHelper( config ); |
osmHelper = new OSMStreetnameHelper( config ); |
57 |
} |
} |
58 |
|
|
59 |
|
|
60 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
61 |
|
SearchRequest request = new SearchRequest(); |
62 |
SearchResult result = new SearchResult(); |
SearchResult result = new SearchResult(); |
63 |
|
|
|
int postnr=0; |
|
64 |
|
|
65 |
String helperSearchKey = ""; |
String helperSearchKey = ""; |
66 |
|
|
67 |
try { |
try { |
68 |
postnr = Integer.parseInt(postnrStr); |
request.postnr = Short.parseShort(postnrStr); |
69 |
} catch (Exception E) { |
} catch (Exception E) { |
70 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
71 |
return result; |
return result; |
72 |
} |
} |
73 |
|
|
|
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr); |
|
74 |
|
|
75 |
if (postnrVeje == null) { |
request.streetNames = searchPostnrVejnavnGadeid.get(request.postnr); |
76 |
|
|
77 |
|
if (request.streetNames == null) { |
78 |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
result.status = Status.ERROR_UNKNOWN_POSTAL; |
79 |
return result; |
return result; |
80 |
} |
} |
81 |
|
|
82 |
|
|
83 |
result.splitResult = AddressUtils.splitAdresse(adresse); |
result.splitResult = AddressUtils.splitAdresse(adresse); |
84 |
|
request.vejnavn = result.splitResult.vej; |
85 |
|
|
86 |
|
|
87 |
|
|
88 |
if (result.splitResult.husnr.length() == 0) { |
if (result.splitResult.husnr.length() == 0) { |
90 |
return result; |
return result; |
91 |
} |
} |
92 |
|
|
93 |
String vasketVejnavn = AddressUtils.vaskVejnavn( result.splitResult.vej ); |
request.vasketVejnavn = AddressUtils.vaskVejnavn( request.vejnavn ); |
94 |
|
|
95 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
|
96 |
|
if (request.vasketVejnavn.indexOf("pakkebo") > -1 |
97 |
|
|| request.vasketVejnavn.indexOf("døgnpost") > -1 |
98 |
|
|| request.vasketVejnavn.indexOf("døgnbo") > -1 |
99 |
|
|| request.vasketVejnavn.equals("id") |
100 |
|
) { |
101 |
|
result.status = Status.ERROR_POSTBOX; |
102 |
|
return result; |
103 |
|
} |
104 |
|
|
105 |
|
Integer gadeident = request.streetNames.get(request.vasketVejnavn); |
106 |
|
|
107 |
|
|
108 |
if ( gadeident == null) { |
if ( gadeident == null) { |
109 |
helperSearchKey = "" + postnr + "/" + vasketVejnavn; |
helperSearchKey = "" + request.postnr + "/" + request.vasketVejnavn; |
110 |
gadeident = helperCache.get(helperSearchKey); |
gadeident = helperCache.get(helperSearchKey); |
111 |
} |
} |
112 |
|
|
113 |
if (gadeident == null) { |
if (gadeident == null) { |
114 |
String best = getbestLevenshteinDistance(vasketVejnavn, postnrVeje); |
String vej = levenshteinHelper.proposeStreetName(request, result); |
115 |
if (best != null) { |
if (vej != null) { |
116 |
result.levenshtein = true; |
gadeident = request.streetNames.get(vej); |
|
gadeident = postnrVeje.get(best); |
|
117 |
} |
} |
118 |
} |
} |
119 |
|
|
121 |
// Brug OpenStreetMap før vi prøver google |
// Brug OpenStreetMap før vi prøver google |
122 |
// For google har en request limit, det har OSM ikke! |
// For google har en request limit, det har OSM ikke! |
123 |
if ( gadeident == null) { |
if ( gadeident == null) { |
124 |
String vej = osmHelper.proposeStreetName(result, postnr, result.splitResult.vej); |
String vej = osmHelper.proposeStreetName(request, result); |
125 |
gadeident = helperWrapper(vej, postnrVeje, helperSearchKey); |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
126 |
} |
} |
127 |
|
|
128 |
if ( gadeident == null) { |
if ( gadeident == null) { |
129 |
String vej = googleHelper.proposeStreetName(result, postnr, result.splitResult.vej); |
String vej = googleHelper.proposeStreetName(request, result); |
130 |
gadeident = helperWrapper(vej, postnrVeje, helperSearchKey); |
gadeident = helperWrapper(vej, request.streetNames, helperSearchKey); |
131 |
} |
} |
132 |
|
|
133 |
|
|
178 |
return result; |
return result; |
179 |
} |
} |
180 |
|
|
181 |
private Long helperWrapper(String vej, Map<String,Long> postnrVeje, String helperSearchKey) { |
private Integer helperWrapper(String vej, Map<String,Integer> postnrVeje, String helperSearchKey) { |
182 |
if (vej == null) |
if (vej == null) |
183 |
return null; |
return null; |
184 |
|
|
185 |
String vejVasket = AddressUtils.vaskVejnavn( vej ); |
String vejVasket = AddressUtils.vaskVejnavn( vej ); |
186 |
Long gadeident = postnrVeje.get(vejVasket); |
Integer gadeident = postnrVeje.get(vejVasket); |
187 |
|
|
188 |
if (gadeident != null) { |
if (gadeident != null) { |
189 |
helperCache.put(helperSearchKey, gadeident); |
helperCache.put(helperSearchKey, gadeident); |
192 |
|
|
193 |
} |
} |
194 |
|
|
195 |
|
public Map<String,Integer> getStretsByPostal(int zip) { |
196 |
|
return searchPostnrVejnavnGadeid.get(zip); |
197 |
|
} |
198 |
|
|
199 |
|
|
200 |
|
|
201 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
202 |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
searchPostnrVejnavnGadeid = new HashMap<Short, Map<String,Integer>>(); |
203 |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Integer, Map<String,Address>>(); |
204 |
helperCache = new ConcurrentHashMap<String,Long>(); |
helperCache = new ConcurrentHashMap<String,Integer>(); |
205 |
|
|
206 |
long start1 = System.currentTimeMillis(); |
long start1 = System.currentTimeMillis(); |
207 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
211 |
|
|
212 |
/* Mapper mellem db Row ID og adresse noden */ |
/* Mapper mellem db Row ID og adresse noden */ |
213 |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
Map<Integer,Address> idAddressMap = new HashMap<Integer,Address>( alleAdresser.size() ); |
214 |
|
DeduplicateHelper<String> aliasHelper = new DeduplicateHelper<String>(); |
215 |
|
DeduplicateHelper<String> husnrHelper = new DeduplicateHelper<String>(); |
216 |
|
|
217 |
for (Address a : alleAdresser) { |
for (Address a : alleAdresser) { |
218 |
idAddressMap.put(a.id, a); |
idAddressMap.put(a.id, a); |
219 |
|
|
220 |
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(a.postnr); |
221 |
|
|
222 |
if (postnrVeje == null) { |
if (postnrVeje == null) { |
223 |
postnrVeje = new ConcurrentHashMap<String,Long>(); |
postnrVeje = new ConcurrentHashMap<String,Integer>(); |
224 |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
searchPostnrVejnavnGadeid.put(a.postnr, postnrVeje); |
225 |
} |
} |
226 |
|
|
227 |
|
|
228 |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
String vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); |
229 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
Integer gadeident = postnrVeje.get(vasketVejnavn); |
230 |
if (gadeident == null) { |
if (gadeident == null) { |
231 |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
//postnrVeje.put(vasketVejnavn, a.gadeid); |
232 |
|
|
235 |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
Set<String> aliaser = findVejAliaser(a.vejnavn); |
236 |
for(String alias : aliaser) { |
for(String alias : aliaser) { |
237 |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
String vasketAlias = AddressUtils.vaskVejnavn(alias); |
238 |
|
vasketAlias = aliasHelper.getInstance(vasketAlias); |
239 |
|
|
240 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
241 |
} |
} |
242 |
} |
} |
247 |
searchGadeidentAdresser.put(gadeident, gade); |
searchGadeidentAdresser.put(gadeident, gade); |
248 |
} |
} |
249 |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
String husnrSearch = "" + a.husnr + a.husnrbogstav; |
250 |
|
husnrSearch = husnrHelper.getInstance(husnrSearch); |
251 |
gade.put(husnrSearch, a); |
gade.put(husnrSearch, a); |
252 |
} |
} |
253 |
|
|
259 |
int vaskCount = 0; |
int vaskCount = 0; |
260 |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
List<AliasBean> aliasList = DatabaseLayer.getAliasList(); |
261 |
for (AliasBean alias : aliasList) { |
for (AliasBean alias : aliasList) { |
262 |
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
Map<String,Integer> postnrVeje = searchPostnrVejnavnGadeid.get(alias.postnr); |
263 |
|
|
264 |
if (postnrVeje == null) { |
if (postnrVeje == null) { |
265 |
//Burde ikke kunne ske - men better safe than sorry |
//Burde ikke kunne ske - men better safe than sorry |
269 |
String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn); |
String vasketVej = AddressUtils.vaskVejnavn(alias.vejnavn); |
270 |
String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn); |
String vasketAlias = AddressUtils.vaskVejnavn(alias.aliasVejnavn); |
271 |
|
|
272 |
Long gadeident = postnrVeje.get(vasketVej); |
Integer gadeident = postnrVeje.get(vasketVej); |
273 |
if (gadeident == null) { |
if (gadeident == null) { |
274 |
//Kender ikke den oprindelige vej |
//Kender ikke den oprindelige vej |
275 |
continue; |
continue; |
276 |
} |
} |
277 |
|
|
278 |
Long aliasIdent = postnrVeje.get(vasketAlias); |
Integer aliasIdent = postnrVeje.get(vasketAlias); |
279 |
|
|
280 |
if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet |
if (aliasIdent == null) { //Vi kender ikke denne variant af vejnavnet |
281 |
postnrVeje.put(vasketAlias, gadeident); |
postnrVeje.put(vasketAlias, gadeident); |
291 |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
System.out.println("Build, stage2 elapsed: " + (start3-start2) ); |
292 |
System.out.println("Build -- stage 3 udvidet dækning"); |
System.out.println("Build -- stage 3 udvidet dækning"); |
293 |
|
|
294 |
|
DeduplicateHelper<String> ruteHelper = new DeduplicateHelper<String>(); |
295 |
|
DeduplicateHelper<String> korelisteHelper = new DeduplicateHelper<String>(); |
296 |
|
|
297 |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
List<ExtendedBean> extDao = DatabaseLayer.getExtendedAdresslist(); |
298 |
for (ExtendedBean eb : extDao) { |
for (ExtendedBean eb : extDao) { |
299 |
|
|
318 |
|
|
319 |
boolean covered = false; |
boolean covered = false; |
320 |
if (targetAddress.distributor.equals("DAO")) { |
if (targetAddress.distributor.equals("DAO")) { |
321 |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
orgAddress.rute = calculateExtendedDaoRoute(eb,orgAddress,targetAddress); |
322 |
|
orgAddress.rute = ruteHelper.getInstance(orgAddress.rute); |
323 |
|
|
324 |
if (orgAddress.rute != null) { |
if (orgAddress.rute != null) { |
325 |
orgAddress.koreliste = targetAddress.koreliste; |
orgAddress.koreliste = targetAddress.koreliste; |
326 |
covered = true; |
covered = true; |
328 |
} |
} |
329 |
|
|
330 |
if (targetAddress.distributor.equals("BK")) { |
if (targetAddress.distributor.equals("BK")) { |
331 |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
orgAddress.koreliste = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress); |
332 |
|
orgAddress.koreliste = korelisteHelper.getInstance(orgAddress.koreliste); |
333 |
|
|
334 |
if (orgAddress.koreliste != null) { |
if (orgAddress.koreliste != null) { |
335 |
orgAddress.rute = targetAddress.rute; |
orgAddress.rute = targetAddress.rute; |
336 |
covered = true; |
covered = true; |
357 |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
System.out.println("Build, stage3 elapsed: " + (start4-start3) ); |
358 |
System.out.println("Build -- stage 4 - 100pct"); |
System.out.println("Build -- stage 4 - 100pct"); |
359 |
|
|
360 |
Map<Integer,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
Map<Short,HundredePctBean> hundredePct = DatabaseLayer.get100PctList(); |
361 |
for (Address addr : alleAdresser) { |
for (Address addr : alleAdresser) { |
362 |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
if (addr.daekningsType != DaekningsType.DAEKNING_IKKEDAEKKET) { |
363 |
continue; |
continue; |
427 |
} |
} |
428 |
|
|
429 |
|
|
|
private String getbestLevenshteinDistance(String vasketVejnavn, Map<String,Long> postnrVeje) { |
|
|
for(String vej : postnrVeje.keySet()) { |
|
|
if ( StringUtils.getLevenshteinDistance(vasketVejnavn, vej) == 1) { |
|
|
System.out.println("Levenstein: " + vasketVejnavn + "->" + vej); |
|
|
return vej; |
|
|
} |
|
|
} |
|
|
|
|
|
return null; |
|
|
} |
|
|
|
|
430 |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) { |
431 |
|
if (targetAddress.rute == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel |
432 |
|
return null; |
433 |
|
} |
434 |
|
|
435 |
// /////////////////////////////////////////////////////////////////// |
// /////////////////////////////////////////////////////////////////// |
436 |
switch( eb.transport) { |
switch( eb.transport) { |
598 |
aliasSet.add(vejnavn.replace("allé", "allú") ); |
aliasSet.add(vejnavn.replace("allé", "allú") ); |
599 |
|
|
600 |
aliasSet.add(vejnavn.replace("gade", "gaed") ); //Fundet i logs.hentruteinfo |
aliasSet.add(vejnavn.replace("gade", "gaed") ); //Fundet i logs.hentruteinfo |
601 |
|
aliasSet.add(vejnavn.replace("gade", "gde") ); |
602 |
|
|
603 |
aliasSet.add(vejnavn.replace("plads", "pl") ); |
aliasSet.add(vejnavn.replace("plads", "pl") ); |
604 |
aliasSet.add(vejnavn.replace("vænget", "vænge") ); |
aliasSet.add(vejnavn.replace("vænget", "vænge") ); |
621 |
//danske tegn 2 |
//danske tegn 2 |
622 |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("ø", "oe") ); |
623 |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") ); |
aliasSet.add( vVejnavn.replace("æ", "ae").replace("å", "aa") ); |
624 |
aliasSet.add( vVejnavn.replace("ø", "ae").replace("å", "aa") ); |
aliasSet.add( vVejnavn.replace("ø", "oe").replace("å", "aa") ); |
625 |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") ); |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("oe","ø") ); |
626 |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") ); |
aliasSet.add( vVejnavn.replace("ae", "æ").replace("aa","å") ); |
627 |
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
aliasSet.add( vVejnavn.replace("oe", "ø").replace("aa", "å") ); |
634 |
return aliasSet; |
return aliasSet; |
635 |
} |
} |
636 |
|
|
637 |
|
public Set<Short> getPostnumre() { |
638 |
|
return new TreeSet<Short>( searchPostnrVejnavnGadeid.keySet() ); |
639 |
|
} |
640 |
|
|
641 |
|
public Set<Entry<String,Integer>> getVejnavne(short postnr) { |
642 |
|
Map<String,Integer> map = searchPostnrVejnavnGadeid.get(postnr); |
643 |
|
TreeMap<String,Integer> newMap = new TreeMap<String,Integer>(); |
644 |
|
for (Entry<String,Integer> entry : map.entrySet() ) { |
645 |
|
newMap.put(entry.getKey(), entry.getValue()); |
646 |
|
} |
647 |
|
|
648 |
|
return newMap.entrySet(); |
649 |
|
} |
650 |
|
|
651 |
|
public Set<String> getHusnumre(int gadeid) { |
652 |
|
|
653 |
|
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
654 |
|
|
655 |
|
Set<String> set = new TreeSet<String>( new NaturalOrderComparator<String>() ); |
656 |
|
set.addAll( gade.keySet() ); |
657 |
|
|
658 |
|
return set; |
659 |
|
} |
660 |
|
|
661 |
|
public Address getAdresse(int gadeid, String husnr) { |
662 |
|
|
663 |
|
Map<String, Address> gade = searchGadeidentAdresser.get(gadeid); |
664 |
|
return gade.get(husnr); |
665 |
|
|
666 |
|
} |
667 |
|
|
668 |
} |
} |