--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Database.java	2015/08/10 08:59:14	2641
+++ dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/Database.java	2015/10/07 18:57:53	2743
@@ -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,16 +27,16 @@
 	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>>();
 	
 	
 	
 	
 
-
+	DeduplicateHelper<String> vejnavnCache = new DeduplicateHelper<String>();
 	DeduplicateHelper<String> husnrbogstavCache = new DeduplicateHelper<String>();
 	DeduplicateHelper<String> ruteCache = new DeduplicateHelper<String>(); 
 	
@@ -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);		
 
@@ -68,6 +68,10 @@
 	}	
 	
 	public void renameResultTables() throws SQLException {
+		if (LookupMain.test_mode == true) {
+			throw new RuntimeException("Can not rename tables in test mode");
+		}
+
 		Constants consts = Constants.getInstance();
 		String ext = consts.getTableExtension();
 		
@@ -93,21 +97,25 @@
 	}
 
 
-	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");
 
-		String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
+		String sql = "SELECT id,a.postnr,vejnavn,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 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') " 
+				;		
+		
+		if (LookupMain.test_mode == true) {
+			sql = sql + " LIMIT 100 ";
+		}
+		
 		PreparedStatement stmt = conn.prepareStatement(sql);
 		stmt.setInt(1, minPostnr);
 		stmt.setInt(2, maxPostnr);
@@ -140,25 +148,29 @@
 			
 			
 		}
-		return alleIkkeDaekkede;
+		return new ConcurrentLinkedQueue<Adresse>( list );
 	}
 	
 
 	
 	
-	public Map<Short, List<GeoPoint>> getDaekkedeAdresserHO() {
+	public Map<Short, List<Adresse>> getDaekkedeAdresserHO() {
 		return daekkedeAdresserHO;
 	}
 	
 	public int hentAlleDaekkedeAdresser() throws SQLException {
 		if ( alleAdresser == null ) {
-			String sql = "SELECT id,a.postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,p.distributor as ho " + 
+			String sql = "SELECT id,a.postnr,vejnavn,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 IS NOT NULL " +
 					"AND longitude IS NOT NULL " +
 					"AND a.distributor = ? ";
+
+			if (LookupMain.test_mode == true) {
+				sql = sql + " AND a.postnr BETWEEN 6000 and 7200 ";
+			}
 	
 			// 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 
@@ -169,14 +181,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);					
 				}
 				
@@ -191,33 +203,29 @@
 	
 
 	public synchronized void gemResultat(Adresse orgAdresse, Adresse bedsteAdresse, double bedsteAfstand) throws SQLException {
-		/*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgAdresse,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,adresse,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
+		/*String sql = "INSERT INTO fulddaekning.afstand_anden_rute_thn (orgId,orgPostnr, orgVejnavn,orgGadeid,orgHusnr,orgHusnrBogstav,orgLatitude,orgLongitude,orgRute,id,postnr,vejnavn,gadeid,husnr,husnrbogstav,latitude,longitude,rute,afstand,`timestamp`) "+
 				"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, now() )";
 
 		PreparedStatement saveStmt = conn.prepareStatement(sql);*/
 
 		saveStmt.setInt(1, orgAdresse.id);
 		saveStmt.setShort(2, orgAdresse.postnr);
-		saveStmt.setString(3, orgAdresse.adresse);
+		saveStmt.setString(3, orgAdresse.vejnavn);
 		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.setInt(8, bedsteAdresse.id);
+		saveStmt.setShort(9, bedsteAdresse.postnr);
+		saveStmt.setString(10, bedsteAdresse.vejnavn);
+		saveStmt.setInt(11, bedsteAdresse.gadeid);
+		saveStmt.setShort(12, bedsteAdresse.husnr);
+		saveStmt.setString(13, bedsteAdresse.husnrbogstav);
+		saveStmt.setString(14, bedsteAdresse.rute);
 
-		saveStmt.setDouble(19, bedsteAfstand);
+		saveStmt.setDouble(15, bedsteAfstand);
 
 		saveStmt.addBatch();
 		batchCount++;
@@ -255,7 +263,7 @@
 
 			adr.id = res.getInt(1);
 			adr.postnr = res.getShort(2);
-			adr.adresse = res.getString(3);
+			adr.vejnavn = vejnavnCache.getInstance( res.getString(3) );
 			adr.gadeid = res.getInt(4);
 			adr.husnr = res.getShort(5);
 			adr.husnrbogstav = husnrbogstavCache.getInstance( res.getString(6) );