6 |
|
|
7 |
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
import dk.daoas.daoadresseservice.admin.ServiceConfig; |
8 |
import dk.daoas.daoadresseservice.beans.OSMAddress; |
import dk.daoas.daoadresseservice.beans.OSMAddress; |
9 |
|
import dk.daoas.daoadresseservice.beans.SearchRequest; |
10 |
import dk.daoas.daoadresseservice.beans.SearchResult; |
import dk.daoas.daoadresseservice.beans.SearchResult; |
11 |
import dk.daoas.daoadresseservice.util.HttpUtil; |
import dk.daoas.daoadresseservice.util.HttpUtil; |
12 |
import dk.thoerup.circuitbreaker.CircuitBreaker; |
import dk.thoerup.circuitbreaker.CircuitBreaker; |
22 |
} |
} |
23 |
|
|
24 |
@Override |
@Override |
25 |
public String proposeStreetName(SearchResult result, int postnr, String vejnavn) { |
public String proposeStreetName(SearchRequest request, SearchResult result) { |
26 |
if (conf.useOpenStreetMaps == false) |
if (conf.useOpenStreetMaps == false) |
27 |
return null; |
return null; |
28 |
|
|
30 |
|
|
31 |
try { |
try { |
32 |
|
|
33 |
OSMInvocation wrapper = new OSMInvocation( conf, postnr, vejnavn ); |
OSMInvocation wrapper = new OSMInvocation( conf, request.postnr, request.vejnavn ); |
34 |
CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("osm"); |
CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker("osm"); |
35 |
|
|
36 |
result.osmVej = (String) breaker.invoke(wrapper); |
result.osmVej = (String) breaker.invoke(wrapper); |