--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Adresse.java	2014/10/08 08:44:56	2231
+++ dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/Adresse.java	2015/10/07 18:57:53	2743
@@ -1,19 +1,31 @@
 package dk.daoas.fulddaekning;
 
-public class Adresse extends GeoPoint {
+import com.jwetherell.algorithms.data_structures.KdTree;
+
+public class Adresse extends KdTree.XYZPoint {
 	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 int ho;
+	public short ho;
+	
+	public double latitude;
+	public double longitude;
+	
+	public Adresse(Double latitude, Double longitude) {
+		super(latitude, longitude);
+		
+		this.latitude = latitude;
+		this.longitude = longitude;
+	}
 	
 	
 	@Override
 	public String toString() {
-		return "Adresse id=" + id+ " postnr=" + postnr + " adresse=" + adresse + " ho=" + ho;
+		return "Adresse id=" + id+ " postnr=" + postnr + " adresse=" + vejnavn + " " + husnr + husnrbogstav + " ho=" + ho;
 	}
 	
 }