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; |
11 |
import java.util.ArrayList; |
import java.util.ArrayList; |
12 |
import java.util.HashMap; |
import java.util.HashMap; |
13 |
import java.util.List; |
import java.util.List; |
|
import java.util.Map; |
|
14 |
import java.util.Properties; |
import java.util.Properties; |
|
import java.util.Queue; |
|
15 |
import java.util.Set; |
import java.util.Set; |
16 |
import java.util.TreeSet; |
import java.util.TreeSet; |
|
import java.util.concurrent.ConcurrentLinkedQueue; |
|
17 |
import java.util.logging.Logger; |
import java.util.logging.Logger; |
18 |
|
|
19 |
|
|
26 |
Connection conn; |
Connection conn; |
27 |
PreparedStatement saveStmt; |
PreparedStatement saveStmt; |
28 |
|
|
29 |
Adresse alleAdresser[]; |
List<GeoPoint> alleAdresser; |
30 |
Adresse alleIkkeDaekkede[]; |
Adresse alleIkkeDaekkede[]; |
31 |
|
|
32 |
|
|
33 |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>(); |
34 |
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); |
35 |
|
|
36 |
Set<Integer> postnumre = new TreeSet<Integer>(); |
Set<Short> postnumre = new TreeSet<Short>(); |
37 |
|
|
38 |
Map<Integer, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Integer, List<Adresse>>(); |
//Map<Short, List<Adresse>> ikkeDaekkedePrPost = new HashMap<Short, List<Adresse>>(); |
39 |
|
|
40 |
|
|
41 |
private HashMap<Integer,BoundingBox> bbCache = new HashMap<Integer,BoundingBox>(); |
private HashMap<Short,BoundingBox> bbCache = new HashMap<Short,BoundingBox>(); |
42 |
|
|
43 |
public Database(SafeProperties conf) throws SQLException,IOException { |
public Database(SafeProperties conf) throws SQLException,IOException { |
44 |
this.conn = getConnection( conf ); |
this.conn = getConnection( conf ); |
69 |
conn.createStatement().executeUpdate(sql); |
conn.createStatement().executeUpdate(sql); |
70 |
|
|
71 |
logger.info("Rename tables"); |
logger.info("Rename tables"); |
72 |
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; |
73 |
|
|
74 |
logger.info("Executing: " + sql); |
logger.info("Executing: " + sql2); |
75 |
conn.createStatement().executeUpdate(sql); |
conn.createStatement().executeUpdate(sql2); |
76 |
} |
} |
77 |
|
|
78 |
public BoundingBox getBoundingbox(int postnr) { |
public BoundingBox getBoundingbox(short postnr) { |
79 |
BoundingBox bb = bbCache.get(postnr); |
BoundingBox bb = bbCache.get(postnr); |
80 |
return bb.clone();//never return the original / cached object |
return bb.clone();//never return the original / cached object |
81 |
} |
} |
82 |
|
|
83 |
|
|
84 |
public Set<Integer> hentPostnumreCache() { |
public Set<Short> hentPostnumreCache() { |
85 |
return postnumre; |
return postnumre; |
86 |
} |
} |
87 |
|
|
88 |
|
|
89 |
public void hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException { |
public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr) throws SQLException { |
90 |
|
|
91 |
logger.info("Henter alle IKKE-daekkede adresser"); |
logger.info("Henter alle IKKE-daekkede adresser"); |
92 |
|
|
110 |
|
|
111 |
for (Adresse a : alleIkkeDaekkede) { |
for (Adresse a : alleIkkeDaekkede) { |
112 |
|
|
|
List<Adresse> postListe; |
|
113 |
|
|
114 |
BoundingBox bbox; |
BoundingBox bbox; |
115 |
|
|
116 |
if (! postnumre.contains(a.postnr )) { |
if (! postnumre.contains(a.postnr )) { |
117 |
postnumre.add( a.postnr ); |
postnumre.add( a.postnr ); |
118 |
|
|
119 |
bbox = new BoundingBox(); |
bbox = new BoundingBox(); |
|
postListe = new ArrayList<Adresse>(); |
|
120 |
|
|
121 |
bbCache.put( a.postnr, bbox); |
bbCache.put( a.postnr, bbox); |
|
ikkeDaekkedePrPost.put(a.postnr, postListe); |
|
122 |
|
|
123 |
} else { |
} else { |
124 |
bbox = bbCache.get( a.postnr); |
bbox = bbCache.get( a.postnr); |
|
postListe = ikkeDaekkedePrPost.get(a.postnr); |
|
125 |
} |
} |
126 |
|
|
127 |
bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude); |
bbox.latitudeMax = Math.max(bbox.latitudeMax, a.latitude); |
129 |
bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude); |
bbox.longitudeMax = Math.max(bbox.longitudeMax, a.longitude); |
130 |
bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude); |
bbox.longitudeMin = Math.min(bbox.longitudeMin, a.longitude); |
131 |
|
|
|
postListe.add(a); |
|
132 |
|
|
133 |
} |
} |
134 |
|
return alleIkkeDaekkede; |
135 |
} |
} |
136 |
|
|
|
public Queue<Adresse> hentIkkedaekkedeAdresserCache(int postnr) { |
|
|
List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr); |
|
|
|
|
|
return new ConcurrentLinkedQueue<Adresse>(postListe); |
|
|
} |
|
137 |
|
|
138 |
|
|
|
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() ] ); |
|
|
} |
|
139 |
|
|
140 |
|
|
141 |
public Adresse[] hentAlleDaekkedeAdresser() throws SQLException { |
|
142 |
|
public List<GeoPoint> hentAlleDaekkedeAdresser() throws SQLException { |
143 |
if ( alleAdresser == null ) { |
if ( alleAdresser == null ) { |
144 |
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 " + |
145 |
"FROM fulddaekning.adressetabel a " + |
"FROM fulddaekning.adressetabel a " + |
157 |
stmt.setString(1, LookupMain.distributor); |
stmt.setString(1, LookupMain.distributor); |
158 |
|
|
159 |
List<Adresse> list = hentAdresseListe( stmt ); |
List<Adresse> list = hentAdresseListe( stmt ); |
160 |
alleAdresser = list.toArray( new Adresse[ list.size() ] ); |
|
161 |
|
alleAdresser = new ArrayList<GeoPoint>(); |
162 |
|
alleAdresser.addAll(list); |
163 |
} |
} |
164 |
return alleAdresser; |
return alleAdresser; |
165 |
} |
} |
173 |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
PreparedStatement saveStmt = conn.prepareStatement(sql);*/ |
174 |
|
|
175 |
saveStmt.setInt(1, orgAdresse.id); |
saveStmt.setInt(1, orgAdresse.id); |
176 |
saveStmt.setInt(2, orgAdresse.postnr); |
saveStmt.setShort(2, orgAdresse.postnr); |
177 |
saveStmt.setString(3, orgAdresse.adresse); |
saveStmt.setString(3, orgAdresse.adresse); |
178 |
saveStmt.setInt(4, orgAdresse.gadeid); |
saveStmt.setInt(4, orgAdresse.gadeid); |
179 |
saveStmt.setInt(5, orgAdresse.husnr); |
saveStmt.setShort(5, orgAdresse.husnr); |
180 |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
saveStmt.setString(6, orgAdresse.husnrbogstav); |
181 |
saveStmt.setDouble(7, orgAdresse.latitude); |
saveStmt.setDouble(7, orgAdresse.latitude); |
182 |
saveStmt.setDouble(8, orgAdresse.longitude); |
saveStmt.setDouble(8, orgAdresse.longitude); |
184 |
|
|
185 |
|
|
186 |
saveStmt.setInt(10, bedsteAdresse.id); |
saveStmt.setInt(10, bedsteAdresse.id); |
187 |
saveStmt.setInt(11, bedsteAdresse.postnr); |
saveStmt.setShort(11, bedsteAdresse.postnr); |
188 |
saveStmt.setString(12, bedsteAdresse.adresse); |
saveStmt.setString(12, bedsteAdresse.adresse); |
189 |
saveStmt.setInt(13, bedsteAdresse.gadeid); |
saveStmt.setInt(13, bedsteAdresse.gadeid); |
190 |
saveStmt.setInt(14, bedsteAdresse.husnr); |
saveStmt.setShort(14, bedsteAdresse.husnr); |
191 |
saveStmt.setString(15, bedsteAdresse.husnrbogstav); |
saveStmt.setString(15, bedsteAdresse.husnrbogstav); |
192 |
saveStmt.setDouble(16, bedsteAdresse.latitude); |
saveStmt.setDouble(16, bedsteAdresse.latitude); |
193 |
saveStmt.setDouble(17, bedsteAdresse.longitude); |
saveStmt.setDouble(17, bedsteAdresse.longitude); |
222 |
//logger.info("Starting exec query done"); |
//logger.info("Starting exec query done"); |
223 |
|
|
224 |
while (res.next()) { |
while (res.next()) { |
225 |
Adresse adr = new Adresse(); |
|
226 |
|
double latitude = res.getDouble(7); |
227 |
|
double longitude = res.getDouble(8); |
228 |
|
|
229 |
|
|
230 |
|
Adresse adr = new Adresse(latitude,longitude); |
231 |
|
|
|
/* |
|
|
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"); |
|
|
*/ |
|
|
|
|
232 |
adr.id = res.getInt(1); |
adr.id = res.getInt(1); |
233 |
adr.postnr = res.getInt(2); |
adr.postnr = res.getShort(2); |
234 |
adr.adresse = res.getString(3); |
adr.adresse = res.getString(3); |
235 |
adr.gadeid = res.getInt(4); |
adr.gadeid = res.getInt(4); |
236 |
adr.husnr = res.getInt(5); |
adr.husnr = res.getShort(5); |
237 |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |
adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) ); |
238 |
adr.latitude = res.getDouble(7); |
//adr.latitude = res.getDouble(7); |
239 |
adr.longitude = res.getDouble(8); |
//adr.longitude = res.getDouble(8); |
240 |
adr.rute = ruteCache.getInstance( res.getString(9) ); |
adr.rute = ruteCache.getInstance( res.getString(9) ); |
241 |
adr.ho = res.getInt(10); |
adr.ho = res.getShort(10); |
242 |
|
|
243 |
list.add(adr); |
list.add(adr); |
244 |
|
|
277 |
|
|
278 |
|
|
279 |
// ////////////////////////////////////////////////////////////////// |
// ////////////////////////////////////////////////////////////////// |
280 |
|
|
281 |
|
/* |
282 |
|
public Queue<Adresse> hentIkkedaekkedeAdresserCache(short postnr) { |
283 |
|
List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr); |
284 |
|
|
285 |
|
return new ConcurrentLinkedQueue<Adresse>(postListe); |
286 |
|
} |
287 |
|
|
288 |
|
public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox, Adresse adresseListe[] ) { |
289 |
|
long start = System.currentTimeMillis(); |
290 |
|
ArrayList<Adresse> list = new ArrayList<Adresse>(); |
291 |
|
for (Adresse a : adresseListe) { |
292 |
|
if ( a.latitude > bbox.latitudeMin && a.latitude< bbox.latitudeMax && a.longitude> bbox.longitudeMin && a.longitude < bbox.longitudeMax) { |
293 |
|
list.add(a); |
294 |
|
} |
295 |
|
} |
296 |
|
long stop = System.currentTimeMillis(); |
297 |
|
logger.info("Elapsed cache: " + (stop - start)); |
298 |
|
return list.toArray( new Adresse[ list.size() ] ); |
299 |
|
} |
300 |
|
|
301 |
|
|
302 |
|
/*public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) { |
303 |
|
return hentDaekkedeAdresserCache(bbox, alleAdresser); |
304 |
|
}*/ |
305 |
|
|
306 |
/* |
/* |
307 |
@Deprecated |
@Deprecated |
308 |
private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException { |
private BoundingBox getBoundingboxFromDb_old(String postnr) throws SQLException { |