--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2015/07/28 08:08:22	2640
+++ dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/Database.java	2015/09/29 07:48:48	2725
@@ -1,7 +1,5 @@
 package dk.daoas.fulddaekning;
 
-import geocode.GeoPoint;
-
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -13,8 +11,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Queue;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Logger;
 
 
@@ -27,10 +27,10 @@
 	Connection conn;
 	PreparedStatement saveStmt;
 	
-	List<GeoPoint> alleAdresser;
+	List<Adresse> alleAdresser;
 	Adresse alleIkkeDaekkede[];
 	
-	Map<Short,List<GeoPoint>> daekkedeAdresserHO = new HashMap<Short,List<GeoPoint>>();
+	Map<Short,List<Adresse>> daekkedeAdresserHO = new HashMap<Short,List<Adresse>>();
 	
 	
 	
@@ -50,8 +50,8 @@
 	public Database(SafeProperties conf)  throws SQLException,IOException {
 		this.conn = getConnection( conf );	
 
-		String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
-				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
+		String sql = "INSERT INTO fulddaekning.afstand_anden_rute_ny (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,rute,afstand,`timestamp`) "+
+				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
 
 		saveStmt = conn.prepareStatement(sql);		
 
@@ -93,7 +93,7 @@
 	}
 
 
-	public Adresse[] hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr)  throws SQLException {
+	public Queue<Adresse> hentAlleIkkedaekkedeAdresser(int minPostnr, int maxPostnr)  throws SQLException {
 		
 		logger.info("Henter alle IKKE-daekkede adresser");
 
@@ -102,12 +102,12 @@
 				"LEFT JOIN bogleveringer.postnummerdistributor p on (a.postnr=p.postnr) " +
 				"WHERE rute IS NULL " +  //Ingen dækning
 				"AND a.postnr BETWEEN ? AND ? " +
-				"AND a.postnr NOT BETWEEN 3900 and 3999 " + //Skip greenland
-				"AND a.postnr NOT BETWEEN 9000 AND 9499 " + // Skip nordjylland (DAO)
 				"AND latitude IS NOT NULL " +
 				"AND longitude IS NOT NULL " +
 				"AND gadeid IS NOT NULL " +
-				"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') ";		
+				"AND (a.distributor IS NULL OR a.distributor<>'LUKKET') " 
+				//"LIMIT 2500"
+				;		
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		stmt.setInt(1, minPostnr);
 		stmt.setInt(2, maxPostnr);
@@ -140,13 +140,13 @@
 			
 			
 		}
-		return alleIkkeDaekkede;
+		return new ConcurrentLinkedQueue<Adresse>( list );
 	}
 	
 
 	
 	
