--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Adresse.java	2014/04/30 08:15:48	2145
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Adresse.java	2014/10/08 08:44:56	2231
@@ -1,33 +1,19 @@
 package dk.daoas.fulddaekning;
 
-public class Adresse {
+public class Adresse extends GeoPoint {
 	public int id;
 	public int postnr;
 	public String adresse;
 	public int gadeid;
 	public int husnr;
 	public String husnrbogstav;
-	public double latitude;
-	public double longitude;
 	public String rute;
+	public int ho;
 	
 	
 	@Override
 	public String toString() {
-		return "Adresse id=" + id+ " postnr=" + postnr + " adresse=" + adresse;
+		return "Adresse id=" + id+ " postnr=" + postnr + " adresse=" + adresse + " ho=" + ho;
 	}
 	
-	public static double beregnAfstand(Adresse adr1, Adresse adr2) {		
-		//(62.8*sqrt(3.1*(Power(a.Latitude-x.Latitude,2)+Power(a.Longitude-x.Longitude,2)))) as Afstand,
-		
-		
-		double pwrLat = Math.pow(adr1.latitude - adr2.latitude, 2);
-		double pwrLng = Math.pow(adr1.longitude-adr2.longitude, 2);
-		
-		return 62.8 * Math.sqrt( 3.1 * (pwrLat + pwrLng) );
-		
-	}
-	
-	
-	
 }