--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/GeocodeHelper.java 2015/02/24 11:19:40 2360 +++ dao/DaoAdresseService/src/dk/daoas/daoadresseservice/GeocodeHelper.java 2015/02/24 11:27:10 2361 @@ -16,6 +16,7 @@ import dk.daoas.daoadresseservice.admin.ServiceConfig; import dk.daoas.daoadresseservice.beans.OSMAddress; import dk.daoas.daoadresseservice.util.HttpUtil; +import dk.daoas.daoadresseservice.util.TimingHelper; import dk.thoerup.circuitbreaker.CircuitBreaker; import dk.thoerup.circuitbreaker.CircuitBreakerManager; import dk.thoerup.circuitbreaker.CircuitInvocation; @@ -85,6 +86,7 @@ @Override public String proceed() throws Exception { + //TimingHelper timer = new TimingHelper(); String encVej = URLEncoder.encode(vejnavn, "UTF-8"); String url = "http://nominatim.openstreetmap.org/search?country=DK&street=" + encVej + "&postalcode=" + postnr + "&format=json&addressdetails=1"; @@ -97,6 +99,8 @@ Gson gson = new Gson(); OSMAddress adrList[] = gson.fromJson(json, OSMAddress[].class); + //timer.printElapsed("OSM elapsed"); + //System.out.println("Count: " + adrList.length); if (adrList.length != 1) return null; @@ -131,12 +135,13 @@ } else { geocoder = new Geocoder(); } - + //TimingHelper timer = new TimingHelper(); String search = vejnavn + ", " + postnr + ", Denmark"; GeocoderRequest geocoderRequest = new GeocoderRequestBuilder().setAddress(search).setLanguage("en").getGeocoderRequest(); GeocodeResponse geocoderResponse = geocoder.geocode(geocoderRequest); + //timer.printElapsed("Google elapsed"); //System.out.println( "Status: >" + geocoderResponse.getStatus() + "<"); if ( geocoderResponse.getStatus() != GeocoderStatus.OK) {