--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/OSMStreetnameHelper.java 2015/02/28 16:16:17 2410 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/OSMStreetnameHelper.java 2015/02/28 17:08:59 2411 @@ -6,6 +6,7 @@ import dk.daoas.daoadresseservice.admin.ServiceConfig; import dk.daoas.daoadresseservice.beans.OSMAddress; +import dk.daoas.daoadresseservice.beans.SearchRequest; import dk.daoas.daoadresseservice.beans.SearchResult; import dk.daoas.daoadresseservice.util.HttpUtil; import dk.thoerup.circuitbreaker.CircuitBreaker; @@ -21,7 +22,7 @@ } @Override - public String proposeStreetName(SearchResult result, int postnr, String vejnavn) { + public String proposeStreetName(SearchRequest request, SearchResult result) { if (conf.useOpenStreetMaps == false) return null; @@ -29,7 +30,7 @@ try { - OSMInvocation wrapper = new OSMInvocation( conf, postnr, vejnavn ); + OSMInvocation wrapper = new OSMInvocation( conf, request.postnr, request.vejnavn ); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("osm"); result.osmVej = (String) breaker.invoke(wrapper);