--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Adresse.java 2015/06/09 19:42:00 2575 +++ 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 short postnr; - public String adresse; + public String vejnavn; public int gadeid; public short husnr; public String husnrbogstav; public String rute; 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; } }