--- android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2011/07/08 13:58:21	1559
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/RequestPlotter.java	2011/07/08 14:56:01	1560
@@ -26,6 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import dk.thoerup.genericjavautils.HttpUtil;
 import dk.thoerup.genericjavautils.TimeoutMap;
 
 @WebServlet(urlPatterns={"/RequestPlotter"})
@@ -122,6 +123,8 @@
 						continue;
 					}
 					
+					
+					
 					RequestPosition pos = new RequestPosition();
 	
 					String toks[] = line.split(" ");
@@ -129,12 +132,10 @@
 	
 					pos.time = df.parse( toks[2].replace("\"", "") );
 	
-					String argpart = toks[5].split("\\?")[1];
-	
-					String args[] = argpart.split("&");
+					Map<String,String> params = HttpUtil.decodeUri( toks[5] );					
 	
-					pos.lat = args[0].split("=")[1];
-					pos.lng = args[1].split("=")[1];
+					pos.lat = params.get("latitude");
+					pos.lng = params.get("longitude");
 					
 					
 					long timediff = now.getTime() - pos.time.getTime();