--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/beans/Address.java 2016/01/24 21:48:55 2838 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/beans/Address.java 2016/01/28 22:14:42 2876 @@ -4,7 +4,7 @@ public class Address implements Comparable
{ public enum AddressState { - NOT_CHANGED, CREATED, OPENED, MODIFIED, CLOSED + NOT_CHANGED, CREATED, OPENED, MODIFIED, CLOSED, CREATE_FAIL } @@ -45,9 +45,6 @@ public String korelisteSondag; - public Address extTarget; - public float extAfstand; - public float latitude; public float longitude; @@ -55,7 +52,7 @@ //book keeping - public boolean visited = false; + //public boolean visited = false; public boolean visitedMan = false; public boolean visitedTir = false; public boolean visitedOns = false; @@ -77,12 +74,12 @@ @Override public String toString() { - return String.format("Address{id=%d postnr=%d vejnavn=%s husnr=%d litra=%s}", id, postnr, vejnavn, husnr, husnrbogstav); + return String.format("Address{id=%d gadeid=%d postnr=%d vejnavn=%s husnr=%d litra=%s}", id, gadeid, postnr, vejnavn, husnr, husnrbogstav); } public String toStringExtended() { - return String.format("Address{id=%d postnr=%d vejnavn=%s husnr=%d litra=%s ma=%s ti=%s on=%s to=%s fr=%s lo=%s so=%s }", id, postnr, vejnavn, husnr, husnrbogstav, stateMan, stateTir, stateOns, stateTor, stateFre, stateLor, stateSon); + return String.format("Address{id=%d gadeid=%d postnr=%d vejnavn=%s husnr=%d litra=%s ma=%s ti=%s on=%s to=%s fr=%s lo=%s so=%s }", id, gadeid, postnr, vejnavn, husnr, husnrbogstav, stateMan, stateTir, stateOns, stateTor, stateFre, stateLor, stateSon); } public String getRuteString() {