--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/11/11 13:45:21	2235
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2014/12/15 11:12:21	2247
@@ -7,6 +7,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Properties;
 import java.util.Queue;
@@ -22,6 +23,8 @@
 
 	Connection conn;
 	PreparedStatement saveStmt;
+	
+	private HashMap<String,BoundingBox> bbCache = new HashMap<String,BoundingBox>();
 
 	public Database(SafeProperties conf)  throws SQLException,IOException {
 		this.conn = getConnection( conf );	
@@ -56,16 +59,29 @@
 
 		logger.info("Executing: " + sql);
 		conn.createStatement().executeUpdate(sql);		
-	}	
+	}
+	
+	public BoundingBox getBoundingbox(String postnr) throws SQLException {
+		BoundingBox bb = bbCache.get(postnr);
+		if ( bb == null ) {
+			bb = getBoundingboxFromDb(postnr);
+			bbCache.put(postnr, bb);
+		}
+		
+		return bb.clone();//never return the original / cached object
+	}
 
-	public BoundingBox getBoundingbox(int postnr) throws SQLException {
+	private BoundingBox getBoundingboxFromDb(String postnr) throws SQLException {
+		String minPostnr = postnr.replace('x', '0');
+		String maxPostnr = postnr.replace('x', '9');
 
 		String sql = 
 				"SELECT max(latitude) latmax, min(latitude) latmin, max(longitude) lngmax,min(longitude) lngmin  " + 
-				"FROM fulddaekning.adressetabel WHERE postnr=? and rute is null;";
+				"FROM fulddaekning.adressetabel WHERE postnr BETWEEN ? and ? and rute is null;";
 
 		PreparedStatement stmt = conn.prepareStatement(sql);
-		stmt.setInt(1, postnr);
+		stmt.setString(1, minPostnr);
+		stmt.setString(2, maxPostnr);
 
 		ResultSet res = stmt.executeQuery();
 		res.next(); //query returnerer altid 1 række
@@ -81,46 +97,69 @@
 
 		return bbox;
 	}
+	
+	
 
-	public Queue<Adresse> hentIkkedaekkedeAdresser(int postnr)  throws SQLException {
+	public Queue<Adresse> hentIkkedaekkedeAdresser(String postnr)  throws SQLException {
+		
+		String minPostnr = postnr.replace('x', '0');
+		String maxPostnr = postnr.replace('x', '9');
+		
 		ConcurrentLinkedQueue<Adresse> queue = new ConcurrentLinkedQueue<Adresse>();
 
 		String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
 				"FROM fulddaekning.adressetabel a " +
 				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 				"WHERE rute IS NULL " +  //Ingen dækning
-				"AND a.postnr=?  " +
+				"AND a.postnr BETWEEN ? AND ? " +
 				"AND latitude IS NOT NULL " +
 				"AND longitude IS NOT NULL " +
 				"AND gadeid IS NOT NULL " +
 				"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";		
 		PreparedStatement stmt = conn.prepareStatement(sql);
-		stmt.setInt(1, postnr);
+		stmt.setString(1, minPostnr);
+		stmt.setString(2, maxPostnr);
 
 		queue.addAll( hentAdresseListe( stmt ) );
 		return queue;
 	}
 
-	public List<Integer> hentPostnumre() throws SQLException {
-		ArrayList<Integer> list = new ArrayList<Integer>();
+	public List<String> hentPostnumre() throws SQLException {
+		ArrayList<String> list = new ArrayList<String>();
 		
 		Constants consts = Constants.getInstance();
 
-
+		/*
 		String sql = "SELECT postnr " + 
 					 "FROM fulddaekning.adressetabel " + 
-					 //"WHERE distributor = ? and rute is not null " +
 					 "WHERE postnr BETWEEN ? AND ? " +
+					 "AND rute is null " + // Træk kun liste på postnumre hvor der er ikke-dækkede adresser
 					 "GROUP BY postnr " + 
 					 "ORDER by postnr";
+		*/
+		
+		
+		String sql = "SELECT rpad(left(postnr,?),'4', 'x') as postnr2 " + 
+					 "FROM fulddaekning.adressetabel " + 
+					 "WHERE postnr BETWEEN ? AND ? " +
+					 "AND rute is null " + // Trae kun liste paa postnumre hvor der er ikke-daekede adresser
+					 "AND (postnr NOT BETWEEN 3900 and 3999) " + //Skip alle groenlandske postnumre
+					 "GROUP BY postnr2 " + 
+					 "ORDER by postnr2 ";
+		
+					 
+					 
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		//stmt.setString(1, Lookup.distributor );
-		stmt.setInt(1, consts.getMinPostnr());
-		stmt.setInt(2, consts.getMaxPostnr());
+
+		stmt.setInt(1, consts.getPostnrGroup() );
+
+		stmt.setInt(2, consts.getMinPostnr());
+		stmt.setInt(3, consts.getMaxPostnr());
 		ResultSet res = stmt.executeQuery();
 
 		while (res.next()) {
-			int postnr = res.getInt("postnr");
+			String postnr = res.getString("postnr2");
 			list.add(postnr);
 		}
 		res.close();
@@ -150,7 +189,7 @@
 		stmt.setDouble(2, bbox.latitudeMax);
 		stmt.setDouble(3, bbox.longitudeMin);
 		stmt.setDouble(4, bbox.longitudeMax);
-		stmt.setString(5, Lookup.distributor);
+		stmt.setString(5, LookupMain.distributor);
 
 		List<Adresse> list = hentAdresseListe( stmt );
 		return list.toArray( new Adresse[ list.size() ] );
@@ -172,7 +211,7 @@
 		PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
 		stmt.setFetchSize(Integer.MIN_VALUE);
 
-		stmt.setString(1, Lookup.distributor);
+		stmt.setString(1, LookupMain.distributor);
 
 		List<Adresse> list = hentAdresseListe( stmt );
 		return list.toArray( new Adresse[ list.size() ] );