11 |
import com.google.code.geocoder.model.GeocoderStatus; |
import com.google.code.geocoder.model.GeocoderStatus; |
12 |
|
|
13 |
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
14 |
|
import dk.daoas.daoadresseservice.beans.SearchRequest; |
15 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
16 |
import dk.thoerup.circuitbreaker.CircuitBreaker; |
import dk.thoerup.circuitbreaker.CircuitBreaker; |
17 |
import dk.thoerup.circuitbreaker.CircuitBreakerManager; |
import dk.thoerup.circuitbreaker.CircuitBreakerManager; |
25 |
} |
} |
26 |
|
|
27 |
@Override |
@Override |
28 |
public String proposeStreetName(SearchResult result, int postnr, String vejnavn) { |
public String proposeStreetName(SearchRequest request, SearchResult result) { |
29 |
if (conf.useGoogle == false) |
if (conf.useGoogle == false) |
30 |
return null; |
return null; |
31 |
|
|
32 |
result.google = true; |
result.google = true; |
33 |
|
|
34 |
try { |
try { |
35 |
GoogleInvocation wrapper = new GoogleInvocation( conf, postnr, vejnavn ); |
GoogleInvocation wrapper = new GoogleInvocation( conf, request.postnr, request.vejnavn ); |
36 |
CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("google"); |
CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("google"); |
37 |
|
|
38 |
|
|