23 |
|
|
24 |
List<Address> alleAdresser; |
List<Address> alleAdresser; |
25 |
|
|
26 |
|
Map<String,Long> helperCache; |
27 |
|
|
28 |
|
|
29 |
Map<Integer,HundredePctBean> hundredePct; |
Map<Integer,HundredePctBean> hundredePct; |
30 |
|
|
31 |
|
|
32 |
public SearchResult search(String postnrStr, String adresse) { |
public SearchResult search(String postnrStr, String adresse) { |
|
//long start1 = System.currentTimeMillis(); |
|
33 |
|
|
34 |
int postnr=0; |
int postnr=0; |
35 |
|
boolean google = false; |
36 |
|
boolean osm = false; |
37 |
|
|
38 |
try { |
try { |
39 |
postnr = Integer.parseInt(postnrStr); |
postnr = Integer.parseInt(postnrStr); |
40 |
} catch (Exception E) { |
} catch (Exception E) { |
41 |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
42 |
} |
} |
|
//long start2 = System.currentTimeMillis(); |
|
43 |
|
|
44 |
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr); |
Map<String,Long> postnrVeje = searchPostnrVejnavnGadeid.get(postnr); |
45 |
|
|
47 |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
return new SearchResult(Status.ERROR_UNKNOWN_POSTAL); |
48 |
} |
} |
49 |
|
|
|
//long start3 = System.currentTimeMillis(); |
|
50 |
|
|
51 |
SplitResult split = AddressUtils.splitAdresse(adresse); |
SplitResult split = AddressUtils.splitAdresse(adresse); |
52 |
String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); |
String vasketVejnavn = AddressUtils.vaskVejnavn( split.vej ); |
54 |
if (split.husnr.length() == 0) { |
if (split.husnr.length() == 0) { |
55 |
return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); |
return new SearchResult(Status.ERROR_MISSING_HOUSENUMBER); |
56 |
} |
} |
|
//long start4 = System.currentTimeMillis(); |
|
57 |
|
|
58 |
Long gadeident = postnrVeje.get(vasketVejnavn); |
Long gadeident = postnrVeje.get(vasketVejnavn); |
59 |
|
|
60 |
|
if ( gadeident == null) { |
61 |
|
gadeident = helperCache.get(vasketVejnavn); |
62 |
|
} |
63 |
|
|
64 |
|
|
65 |
|
if ( gadeident == null) { |
66 |
|
String googleVej = GeocodeHelper.googleHelper(postnr, split.vej ); |
67 |
|
google = true; |
68 |
|
|
69 |
|
if (googleVej != null) { |
70 |
|
String googleVasket = AddressUtils.vaskVejnavn( googleVej ); |
71 |
|
gadeident = postnrVeje.get(googleVasket); |
72 |
|
|
73 |
|
if (gadeident != null) { |
74 |
|
helperCache.put(vasketVejnavn, gadeident); |
75 |
|
} |
76 |
|
} |
77 |
|
} |
78 |
|
|
79 |
|
if ( gadeident == null) { |
80 |
|
String osmVej = GeocodeHelper.openstreetmapHelper(postnr, split.vej ); |
81 |
|
osm = true; |
82 |
|
|
83 |
|
if (osmVej != null) { |
84 |
|
String osmVasket = AddressUtils.vaskVejnavn( osmVej ); |
85 |
|
gadeident = postnrVeje.get(osmVasket); |
86 |
|
|
87 |
|
if (gadeident != null) { |
88 |
|
helperCache.put(vasketVejnavn, gadeident); |
89 |
|
} |
90 |
|
} |
91 |
|
} |
92 |
|
|
93 |
if (gadeident == null) { |
if (gadeident == null) { |
94 |
return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); |
return new SearchResult(Status.ERROR_UNKNOWN_STREETNAME); |
95 |
} |
} |
|
//long start5 = System.currentTimeMillis(); |
|
96 |
|
|
97 |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle |
Map<String, Address> gade = searchGadeidentAdresser.get(gadeident); //Denne søgning må ikke fejle |
98 |
|
|
|
//long start6 = System.currentTimeMillis(); |
|
99 |
|
|
100 |
String husnrSearch = "" + split.husnr + split.litra; |
String husnrSearch = "" + split.husnr + split.litra; |
101 |
Address addr = gade.get(husnrSearch); |
Address addr = gade.get(husnrSearch); |
102 |
//long start7 = System.currentTimeMillis(); |
|
103 |
if (addr == null) { |
if (addr == null) { |
104 |
return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); |
return new SearchResult(Status.ERROR_UNKNOWN_ADDRESSPOINT); |
105 |
} |
} |
110 |
|
|
111 |
if (addr.distributor.equals("LUKKET")) { |
if (addr.distributor.equals("LUKKET")) { |
112 |
return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? |
return new SearchResult(Status.STATUS_NOT_COVERED); //Skal vi have en special status til Lukkede adresser ? |
113 |
} |
} |
|
|
|
|
/* |
|
|
System.out.println("Search2: " + (start2-start1) ); |
|
|
System.out.println("Search3: " + (start3-start1) ); |
|
|
System.out.println("Search4: " + (start4-start1) ); |
|
|
System.out.println("Search5: " + (start5-start1) ); |
|
|
System.out.println("Search6: " + (start6-start1) ); |
|
|
System.out.println("Search7: " + (start7-start1) ); |
|
|
*/ |
|
|
|
|
|
|
|
114 |
|
|
115 |
return new SearchResult(addr); |
SearchResult res = new SearchResult(addr); |
116 |
|
res.google = google; |
117 |
|
res.osm = osm; |
118 |
|
return res; |
119 |
} |
} |
120 |
|
|
121 |
|
|
122 |
public void buildSearchStructures() throws SQLException{ |
public void buildSearchStructures() throws SQLException{ |
123 |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
searchPostnrVejnavnGadeid = new HashMap<Integer, Map<String,Long>>(); |
124 |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
searchGadeidentAdresser = new HashMap<Long, Map<String,Address>>(); |
125 |
|
helperCache = new ConcurrentHashMap<String,Long>(); |
126 |
|
|
127 |
System.out.println("Build -- stage 1"); |
System.out.println("Build -- stage 1"); |
128 |
|
|
129 |
alleAdresser = DatabaseLayer.getAllAdresses(); |
alleAdresser = DatabaseLayer.getAllAdresses(); |
363 |
aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); |
aliasSet.add( vejnavn.replace("ae", "æ").replace("oe", "ø").replace("aa", "å") ); |
364 |
|
|
365 |
|
|
366 |
|
aliasSet.add(vejnavn.replace("dronningens", "dr") ); |
367 |
|
aliasSet.add(vejnavn.replace("dr.", "dronningens") ); |
368 |
|
aliasSet.add(vejnavn.replace("dr ", "dronningens") ); |
369 |
|
|
370 |
|
aliasSet.add(vejnavn.replace("kvt", "kvarter") ); |
371 |
|
aliasSet.add(vejnavn.replace("kvarter", "kvt") ); |
372 |
|
|
373 |
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
aliasSet.add(vejnavn.replace("gl", "gammel") ); |
374 |
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
aliasSet.add(vejnavn.replace("gammel", "gl") ); |
375 |
|
|