--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/02/27 09:39:05 2395 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/03/20 13:57:47 2457 @@ -27,7 +27,8 @@ public static List
getAllAdresses() throws SQLException { String debugFilter = DatabaseLayer.DEBUG ? " AND postnr = 8700 " : ""; - String sql = "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute " + String sql = + "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,latitude,longitude " + "FROM fulddaekning.adressetabel " + "WHERE gadeid IS NOT NULL " + debugFilter @@ -63,6 +64,8 @@ a.dbkBane = res.getInt(10); a.koreliste = korelisteCache.getInstance( res.getString(11) ); a.rute = ruteCache.getInstance( res.getString(12) ); + a.latitude = res.getDouble(13); + a.longitude = res.getDouble(14); //a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn); @@ -276,17 +279,22 @@ return 20; case ERROR_MISSING_HOUSENUMBER: return 21; + case ERROR_POSTBOX: + return 22; case ERROR_UNKNOWN_STREETNAME: - return 22; - case ERROR_UNKNOWN_ADDRESSPOINT: return 23; - case STATUS_NOT_COVERED: + case ERROR_UNKNOWN_ADDRESSPOINT: return 24; - case STATUS_OK: + case STATUS_NOT_COVERED: return 25; + case ERROR_INTERNAL: // + return 26; + + case STATUS_OK: + return 30; default: - return 29; + return 31; } }