-	public Map<Short, List<GeoPoint>> getDaekkedeAdresserHO() {
+	public Map<Short, List<Adresse>> getDaekkedeAdresserHO() {
 		return daekkedeAdresserHO;
 	}
 	
@@ -169,14 +169,14 @@
 	
 			List<Adresse> list = hentAdresseListe( stmt );
 			
-			alleAdresser = new ArrayList<GeoPoint>();
+			alleAdresser = new ArrayList<Adresse>();
 			alleAdresser.addAll(list);
 			
 			for(Adresse addr : list) {
 				short ho = addr.ho;
-				List<GeoPoint> hoListe = daekkedeAdresserHO.get(ho);
+				List<Adresse> hoListe = daekkedeAdresserHO.get(ho);
 				if ( hoListe == null) {
-					hoListe = new ArrayList<GeoPoint>();
+					hoListe = new ArrayList<Adresse>();
 					daekkedeAdresserHO.put(ho, hoListe);					
 				}
 				
@@ -202,22 +202,18 @@
 		saveStmt.setInt(4, orgAdresse.gadeid);
 		saveStmt.setShort(5, orgAdresse.husnr);
 		saveStmt.setString(6, orgAdresse.husnrbogstav);
-		saveStmt.setDouble(7, orgAdresse.latitude);
-		saveStmt.setDouble(8, orgAdresse.longitude);
-		saveStmt.setString(9, orgAdresse.rute);
-
-
-		saveStmt.setInt(10, bedsteAdresse.id);
-		saveStmt.setShort(11, bedsteAdresse.postnr);
-		saveStmt.setString(12, bedsteAdresse.adresse);
-		saveStmt.setInt(13, bedsteAdresse.gadeid);
-		saveStmt.setShort(14, bedsteAdresse.husnr);
-		saveStmt.setString(15, bedsteAdresse.husnrbogstav);
-		saveStmt.setDouble(16, bedsteAdresse.latitude);
-		saveStmt.setDouble(17, bedsteAdresse.longitude);
-		saveStmt.setString(18, bedsteAdresse.rute);
+		saveStmt.setString(7, orgAdresse.rute);
+
 
-		saveStmt.setDouble(19, bedsteAfstand);
+		saveStmt.setInt(8, bedsteAdresse.id);
+		saveStmt.setShort(9, bedsteAdresse.postnr);
+		saveStmt.setString(10, bedsteAdresse.adresse);
+		saveStmt.setInt(11, bedsteAdresse.gadeid);
+		saveStmt.setShort(12, bedsteAdresse.husnr);
+		saveStmt.setString(13, bedsteAdresse.husnrbogstav);
+		saveStmt.setString(14, bedsteAdresse.rute);
+
+		saveStmt.setDouble(15, bedsteAfstand);
 
 		saveStmt.addBatch();
 		batchCount++;
@@ -299,163 +295,5 @@
 	    return conn;
 	}
 
-	
-	// //////////////////////////////////////////////////////////////////
-	
-	/*
-	public Queue<Adresse> hentIkkedaekkedeAdresserCache(short postnr)  {
-		List<Adresse> postListe = ikkeDaekkedePrPost.get(postnr);
-		
-		return new ConcurrentLinkedQueue<Adresse>(postListe);		
-	}
-	
-	public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox, Adresse adresseListe[] ) {
-		long start = System.currentTimeMillis();
-		ArrayList<Adresse> list = new ArrayList<Adresse>();
-		for (Adresse a : adresseListe) {
-			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() ] );		
-	}
-
-	
-	/*public Adresse[] hentDaekkedeAdresserCache( BoundingBox bbox) {
-		return hentDaekkedeAdresserCache(bbox, alleAdresser);	
-	}*/
-	
-	/*
-	@Deprecated
-	private BoundingBox getBoundingboxFromDb_old(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 BETWEEN ? and ? and rute is null;";
-
-		PreparedStatement stmt = conn.prepareStatement(sql);
-		stmt.setString(1, minPostnr);
-		stmt.setString(2, maxPostnr);
-
-		ResultSet res = stmt.executeQuery();
-		res.next(); //query returnerer altid 1 række
-
-		BoundingBox bbox = new BoundingBox();
-		bbox.latitudeMax = res.getDouble("latmax");
-		bbox.latitudeMin = res.getDouble("latmin");
-		bbox.longitudeMax = res.getDouble("lngmax");
-		bbox.longitudeMin = res.getDouble("lngmin");
-
-		res.close();
-		stmt.close();
-
-		return bbox;
-	}
-
-	@Deprecated
-	public Adresse[] hentDaekkedeAdresser_old( BoundingBox bbox) throws SQLException {
-		long start = System.currentTimeMillis();
-		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 NOT NULL " + 
-				"AND latitude BETWEEN ? AND ? " +
-				"AND longitude BETWEEN ? AND ? " +
-				"AND a.distributor = ? ";
-
-		// Forward only + concur_read_only + fetchsize tvinger driver til at hente en række af gangen (bedre performance ved store result sets)
-		// Se http://dev.mysql.com/doc/connector-j/en/connector-j-reference-implementation-notes.html 
-		//PreparedStatement stmt = conn.prepareStatement(sql);
-		PreparedStatement stmt = conn.prepareStatement(sql, java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY);
-		stmt.setFetchSize(Integer.MIN_VALUE);
-
-		stmt.setDouble(1, bbox.latitudeMin);
-		stmt.setDouble(2, bbox.latitudeMax);
-		stmt.setDouble(3, bbox.longitudeMin);
-		stmt.setDouble(4, bbox.longitudeMax);
-		stmt.setString(5, LookupMain.distributor);
-
-		List<Adresse> list = hentAdresseListe( stmt );
-		long stop = System.currentTimeMillis();
-		logger.info("Elapsed DB: " + (stop - start));
-		return list.toArray( new Adresse[ list.size() ] );
-	}
-	
-	@Deprecated
-	public Queue<Adresse> hentIkkedaekkedeAdresser_old(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 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.setString(1, minPostnr);
-		stmt.setString(2, maxPostnr);
-
-		queue.addAll( hentAdresseListe( stmt ) );
-		return queue;
-	}
-	
-	@Deprecated
-	public List<String> hentPostnumre_old() throws SQLException {
-		ArrayList<String> list = new ArrayList<String>();
 		
-		Constants consts = Constants.getInstance();
-
-		/*
-		String sql = "SELECT postnr " + 
-					 "FROM fulddaekning.adressetabel " + 
-					 "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.getPostnrGroup() );
-
-		stmt.setInt(2, consts.getMinPostnr());
-		stmt.setInt(3, consts.getMaxPostnr());
-		ResultSet res = stmt.executeQuery();
-
-		while (res.next()) {
-			String postnr = res.getString("postnr2");
-			list.add(postnr);
-		}
-		res.close();
-		stmt.close();
-
-		//list.add(8700);
-
-		return list;
-	}*/
-
-	
 }