--- android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/jdo/JdoStationBean.java	2010/09/22 19:13:41	1104
+++ android/TrainInfoServiceGoogle/src/dk/thoerup/traininfoservice/jdo/JdoStationBean.java	2010/09/22 21:09:39	1105
@@ -1,12 +1,13 @@
 package dk.thoerup.traininfoservice.jdo;
 
-import java.util.List;
-
 import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.NotPersistent;
 import javax.jdo.annotations.PersistenceCapable;
 import javax.jdo.annotations.Persistent;
 import javax.jdo.annotations.PrimaryKey;
 
+import dk.thoerup.android.traininfo.common.StationBean.StationEntry;
+
 
 @PersistenceCapable
 public class JdoStationBean  {
@@ -19,9 +20,6 @@
 	private String name;
 	
 	@Persistent
-	private String nameLower;
-
-	@Persistent
 	private double latitude;
 
 	@Persistent
@@ -40,7 +38,10 @@
 	private String address;
 	
 	@Persistent 
-	private List<JdoStationAlias> aliases;
+	public String aliases[];	
+	
+	@NotPersistent
+	public int distance = 0;
 	
 	/************** accessors **************/
 
@@ -58,15 +59,6 @@
 		this.name = name;
 	}
 
-	
-	public String getNameLower() {
-		return nameLower;
-	}
-	public void setNameLower(String name) {
-		this.nameLower = name;
-	}
-	
-	
 	public double getLatitude() {
 		return latitude;
 	}
@@ -111,6 +103,51 @@
 	public void setAddress(String address) {
 		this.address = address;
 	}
+	
+	/************** converters *******************/
+	
+	public StationEntry toStationEntry() {
+		StationEntry entry = new StationEntry();
+		
+		entry.setId( id.intValue() );
+		entry.setName( name );
+		entry.setAddress( address );
+		entry.setLatitude( latitude );
+		entry.setLongitude( longitude );
+		
+		entry.setRegional( regional );
+		entry.setIsRegional( regional != null );
+		
+		entry.setStrain(strain);
+		entry.setIsStrain( strain != null );
+		
+		entry.setMetro(metro);
+		entry.setIsMetro( metro != null );
+		entry.setCalcdist( distance );
+		
+		return entry;
+	}
+	
+	public static JdoStationBean fromStationEntry(StationEntry entry) {
+	
+		JdoStationBean station = new JdoStationBean();		
+		station.setId( (long) entry.getId() );
+		station.setName( entry.getName() );
+		station.setAddress( entry.getAddress() );
+		station.setLatitude( entry.getLatitude() );
+		station.setLongitude( entry.getLongitude() );
+		
+		station.setRegional( entry.getRegional() );
+		station.setStrain( entry.getStrain() );
+		station.setMetro( entry.getMetro() );
+		station.aliases = entry.getAliases() ;
+		
+		
+		
+		
+		return station;
+	}
+