--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/DataInspectorServlet.java 2015/03/24 11:05:24 2489 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/admin/DataInspectorServlet.java 2015/03/25 09:54:27 2503 @@ -36,24 +36,26 @@ throw new ServletException("Data not ready yet"); } - long gadeid; + int gadeid; String res=""; switch ( type ) { case "postnr": res = getPostnumre(search); break; + case "vejnavn": - int postnr = Integer.parseInt( request.getParameter("postnr") ); + short postnr = Short.parseShort( request.getParameter("postnr") ); res = getVejnavne(search, postnr); break; + case "husnr": - gadeid = Long.parseLong( request.getParameter("gadeid") ); + gadeid = Integer.parseInt( request.getParameter("gadeid") ); res = getHusnumre(search, gadeid); break; case "adresse": - gadeid = Long.parseLong( request.getParameter("gadeid") ); + gadeid = Integer.parseInt( request.getParameter("gadeid") ); String husnr = request.getParameter("husnr"); res = getAdresse(search, gadeid, husnr); break; @@ -75,10 +77,10 @@ return sb.toString(); } - protected String getVejnavne(AddressSearch search, int postnr) { + protected String getVejnavne(AddressSearch search, short postnr) { StringBuilder sb = new StringBuilder(); - for (Entry vej : search.getVejnavne(postnr)) { + for (Entry vej : search.getVejnavne(postnr)) { sb.append("\n"); @@ -97,7 +99,7 @@ return sb.toString(); } - protected String getAdresse(AddressSearch search, long gadeid, String husnr) { + protected String getAdresse(AddressSearch search, int gadeid, String husnr) { StringBuilder sb = new StringBuilder(); Address addresse = search.getAdresse(gadeid, husnr); @@ -123,7 +125,8 @@ if (addresse.daekningsType == DaekningsType.DAEKNING_UDVIDET) { - sb.append("Udv.afstand: ").append( addresse.extAfstand).append("
\n"); + + sb.append("Udv.afstand: ").append( String.format("%.3f", addresse.extAfstand) ).append("
\n"); sb.append("Nærmeste: ") .append( addresse.extTarget.vejnavn) .append(" ")