--- android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlStationProvider.java	2009/10/02 10:39:09	381
+++ android/TrainInfo/src/dk/thoerup/traininfo/provider/XmlStationProvider.java	2010/08/02 23:18:53	1006
@@ -1,6 +1,7 @@
 package dk.thoerup.traininfo.provider;
 
-import java.net.URI;
+
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,43 +10,76 @@
 import org.w3c.dom.NodeList;
 
 import android.location.Location;
-import android.net.Uri;
 import android.util.Log;
 import dk.thoerup.traininfo.StationBean;
+import dk.thoerup.traininfo.util.AndroidTimeoutCache;
 import dk.thoerup.traininfo.util.DownloadUtil;
 import dk.thoerup.traininfo.util.XmlUtil;
 
 public class XmlStationProvider implements StationProvider {
-
-	List<StationBean> stations = new ArrayList<StationBean>();	
 	
+	final static int CACHE_TIMEOUT = 300*1000;
+
+	//List<StationBean> stations = new ArrayList<StationBean>();	
+	AndroidTimeoutCache<String, List<StationBean>> stationCache = new AndroidTimeoutCache<String, List<StationBean>>(CACHE_TIMEOUT);
 	
-	@Override
-	public List<StationBean> getStations() {
-		return stations;
-	}
 
 
 	@Override
-	public boolean lookupStations(Location location) {
-		String url = XmlUtil.SERVICE_BASE + "/LocateStations?latitude=" + location.getLatitude() + "&longitude=" + location.getLongitude();
+	public List<StationBean> lookupStations(Location location) {
+		String url = XmlUtil.SERVICE_BASE + "/LocateStations?latitude=" + (float)location.getLatitude() + "&longitude=" + (float)location.getLongitude();
 		Log.i("url", url);
 		return lookupStationsWorker(url);
 	}
 	
 	@Override
-	public boolean lookupStations(String name) {		
-		String url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + Uri.encode(name);
+	public List<StationBean> lookupStationsByName(String name) {		
+		
+	//	String url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + Uri.encode(name);
+		String url = "";
+		
+		try {
+			url = XmlUtil.SERVICE_BASE + "/LocateStations?name=" + URLEncoder.encode(name, "ISO8859-1");	
+		} catch (Exception e) {
+			Log.e("lookupStations", "Encoding failed", e);
+		}
+		
 		Log.i("url", url);
 		return lookupStationsWorker(url);
 	}
 	
 	
-	public boolean lookupStationsWorker(String url) {
-		boolean success = false;
+	@Override
+	public List<StationBean> lookupStationsByIds(String ids) {
+		String url = "";
+		url = XmlUtil.SERVICE_BASE + "/LocateStations?list=" + ids;
+		
+		Log.i("url", url);
+		return lookupStationsWorker(url);
+	}
+	
+	public List<StationBean> lookupStationsWorker(String url) {
+		
+		List<StationBean> tmpStations = stationCache.get(url);
+		
+		if (tmpStations != null) {
+			Log.i("lookupStations", "cache hit " + url);
+		} else {
+			tmpStations = fetchStations(url);
+			
+			if (tmpStations != null) {
+				stationCache.put(url, tmpStations);
+			}
+		}
+		
+		return tmpStations;
+	}
+
+
+	public List<StationBean> fetchStations(String url) {
 
 		try {
-			stations.clear();
+			List<StationBean> stations = new ArrayList<StationBean>();
 			
 			String xml = DownloadUtil.getContentString(url, 15000, "ISO-8859-1");
 			
@@ -85,21 +119,30 @@
 					if (nodeName.equals("longitude"))
 						station.setLongitude( Double.parseDouble(content) );
 					
-					if (nodeName.equals("stationcode"))
-						station.setCode(content);
-					
 					if (nodeName.equals("calcdist"))
 						station.setDistance( (int) Double.parseDouble(content) );
+					
+					if (nodeName.equals("address"))
+						station.setAddress( content );
+					
+					if (nodeName.equals("regional"))
+						station.setRegional( Boolean.parseBoolean(content) );
+					
+					if (nodeName.equals("strain"))
+						station.setSTrain( Boolean.parseBoolean(content) );
+					
+					if (nodeName.equals("metro"))
+						station.setMetro( Boolean.parseBoolean(content) );
 
 				}
 				stations.add(station);				
 			}
-			success = true;
+			return stations;
 			
 			
 		} catch (Exception e) {
 			Log.e("XmlStationProvider", "lookupStations: ", e);
+			return null;
 		}
-		return success;
 	}
 }