1 |
package dk.daoas.fulddaekning; |
package dk.daoas.fulddaekning; |
2 |
|
|
3 |
|
import geocode.GeoPoint; |
4 |
|
|
5 |
import java.io.IOException; |
import java.io.IOException; |
6 |
import java.sql.Connection; |
import java.sql.Connection; |
7 |
import java.sql.DriverManager; |
import java.sql.DriverManager; |
13 |
import java.util.List; |
import java.util.List; |
14 |
import java.util.Map; |
import java.util.Map; |
15 |
import java.util.Properties; |
import java.util.Properties; |
|
import java.util.Queue; |
|
16 |
import java.util.Set; |
import java.util.Set; |
17 |
import java.util.TreeSet; |
import java.util.TreeSet; |
|
import java.util.concurrent.ConcurrentLinkedQueue; |
|
18 |
import java.util.logging.Logger; |
import java.util.logging.Logger; |
19 |
|
|
20 |
|
|
27 |
Connection conn; |
Connection conn; |
28 |
PreparedStatement saveStmt; |
PreparedStatement saveStmt; |
29 |
|
|
30 |
Adresse alleAdresser[]; |
List<GeoPoint> alleAdresser; |
31 |
Adresse alleIkkeDaekkede[]; |
Adresse alleIkkeDaekkede[]; |
32 |
|
|
33 |
|
Map<Short,List<GeoPoint>> daekkedeAdresserHO = new HashMap<Short,List<GeoPoint>>(); |
34 |
|
|
35 |
|
|
36 |
|
|
37 |
|
|
38 |
|
|
39 |
|
|
40 |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
41 |
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
42 |
|
|
43 |
Set<Integer> postnumre = new TreeSet<Integer>(); |
Set<Short> postnumre = new TreeSet<Short>(); |
44 |
|
|
45 |
Map<Integer, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Integer, List<Adresse>>(); |
//Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>(); |
46 |
|
|
47 |
|
|
48 |
private HashMap<Integer,BoundingBox> bbCache = new HashMap<Integer,BoundingBox>(); |
private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>(); |
49 |
|
|
50 |
public Database(SafeProperties conf) throws SQLException,IOException { |
public Database(SafeProperties conf) throws SQLException,IOException { |
51 |
this.conn = getConnection( conf ); |
this.conn = getConnection( conf ); |
76 |
conn.createStatement().executeUpdate(sql); |
conn.createStatement().executeUpdate(sql); |
77 |
|
|
78 |
logger.info("Rename tables"); |
logger.info("Rename tables"); |
79 |
sql = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext; |
String sql2 = "RENAME TABLE fulddaekning.afstand_anden_rute" + ext + " TO fulddaekning.afstand_anden_rute_old" + ext + ", fulddaekning.afstand_anden_rute_ny TO fulddaekning.afstand_anden_rute" + ext; |
80 |
|
|
81 |
logger.info("Executing: " + sql); |
logger.info("Executing: " + sql2); |
82 |
conn.createStatement().executeUpdate(sql); |
conn.createStatement().executeUpdate(sql2); |
83 |
} |
} |
84 |
|
|
85 |
public BoundingBox getBoundingbox(int postnr) { |
public BoundingBox getBoundingbox(short postnr) { |
86 |
BoundingBox bb = bbCache.get(postnr); |
BoundingBox bb = bbCache.get(postnr); |
87 |
return bb.clone();//never return the original / cached object |
return bb.clone();//never return the original / cached object |
88 |
} |
} |
89 |
|
|
90 |
|
|
91 |
public Set<Integer> hentPostnumreCache() { |
public Set<Short> hentPostnumreCache() { |
92 |
return postnumre; |
return postnumre; |
93 |
} |
} |
94 |
|
|
95 |
|
|
96 |
public void hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException { |
public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException { |
97 |
|
|
98 |
logger.info("Henter alle IKKE-daekkede adresser"); |
logger.info("Henter alle IKKE-daekkede adresser"); |
99 |
|
|
102 |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " + |
103 |
"WHERE rute IS NULL " + //Ingen dækning |
"WHERE rute IS NULL " + //Ingen dækning |
104 |
"AND a.postnr BETWEEN ? AND ? " + |
"AND a.postnr BETWEEN ? AND ? " + |
105 |
|
"AND a.postnr NOT BETWEEN 3900 and 3999 " + //Skip greenland |
106 |
|
"AND a.postnr NOT BETWEEN 9000 AND 9499 " + // Skip nordjylland (DAO) |
107 |
"AND latitude IS NOT NULL " + |
"AND latitude IS NOT NULL " + |
108 |
"AND longitude IS NOT NULL " + |
"AND longitude IS NOT NULL " + |
109 |
"AND gadeid IS NOT NULL " + |
"AND gadeid IS NOT NULL " + |
119 |
|
|
120 |
for (Adresse a : alleIkkeDaekkede) { |
for (Adresse a : alleIkkeDaekkede) { |
121 |
|
|
|
List<Adresse> postListe; |
|
122 |
|
|
123 |
BoundingBox bbox; |
BoundingBox bbox; |
124 |
|
|
125 |
if (! postnumre.contains(a.postnr )) { |
if (! postnumre.contains(a.postnr )) { |
126 |
postnumre.add( a.postnr ); |
postnumre.add( a.postnr ); |
127 |
|
|
128 |
bbox = new BoundingBox(); |
bbox = new BoundingBox(); |
|
postListe = new ArrayList<Adresse>(); |
|
129 |
|
|
130 |
bbCache.put( a.postnr, bbox); |
bbCache.put( a.postnr, bbox); |
|
ikkeDaekkedePrPost.put(a.postnr, postListe); |
|
131 |
|
|
132 |
} else { |
} else { |
133 |
bbox = bbCache.get( a.postnr); |
bbox = bbCache.get( a.postnr); |
|
postListe = ikkeDaekkedePrPost.get(a.postnr); |
|
134 |
} |
} |
135 |
|
|
136 |
bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude); |
bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude); |
138 |
bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude); |
bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude); |
139 |
bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude); |
bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude); |
140 |
|
|
|
postListe.add(a); |
|
141 |
|
|
142 |
} |
} |
143 |
|
return alleIkkeDaekkede; |
144 |
} |
} |
145 |
|
|
|
public Queue<Adresse> hentIkkedaekkedeAdresserCache(int postnr) { |
|
|
List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr); |
|
|
|
|
|
return new ConcurrentLinkedQueue<Adresse>(postListe); |
|
|
} |
|
146 |
|
|
147 |
|
|
|
public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) { |
|
|
long start = System.currentTimeMillis(); |
|
|
ArrayList<Adresse> list = new ArrayList<Adresse>(); |
|
|
for (Adresse a : alleAdresser) { |
|
|
if ( a.latitude > bbox.latitudeMin && a.latitude< bbox.latitudeMax && a.longitude> bbox.longitudeMin && a.longitude < bbox.longitudeMax) { |
|
|
list.add(a); |
|
|
} |
|
|
} |
|
|
long stop = System.currentTimeMillis(); |
|
|
logger.info("Elapsed cache: " + (stop - start)); |
|
|
return list.toArray( new Adresse[ list.size() ] ); |
|
|
} |
|
148 |
|
|
149 |
|
public Map<Short, List<GeoPoint>> getDaekkedeAdresserHO() { |
150 |
|
return daekkedeAdresserHO; |
151 |
|
} |
152 |
|
|
153 |
public Adresse[] hentAlleDaekkedeAdresser() throws SQLException { |
public int hentAlleDaekkedeAdresser() throws SQLException { |
154 |
if ( alleAdresser == null ) { |
if ( alleAdresser == null ) { |
155 |
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + |
156 |
"FROM fulddaekning.adressetabel a " + |
"FROM fulddaekning.adressetabel a " + |
168 |
stmt.setString(1, LookupMain.distributor); |
stmt.setString(1, LookupMain.distributor); |
169 |
|
|
170 |
List<Adresse> list = hentAdresseListe( stmt ); |
List<Adresse> list = hentAdresseListe( stmt ); |
171 |
alleAdresser = list.toArray( new Adresse[ list.size() ] ); |
|
172 |
|
alleAdresser = new ArrayList<GeoPoint>(); |
173 |
|
alleAdresser.addAll(list); |
174 |
|
|
175 |
|
for(Adresse addr : list) { |
176 |
|
short ho = addr.ho; |
177 |
|
List<GeoPoint> hoListe = daekkedeAdresserHO.get(ho); |
178 |
|
if ( hoListe == null) { |
179 |
|
hoListe = new ArrayList<GeoPoint>(); |
180 |
|
daekkedeAdresserHO.put(ho, hoListe); |
181 |
|
} |
182 |
|
|
183 |
|
hoListe.add(addr); |
184 |
|
|
185 |
|
} |
186 |
} |
} |
187 |
return alleAdresser; |
|
188 |
|
return alleAdresser.size(); |
189 |
} |
} |
190 |
|
|
191 |
|
|
197 |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
198 |
|
|
199 |
saveStmt.setInt(1, orgAdresse.id); |
saveStmt.setInt(1, orgAdresse.id); |
200 |
saveStmt.setInt(2, orgAdresse.postnr); |
saveStmt.setShort(2, orgAdresse.postnr); |
201 |
saveStmt.setString(3, orgAdresse.adresse); |
saveStmt.setString(3, orgAdresse.adresse); |
202 |
saveStmt.setInt(4, orgAdresse.gadeid); |
saveStmt.setInt(4, orgAdresse.gadeid); |
203 |
saveStmt.setInt(5, orgAdresse.husnr); |
saveStmt.setShort(5, orgAdresse.husnr); |
204 |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
205 |
saveStmt.setDouble(7, orgAdresse.latitude); |
saveStmt.setDouble(7, orgAdresse.latitude); |
206 |
saveStmt.setDouble(8, orgAdresse.longitude); |
saveStmt.setDouble(8, orgAdresse.longitude); |
208 |
|
|
209 |
|
|
210 |
saveStmt.setInt(10, bedsteAdresse.id); |
saveStmt.setInt(10, bedsteAdresse.id); |
211 |
saveStmt.setInt(11, bedsteAdresse.postnr); |
saveStmt.setShort(11, bedsteAdresse.postnr); |
212 |
saveStmt.setString(12, bedsteAdresse.adresse); |
saveStmt.setString(12, bedsteAdresse.adresse); |
213 |
saveStmt.setInt(13, bedsteAdresse.gadeid); |
saveStmt.setInt(13, bedsteAdresse.gadeid); |
214 |
saveStmt.setInt(14, bedsteAdresse.husnr); |
saveStmt.setShort(14, bedsteAdresse.husnr); |
215 |
saveStmt.setString(15, bedsteAdresse.husnrbogstav); |
saveStmt.setString(15, bedsteAdresse.husnrbogstav); |
216 |
saveStmt.setDouble(16, bedsteAdresse.latitude); |
saveStmt.setDouble(16, bedsteAdresse.latitude); |
217 |
saveStmt.setDouble(17, bedsteAdresse.longitude); |
saveStmt.setDouble(17, bedsteAdresse.longitude); |
246 |
//logger.info("Starting exec query done"); |
//logger.info("Starting exec query done"); |
247 |
|
|
248 |
while (res.next()) { |
while (res.next()) { |
249 |
Adresse adr = new Adresse(); |
|
250 |
|
double latitude = res.getDouble(7); |
251 |
|
double longitude = res.getDouble(8); |
252 |
|
|
253 |
|
|
254 |
|
Adresse adr = new Adresse(latitude,longitude); |
255 |
|
|
|
/* |
|
|
adr.id = res.getInt("id"); |
|
|
adr.postnr = res.getInt("postnr"); |
|
|
adr.adresse = res.getString("adresse"); |
|
|
adr.gadeid = res.getInt("gadeid"); |
|
|
adr.husnr = res.getInt("husnr"); |
|
|
adr.husnrbogstav = res.getString("husnrbogstav"); |
|
|
adr.latitude = res.getDouble("latitude"); |
|
|
adr.longitude = res.getDouble("longitude"); |
|
|
adr.rute = res.getString("rute"); |
|
|
adr.ho = res.getInt("ho"); |
|
|
*/ |
|
|
|
|
256 |
adr.id = res.getInt(1); |
adr.id = res.getInt(1); |
257 |
adr.postnr = res.getInt(2); |
adr.postnr = res.getShort(2); |
258 |
adr.adresse = res.getString(3); |
adr.adresse = res.getString(3); |
259 |
adr.gadeid = res.getInt(4); |
adr.gadeid = res.getInt(4); |
260 |
adr.husnr = res.getInt(5); |
adr.husnr = res.getShort(5); |
261 |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |
262 |
adr.latitude = res.getDouble(7); |
//adr.latitude = res.getDouble(7); |
263 |
adr.longitude = res.getDouble(8); |
//adr.longitude = res.getDouble(8); |
264 |
adr.rute = ruteCache.getInstance( res.getString(9) ); |
adr.rute = ruteCache.getInstance( res.getString(9) ); |
265 |
adr.ho = res.getInt(10); |
adr.ho = res.getShort(10); |
266 |
|
|
267 |
list.add(adr); |
list.add(adr); |
268 |
|
|
301 |
|
|
302 |
|
|
303 |
// ////////////////////////////////////////////////////////////////// |
// ////////////////////////////////////////////////////////////////// |
304 |
|
|
305 |
|
/* |
306 |
|
public Queue<Adresse> hentIkkedaekkedeAdresserCache(short postnr) { |
307 |
|
List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr); |
308 |
|
|
309 |
|
return new ConcurrentLinkedQueue<Adresse>(postListe); |
310 |
|
} |
311 |
|
|
312 |
|
public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox, Adresse adresseListe[] ) { |
313 |
|
long start = System.currentTimeMillis(); |
314 |
|
ArrayList<Adresse> list = new ArrayList<Adresse>(); |
315 |
|
for (Adresse a : adresseListe) { |
316 |
|
if ( a.latitude > bbox.latitudeMin && a.latitude< bbox.latitudeMax && a.longitude> bbox.longitudeMin && a.longitude < bbox.longitudeMax) { |
317 |
|
list.add(a); |
318 |
|
} |
319 |
|
} |
320 |
|
long stop = System.currentTimeMillis(); |
321 |
|
logger.info("Elapsed cache: " + (stop - start)); |
322 |
|
return list.toArray( new Adresse[ list.size() ] ); |
323 |
|
} |
324 |
|
|
325 |
|
|
326 |
|
/*public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) { |
327 |
|
return hentDaekkedeAdresserCache(bbox, alleAdresser); |
328 |
|
}*/ |
329 |
|
|
330 |
/* |
/* |
331 |
@Deprecated |
@Deprecated |
332 |
private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException { |
private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException { |