--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/GoogleStreetnameHelper.java 2015/02/28 16:16:17 2410 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/GoogleStreetnameHelper.java 2015/02/28 17:08:59 2411 @@ -11,6 +11,7 @@ import com.google.code.geocoder.model.GeocoderStatus; import dk.daoas.daoadresseservice.admin.ServiceConfig; +import dk.daoas.daoadresseservice.beans.SearchRequest; import dk.daoas.daoadresseservice.beans.SearchResult; import dk.thoerup.circuitbreaker.CircuitBreaker; import dk.thoerup.circuitbreaker.CircuitBreakerManager; @@ -24,14 +25,14 @@ } @Override - public String proposeStreetName(SearchResult result, int postnr, String vejnavn) { + public String proposeStreetName(SearchRequest request, SearchResult result) { if (conf.useGoogle == false) return null; result.google = true; try { - GoogleInvocation wrapper = new GoogleInvocation( conf, postnr, vejnavn ); + GoogleInvocation wrapper = new GoogleInvocation( conf, request.postnr, request.vejnavn ); CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("google");