--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/05/12 13:30:55 2544 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/db/DatabaseLayer.java 2015/05/20 08:55:51 2547 @@ -28,7 +28,7 @@ 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,latitude,longitude " + "SELECT id,vejnavn,husnr,husnrbogstav,kommunekode,vejkode,postnr,gadeid,upper(distributor) AS distributor,dbkbane,koreliste,rute,korelisteloerdag,ruteloerdag,korelistesoendag,rutesoendag,latitude,longitude " + "FROM fulddaekning.adressetabel " + "WHERE gadeid IS NOT NULL " + debugFilter @@ -62,10 +62,16 @@ a.gadeid = res.getInt(8); a.distributor = distributorCache.getInstance(res.getString(9)); a.dbkBane = (short) res.getInt(10); + a.koreliste = korelisteCache.getInstance( res.getString(11) ); a.rute = ruteCache.getInstance( res.getString(12) ); - a.latitude = (float) res.getDouble(13); - a.longitude = (float) res.getDouble(14); + a.korelisteLordag = korelisteCache.getInstance( res.getString(13) ); + a.ruteLordag = ruteCache.getInstance( res.getString(14) ); + a.korelisteSondag = korelisteCache.getInstance( res.getString(15) ); + a.ruteSondag = ruteCache.getInstance( res.getString(16) ); + + a.latitude = (float) res.getDouble(17); + a.longitude = (float) res.getDouble(18); //a.vasketVejnavn = AddressUtils.vaskVejnavn(a.vejnavn);