--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/Address.java	2015/02/13 11:48:23	2274
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/beans/Address.java	2015/05/20 08:55:51	2547
@@ -1,30 +1,73 @@
-package dk.daoas.daoadresseservice;
+package dk.daoas.daoadresseservice.beans;
 
+import dk.daoas.daoadresseservice.DaekningsType;
 
-public class Address {
+
+public class Address implements Comparable<Address> {
 	public int id;
-	public int postnr;
+	public short postnr;
 	public String vejnavn;	
-	public long gadeid;
-	public int kommunekode;
-	public int vejkode;
-	public int husnr;
+	public int gadeid;// GadeID kan godt være i en alm 32bit int 
+	public short kommunekode;
+	public short vejkode;
+	public short husnr;
 	
 	public String husnrbogstav;
 	
 	public String distributor;
 	
-	public int dbkBane;
+	public short dbkBane;
 	public String rute;
 	public String koreliste;
 	
-	public String vasketVejnavn;
+	public String ruteLordag;
+	public String korelisteLordag;
+	
+	public String ruteSondag;
+	public String korelisteSondag;
+	
+	//public String vasketVejnavn;
 	
 	public DaekningsType daekningsType;
+	
+	public Address extTarget;
+	public float extAfstand;
+	
+	public float latitude;
+	public float longitude;
 		
 		
 	@Override
 	public String toString() {
 		return "Adresse id=" + id+ " postnr=" + postnr + " vejnavn=" + vejnavn ;
 	}
+
+
+	@Override
+	public int compareTo(Address arg0) {
+		if (this.postnr != arg0.postnr)
+			return Integer.compare(this.postnr, arg0.postnr);
+
+		if (this.gadeid != arg0.gadeid)
+			return Long.compare(this.gadeid, arg0.gadeid);
+		
+		if (this.husnr != arg0.husnr)
+			return Integer.compare(this.husnr, arg0.husnr);
+		
+		return this.husnrbogstav.compareTo( arg0.husnrbogstav );
+	}
+
+	@Override
+	public int hashCode() {
+		return this.id;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (! (o instanceof Address) )
+			return false;
+
+		Address a = (Address) o;
+		return (this.id == a.id); //we rely on uniqueness of DB primary key
+	}
 }