/[projects]/dao/DaoAdresseService/src/dk/daoas/daoadresseservice/OSMStreetnameHelper.java
ViewVC logotype

Diff of /dao/DaoAdresseService/src/dk/daoas/daoadresseservice/OSMStreetnameHelper.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2410 by torben, Sat Feb 28 16:14:55 2015 UTC revision 2411 by torben, Sat Feb 28 17:08:59 2015 UTC
# Line 6  import com.google.gson.Gson; Line 6  import com.google.gson.Gson;
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;
# Line 21  public class OSMStreetnameHelper impleme Line 22  public class OSMStreetnameHelper impleme
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                                    
# Line 29  public class OSMStreetnameHelper impleme Line 30  public class OSMStreetnameHelper impleme
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);
Legend:
Removed from v.2410  
changed lines
  Added in v.2411
  ViewVC Help
Powered by ViewVC 1.1.20