--- dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/osrm/OSRMHelper.java	2015/09/29 09:56:33	2732
+++ dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/osrm/OSRMHelper.java	2015/09/29 09:58:14	2733
@@ -23,35 +23,35 @@
 
 import dk.daoas.fulddaekning.Adresse;
 import dk.daoas.fulddaekning.HttpUtil;
-import dk.daoas.fulddaekning.LookupWorker;
+
 
 public class OSRMHelper {
-	
+
 	final static Logger logger = Logger.getLogger( OSRMHelper.class.toString() );
-	
+
 	Gson gson = new Gson();
-	
+
 
 	final String host = "10.30.2.61";
 	final int port = 5000;
 	final String base_url = "http://" + host + ":" + port;
 
 	public Adresse getNearestViaTable(Adresse a1, Collection<Adresse> haystack) {
-		
+
 		Adresse bedsteAdresse = null;
-		
+
 		Adresse hayArray[] = new Adresse[ haystack.size() ];
 		haystack.toArray(hayArray);
-		
+
 		StringBuilder sb = new StringBuilder();
 		sb.append(base_url);
 		sb.append("/table?loc=").append(a1.latitude).append(",").append(a1.longitude);
-		
+
 		for(int i = 0; i<hayArray.length; i++) {
 			Adresse a = hayArray[i];
 			sb.append("&loc=").append( a.latitude ).append(",").append(a.longitude);
 		}
-		
+
 		try {
 			String txtResponse = HttpUtil.getContentString(sb.toString(), 500, "UTF-8");
 			OSRMDistanceTable table = gson.fromJson(txtResponse, OSRMDistanceTable.class);
@@ -59,9 +59,9 @@
 				logger.info("OSRM failed with message: " + table.status_message);
 				return null;
 			}
-			
+
 			int bedsteTid = Integer.MAX_VALUE;
-			
+
 			for (int i = 1; i<table.distance_table.length; i++) {
 				if (table.distance_table[0][i] < bedsteTid) {
 					bedsteTid = table.distance_table[0][i];
@@ -74,15 +74,15 @@
 			logger.log(Level.SEVERE, "Lookup failed", e);
 			System.exit(1);			
 		}
-		
+
 		//return gson.fromJson(txtResponse, OSRMResponse.class);
-		
-		
+
+
 		return bedsteAdresse;
 	}
 
 	public Adresse getNearestPipeline(Adresse a1, Collection<Adresse> haystack) {
-		
+
 		int bedsteAfstand = Integer.MAX_VALUE;
 		Adresse bedsteAdresse = null;
 
@@ -90,61 +90,61 @@
 		haystack.toArray(hayArray);
 
 
-	try (CloseableHttpPipeliningClient httpclient = HttpAsyncClients.createPipelining(); ) {
-            httpclient.start();
+		try (CloseableHttpPipeliningClient httpclient = HttpAsyncClients.createPipelining(); ) {
+			httpclient.start();
 
-            HttpHost targetHost = new HttpHost(host, port);
+			HttpHost targetHost = new HttpHost(host, port);
 
-		System.out.println("1>" + targetHost.toString() );
-		System.out.println("2>" + targetHost.toURI() );
+			System.out.println("1>" + targetHost.toString() );
+			System.out.println("2>" + targetHost.toURI() );
 
-		List<HttpRequest> requests = new ArrayList<HttpRequest>();
+			List<HttpRequest> requests = new ArrayList<HttpRequest>();
 
-	              String loc1 = a1.latitude + "," + a1.longitude;
+			String loc1 = a1.latitude + "," + a1.longitude;
 
-		//for (int i=0; i<hayArray.length; i++) {
-		for (int i=0; i<2; i++) {
-			Adresse a2 = hayArray[i];
-              		  String loc2 = a2.latitude + "," + a2.longitude;
+			//for (int i=0; i<hayArray.length; i++) {
+			for (int i=0; i<2; i++) {
+				Adresse a2 = hayArray[i];
+				String loc2 = a2.latitude + "," + a2.longitude;
 
-		          String uri = "/viaroute?loc=" + loc1 + "&loc=" + loc2 + "&geometry=false&instructions=false&alt=false";
-			System.out.println( uri );
+				String uri = "/viaroute?loc=" + loc1 + "&loc=" + loc2 + "&geometry=false&instructions=false&alt=false";
+				System.out.println( uri );
 
-			requests.add( new HttpGet(uri) );
+				requests.add( new HttpGet(uri) );
 
-		}
+			}
 
 
-            Future<List<HttpResponse>> future = httpclient.execute(targetHost, requests, null);
-            List<HttpResponse> responses = future.get();
+			Future<List<HttpResponse>> future = httpclient.execute(targetHost, requests, null);
+			List<HttpResponse> responses = future.get();
 
-		HttpResponse respArr[] = new HttpResponse[ responses.size() ];
-		responses.toArray( respArr );
+			HttpResponse respArr[] = new HttpResponse[ responses.size() ];
+			responses.toArray( respArr );
 
-		for (int i=0; i<respArr.length; i++) {
-			String jsonBody = EntityUtils.toString( respArr[i].getEntity() );
-			OSRMResponse res = gson.fromJson(jsonBody, OSRMResponse.class);
-
-                            if (res.route_summary.total_distance < bedsteAfstand) {
-                                        bedsteAfstand = res.route_summary.total_distance;
-                                        bedsteAdresse = hayArray[i];
-                              }
+			for (int i=0; i<respArr.length; i++) {
+				String jsonBody = EntityUtils.toString( respArr[i].getEntity() );
+				OSRMResponse res = gson.fromJson(jsonBody, OSRMResponse.class);
 
-		}
+				if (res.route_summary.total_distance < bedsteAfstand) {
+					bedsteAfstand = res.route_summary.total_distance;
+					bedsteAdresse = hayArray[i];
+				}
+
+			}
 
 
-            System.out.println(responses);
+			System.out.println(responses);
 
-	} catch(Exception e) {
+		} catch(Exception e) {
 			logger.log(Level.SEVERE, "Lookup failed", e);
 
-        } 
+		} 
 
 
 		return bedsteAdresse;
 	}
 
-	
+
 	/*
 	 * Denne virker men table opslaget er 10 gange hurtigere
 	 * 
@@ -153,11 +153,11 @@
 	public Adresse getNearest(Adresse a1, Collection<Adresse> haystack) {
 		int bedsteAfstand = Integer.MAX_VALUE;
 		Adresse bedsteAdresse = null;
-		
+
 		Iterator<Adresse> it = haystack.iterator();
 		while (it.hasNext()) {
 			Adresse a2 = it.next();
-			
+
 			try {
 				OSRMResponse res = getRoute(a1, a2);
 
@@ -165,8 +165,8 @@
 					System.out.println("OSRM Returned " + res.status + "/" + res.status_message );
 					continue;
 				}
-				
-				
+
+
 				if (res.route_summary.total_distance < bedsteAfstand) {
 					bedsteAfstand = res.route_summary.total_distance;
 					bedsteAdresse = a2;
@@ -175,23 +175,23 @@
 				System.out.println( e.getMessage() );
 				System.exit(1);
 			}
-	
+
 		}
-		
+
 		return bedsteAdresse;
 	}
-	
+
 	public OSRMResponse getRoute(Adresse a1, Adresse a2) throws IOException {
-		
+
 		String loc1 = a1.latitude + "," + a1.longitude;
 		String loc2 = a2.latitude + "," + a2.longitude;
-		
+
 		String params = "loc=" + loc1 + "&loc=" + loc2 + "&geometry=false&instructions=false&alt=false";
-		
+
 		String url = base_url + "/viaroute?" + params;
-		
+
 		String txtResponse = HttpUtil.getContentString(url, 500, "UTF-8");
-		
+
 		return gson.fromJson(txtResponse, OSRMResponse.class);
 	}
 }