--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Adresse.java	2014/09/11 20:44:20	2211
+++ dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/Adresse.java	2015/10/07 20:14:10	2747
@@ -1,18 +1,40 @@
 package dk.daoas.fulddaekning;
 
-public class Adresse extends GeoPoint {
+
+public class Adresse {
 	public int id;
-	public int postnr;
-	public String adresse;
+	public short postnr;
+	public String vejnavn;
 	public int gadeid;
-	public int husnr;
+	public short husnr;
 	public String husnrbogstav;
 	public String rute;
+	public short ho;
+	
+	public double latitude;
+	public double longitude;
+	
+	public double xyz[] = new double[3];
+	
+	public Adresse(double latitude, double longitude) {
+		
+		this.latitude = latitude;
+		this.longitude = longitude;
+		
+    	xyz[0] = Math.cos(Math.toRadians(latitude)) * Math.cos(Math.toRadians(longitude));
+    	xyz[1] = Math.cos(Math.toRadians(latitude)) * Math.sin(Math.toRadians(longitude));
+    	xyz[2] = Math.sin(Math.toRadians(latitude));
+
+	}
 	
 	
 	@Override
 	public String toString() {
-		return "Adresse id=" + id+ " postnr=" + postnr + " adresse=" + adresse;
+		return "Adresse id=" + id+ " postnr=" + postnr + " adresse=" + vejnavn + " " + husnr + husnrbogstav + " ho=" + ho;
+	}
+	
+	public String getPosString() {
+		return "" + latitude + ", " + longitude + "   " + xyz[0] + "/" + xyz[1] + "/" + xyz[2];
 	}
 	
 }