--- dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/osrm/OSRMHelper.java	2015/10/02 14:24:36	2740
+++ dao/FuldDaekningWorker/src/main/java/dk/daoas/fulddaekning/osrm/OSRMHelper.java	2015/10/06 21:26:55	2741
@@ -28,18 +28,28 @@
 import dk.daoas.fulddaekning.HttpUtil;
 
 
+import dk.thoerup.osrmbinding.OSRMBinding;
+import dk.thoerup.osrmbinding.ViarouteResult;
+
 public class OSRMHelper {
 
 	final static Logger logger = Logger.getLogger( OSRMHelper.class.toString() );
 
 	Gson gson = new Gson();
 
+	static OSRMBinding binding = null;
 
-	final String host = "10.30.2.61";
+	final String host = "127.0.0.1";
 	final int port = 5000;
 	final String base_url = "http://" + host + ":" + port;
 
-	public Adresse getNearestViaTable(Adresse a1, Collection<Adresse> haystack) {
+	private static synchronized void initOsrm() {
+		if (binding == null) {
+			binding = new OSRMBinding("/home/openstreetmap/denmark-latest.osrm");
+		}
+	}
+
+	public Adresse getNearestTableHttp(Adresse a1, Collection<Adresse> haystack) {
 
 		Adresse bedsteAdresse = null;
 
@@ -83,8 +93,49 @@
 
 		return bedsteAdresse;
 	}
+
+	public Adresse getNearestTableJni(Adresse a1, Collection<Adresse> haystack) {
+		if (binding == null) {
+			initOsrm();
+		}
+
+		Adresse bedsteAdresse = null;
+
+		Adresse hayArray[] = new Adresse[ haystack.size() ];
+		haystack.toArray(hayArray);
+
+		dk.thoerup.osrmbinding.Geopoint points[] = new dk.thoerup.osrmbinding.Geopoint[ hayArray.length + 1 ];
+		points[0] = new dk.thoerup.osrmbinding.Geopoint( a1.latitude, a1.longitude);
+
+
+		for(int i = 0; i<hayArray.length; i++) {
+			Adresse a = hayArray[i];
+			int idx = i+1;
+			points[idx] = new dk.thoerup.osrmbinding.Geopoint(a.latitude, a.longitude);
+		}
+
+		try {
+			float distance_table[][] = binding.table( points );
+
+			int bedsteTid = Integer.MAX_VALUE;
+
+			for (int i = 1; i<distance_table.length; i++) {
+				if (distance_table[0][i] < bedsteTid) {
+					bedsteTid = (int) distance_table[0][i];
+					int idx = i-1;
+					bedsteAdresse = hayArray[idx];
+				}
+			}
+
+		} catch (Exception e) {
+			logger.log(Level.SEVERE, "Lookup failed", e);
+			System.exit(1);			
+		}
+
+		return bedsteAdresse;
+	}
 	
-	public Adresse getNearestApacheClient(Adresse a1, Collection<Adresse> haystack) {
+	public Adresse getNearestViarouteHttp(Adresse a1, Collection<Adresse> haystack) {
 		int bedsteAfstand = Integer.MAX_VALUE;
 		Adresse bedsteAdresse = null;
 		
@@ -126,11 +177,19 @@
 					continue;
 				}
 
+				if (res.route_summary.total_distance == 0) {
+					continue;
+				}
+
 
 				if (res.route_summary.total_distance < bedsteAfstand) {
 					bedsteAfstand = res.route_summary.total_distance;
 					bedsteAdresse = a2;
 				}
+
+				if (bedsteAfstand < 200) { //vejdistance er tæt nok på
+					return bedsteAdresse;
+				}
 	            
 			}
 			
@@ -141,115 +200,46 @@
 		return bedsteAdresse;
 	}
 
+	
+	public Adresse getNearestViarouteJni(Adresse a1, Collection<Adresse> haystack) {
 
-	public Adresse getNearestPipeline(Adresse a1, Collection<Adresse> haystack) {
-
-		int bedsteAfstand = Integer.MAX_VALUE;
-		Adresse bedsteAdresse = null;
-
-		Adresse hayArray[] = new Adresse[ haystack.size() ];
-		haystack.toArray(hayArray);
-
-
-		try (CloseableHttpPipeliningClient httpclient = HttpAsyncClients.createPipelining(); ) {
-			httpclient.start();
-
-			HttpHost targetHost = new HttpHost(host, port);
-
-			System.out.println("1>" + targetHost.toString() );
-			System.out.println("2>" + targetHost.toURI() );
-
-			List<HttpRequest> requests = new ArrayList<HttpRequest>();
-
-			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;
-
-				String uri = "/viaroute?loc=" + loc1 + "&loc=" + loc2 + "&geometry=false&instructions=false&alt=false";
-				System.out.println( uri );
-
-				requests.add( new HttpGet(uri) );
-
-			}
-
-
-			Future<List<HttpResponse>> future = httpclient.execute(targetHost, requests, null);
-			List<HttpResponse> responses = future.get();
-
-			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];
-				}
-
-			}
-
-		} catch(Exception e) {
-			logger.log(Level.SEVERE, "Lookup failed", e);
-
-		} 
-
-
-		return bedsteAdresse;
-	}
+		if (binding == null) {
+			initOsrm();
+		}
 
 
-	/*
-	 * Denne virker men table opslaget er 10 gange hurtigere
-	 * 
-	 */
-	@Deprecated
-	public Adresse getNearest(Adresse a1, Collection<Adresse> haystack) {
 		int bedsteAfstand = Integer.MAX_VALUE;
 		Adresse bedsteAdresse = null;
+		
+			
+			for(Adresse a2: haystack) {
 
-		Iterator<Adresse> it = haystack.iterator();
-		while (it.hasNext()) {
-			Adresse a2 = it.next();
+	            ViarouteResult res = binding.viaRoute(a1.latitude, a1.longitude, a2.latitude, a2.longitude);
 
-			try {
-				OSRMResponse res = getRoute(a1, a2);
+	            
+	            if (res.status != 0) {
+					System.out.println("OSRM Returned " + res.status  );
+					continue;
+				}
 
-				if (res.status != 0) {
-					System.out.println("OSRM Returned " + res.status + "/" + res.status_message );
+				if (res.totalDistance == 0) {
 					continue;
 				}
 
 
-				if (res.route_summary.total_distance < bedsteAfstand) {
-					bedsteAfstand = res.route_summary.total_distance;
+				if (res.totalDistance < bedsteAfstand) {
+					bedsteAfstand = res.totalDistance;
 					bedsteAdresse = a2;
 				}
-			} catch (IOException e) {
-				System.out.println( e.getMessage() );
-				System.exit(1);
-			}
 
-		}
+				if (bedsteAfstand < 200) { //vejdistance er tæt nok på
+					return bedsteAdresse;
+				}
+	            
+			}			
 
 		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);
-	}
-}