--- android/TrainInfoService/src/dk/thoerup/traininfoservice/StationDAO.java	2010/06/15 06:34:42	850
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/StationDAO.java	2010/09/16 13:32:10	1060
@@ -5,14 +5,17 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.logging.Logger;
+
+import dk.thoerup.traininfoservice.StationBean.StationEntry;
 
 public class StationDAO {
-	final static int LOCATION_LIMIT = 5;
+	final static int LOCATION_LIMIT = 8;
+	static final Logger logger = Logger.getLogger(StationDAO.class.getName());
+	
 	
-	private StationBean convertSingleRow(ResultSet res) throws SQLException {
-		StationBean station = new StationBean();
+	private StationEntry convertSingleRow(ResultSet res) throws SQLException {
+		StationEntry station = new StationEntry();
 
 		station.setId( res.getInt(1) );
 		station.setName( res.getString(2) );
@@ -23,28 +26,32 @@
 		station.setMetro( res.getString(7) );
 		station.setAddress( res.getString(8) );
 		station.setCalcdist( (int)res.getDouble(9) );
+		
+		station.setIsRegional( station.getRegional() != null );
+		station.setIsStrain( station.getStrain() != null );
+		station.setIsMetro( station.getMetro() != null );
 
 		return station;
 	}
 
-	private List<StationBean> convertResultset(ResultSet res) throws SQLException {
-		List<StationBean> stations = new ArrayList<StationBean>();
+	private StationBean convertResultset(ResultSet res) throws SQLException {
+		StationBean stations = new StationBean();
 		while (res.next()) {
-			stations.add( convertSingleRow(res) );
+			stations.entries.add( convertSingleRow(res) );
 		}
 		return stations;
 
 	}
 
 
-	public StationBean getById(int id) throws SQLException {
+	public StationEntry getById(int id) throws SQLException {
 		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog,stationcode_metro,address,0.0 " +
 		"FROM trainstations WHERE id=" + id + " AND enabled=true";
 
 		Connection conn = null;
 		Statement stmt = null;
 		ResultSet res = null;
-		StationBean result;
+		StationEntry result;
 
 		try {
 			conn = DBConnection.getConnection();
@@ -71,14 +78,14 @@
 	 *     'select $2 ilike $1' language sql strict immutable;
 	 *     create operator ~~~ (procedure = rlike, leftarg = text, rightarg = text, commutator = ~~);
 	 */
-	public List<StationBean> getByName(String name) throws SQLException {
+	public StationBean getByName(String name) throws SQLException {
 		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog, stationcode_metro, address, 0.0 " + 
 		"FROM trainstations " + 
 		"WHERE (name ILIKE ? OR ? ~~~ ANY(aliases)) AND enabled = true " +
 		"ORDER BY name ";
 
 
-		List<StationBean> result;
+		StationBean result;
 		Connection conn = null;
 		PreparedStatement stmt = null;
 		ResultSet res = null;
@@ -103,17 +110,17 @@
 		return result;
 	}
 
-	//the "hack" with max 0.5 degrees latitude and 0.9 degrees longitude is only valid since we only service danish trains,
-	// in denmark 0.5dg latitude ~ 55km, 0.9dg longitude ~ 57km
+	//the "hack" with max 0.4 degrees latitude and 0.75 degrees longitude is only valid since we only service danish trains,
+	// in denmark 0.4dg latitude ~ 44km, 0.75dg longitude ~ 47km
 
 	// the ultra fast method  (and only slightly inaccurate as long as we only cover a limited geographically area)
 	// is using an aproximation of the length of 1 latitude degree and 1 longitude degree and just use pythagoras to 
 	// calculate the distance:
 	//     sqrt( power(abs(latitude-?)*111320, 2) + power(abs(longitude-?)*63000,2) )::int as calcdist 
 
-	public List<StationBean> getByLocationWorker(double latitude, double longitude, boolean geolimit) throws SQLException {
+	public StationBean getByLocationWorker(double latitude, double longitude, boolean geolimit) throws SQLException {
 		
-		String limitExpression = geolimit == true ? "AND abs(latitude-?)<0.5 AND abs(longitude-?)<0.9 " : "";
+		String limitExpression = (geolimit == true) ? "AND abs(latitude-?)<0.4 AND abs(longitude-?)<0.75 " : "";
 		
 		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog, stationcode_metro, address, " + 
 			"earth_distance( earth_coord, ll_to_earth(?,?))::int AS calcdist " + 
@@ -124,7 +131,7 @@
 
 
 		
-		List<StationBean> result;
+		StationBean result;
 		Connection conn = null;
 		PreparedStatement stmt = null;
 		ResultSet res = null;
@@ -151,10 +158,12 @@
 		return result;
 	}
 	
-	public List<StationBean> getByLocation(double latitude, double longitude) throws SQLException {
-		List<StationBean> result = getByLocationWorker(latitude, longitude, true);
+	public StationBean getByLocation(double latitude, double longitude) throws SQLException {
+		StationBean result = getByLocationWorker(latitude, longitude, true);
 		
-		if (result.size() < LOCATION_LIMIT) { //failover
+		if (result.entries.size() < LOCATION_LIMIT) { //failover
+			logger.info("getByLocation failover: " +latitude + "," + longitude);
+			
 			result = getByLocationWorker(latitude, longitude, false);
 		}
 		
@@ -163,7 +172,7 @@
 	
 	
 
-	public List<StationBean> getByList(String list) throws SQLException {
+	public StationBean getByList(String list) throws SQLException {
 		String SQL = "SELECT id,name,latitude,longitude,stationcode_fjrn,stationcode_stog,stationcode_metro, address,0.0 " + 
 		"FROM trainstations " + 
 		"WHERE id IN " + list + " AND enabled = true " +
@@ -172,7 +181,7 @@
 		Connection conn = null;
 		Statement stmt = null;
 		ResultSet res = null;
-		List<StationBean> result;
+		StationBean result;
 
 		try {
 			conn = DBConnection.getConnection();
@@ -220,7 +229,7 @@
 		"WHERE name = ?  AND enabled = true " +
 		"LIMIT 1 ";
 
-		List<StationBean> result;
+		StationBean result;
 		Connection conn = null;
 		PreparedStatement stmt = null;
 		ResultSet res = null;
@@ -242,8 +251,8 @@
 				conn.close();
 		}
 
-		if (result.size() == 1) {
-			return result.get(0).getId();
+		if (result.entries.size() == 1) {
+			return result.entries.get(0).getId();
 		} else {
 			return -1;
 		}