aboutsummaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/cbaines/suma/BuildingActivity.java157
-rw-r--r--src/net/cbaines/suma/BuildingNumOverlay.java445
-rw-r--r--src/net/cbaines/suma/BusStopActivity.java72
-rw-r--r--src/net/cbaines/suma/BusStopOverlay.java480
-rw-r--r--src/net/cbaines/suma/DataManager.java1445
-rw-r--r--src/net/cbaines/suma/MapActivity.java2119
6 files changed, 2466 insertions, 2252 deletions
diff --git a/src/net/cbaines/suma/BuildingActivity.java b/src/net/cbaines/suma/BuildingActivity.java
index 987d139..930c2d1 100644
--- a/src/net/cbaines/suma/BuildingActivity.java
+++ b/src/net/cbaines/suma/BuildingActivity.java
@@ -19,67 +19,148 @@
package net.cbaines.suma;
+import java.io.IOException;
import java.io.InputStream;
-import java.util.HashSet;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
-
+import android.util.Log;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.tdb.TDBFactory;
import com.j256.ormlite.android.apptools.OrmLiteBaseActivity;
-public class BuildingActivity extends OrmLiteBaseActivity<DatabaseHelper> {
+public class BuildingActivity extends OrmLiteBaseActivity<DatabaseHelper> implements OnCheckedChangeListener {
- final static String TAG = "BusTimeActivity";
+ final static String TAG = "BusTimeActivity";
- private boolean dataChanged;
+ private boolean dataChanged;
- private Context instance;
+ private Context instance;
- private HashSet<BusRoute> routes = new HashSet<BusRoute>();
+ private ImageButton imageButton;
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.bustimes);
+ private TextView buildingName;
+ private TextView buildingID;
- final DatabaseHelper helper = getHelper();
+ private CheckBox favouritesCheckBox;
- // create an empty model
- // Model model = ModelFactory.createDefaultModel();
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.building_activity);
+ instance = this;
- // use the FileManager to find the input file
- InputStream in = getResources().openRawResource(R.raw.u9);
- if (in == null) {
- throw new IllegalArgumentException("File not found");
- }
+ String ID = getIntent().getExtras().getString("buildingID");
+
+ favouritesCheckBox = (CheckBox) findViewById(R.id.buildingActivityFavouriteCheckBox);
+ // favouritesCheckBox.setChecked(busStop.favourite);
+ favouritesCheckBox.setOnCheckedChangeListener(this);
+
+ buildingName = (TextView) findViewById(R.id.buildingActivityName);
+ buildingID = (TextView) findViewById(R.id.buildingActivityName);
+
+ Log.i(TAG, "Building id " + ID);
+
+ buildingID.setText(ID);
+
+ try {
+ URL url = new URL("http://data.southampton.ac.uk/images/buildings/600/" + ID + ".jpg");
+
+ InputStream is = (InputStream) url.getContent();
+ Drawable image = Drawable.createFromStream(is, "src");
+
+ imageButton = new ImageButton(this);
+ imageButton = (ImageButton) findViewById(R.id.buildingActivityImage);
+ imageButton.setImageDrawable(image);
+ imageButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+
+ }
+ });
+
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- // read the RDF/XML file
- // model.read(in, null);
-
-
+ String directory = "/data/data/net.cbaines.suma/databases";
+ Model model = TDBFactory.createModel(directory);
- instance = this;
+ String queryString = ID;
+ Query query = QueryFactory.create(queryString);
+ QueryExecution qexec = QueryExecutionFactory.create(query, model);
+ try {
+ ResultSet results = qexec.execSelect();
+ for (; results.hasNext();) {
+ QuerySolution soln = results.nextSolution();
- }
+ Log.i(TAG, "solution " + soln.toString());
- public void onResume() {
- super.onResume();
+ for (Iterator<String> iter = soln.varNames(); iter.hasNext();) {
+ Log.i(TAG, "solnVarName " + iter.next());
+ }
- }
+ // RDFNode x = soln.get("varName"); // Get a result variable by
+ // name.
+ // Resource r = soln.getResource("VarR"); // Get a result
+ // variable
+ // - must be a resource
+ // Literal l = soln.getLiteral("VarL"); // Get a result variable
+ // -
+ // must be a literal
+ }
+ } finally {
+ qexec.close();
+ }
- public void onPause() {
+ }
+
+ public void onResume() {
+ super.onResume();
+
+ }
- super.onPause();
- }
+ public void onPause() {
- public void finish() {
- setResult(RESULT_OK, getIntent());
+ super.onPause();
+ }
- super.finish();
- }
+ public void finish() {
+ setResult(RESULT_OK, getIntent());
- @Override
- public Object onRetainNonConfigurationInstance() {
- return null;
- }
+ super.finish();
+ }
+
+ @Override
+ public Object onRetainNonConfigurationInstance() {
+ return null;
+ }
+
+ public void onCheckedChanged(CompoundButton arg0, boolean arg1) {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/src/net/cbaines/suma/BuildingNumOverlay.java b/src/net/cbaines/suma/BuildingNumOverlay.java
index 32616a7..74688a0 100644
--- a/src/net/cbaines/suma/BuildingNumOverlay.java
+++ b/src/net/cbaines/suma/BuildingNumOverlay.java
@@ -29,6 +29,8 @@ import org.osmdroid.views.MapView;
import org.osmdroid.views.MapView.Projection;
import org.osmdroid.views.overlay.Overlay;
+import android.app.Activity;
+import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
@@ -45,260 +47,283 @@ import com.j256.ormlite.dao.Dao;
public class BuildingNumOverlay extends Overlay {
- private ArrayList<Building> buildings;
+ private ArrayList<Building> buildings;
- private final Point mCurScreenCoords = new Point();
- private final Point mTouchScreenPoint = new Point();
- private final Point mItemPoint = new Point();
+ private final Point mCurScreenCoords = new Point();
+ private final Point mTouchScreenPoint = new Point();
+ private final Point mItemPoint = new Point();
- private final Rect mRect = new Rect();
+ private final Rect mRect = new Rect();
- private final Drawable marker;
- private final Drawable favMarker;
+ private final Drawable marker;
+ private final Drawable favMarker;
- private final Paint paint;
+ private final Paint paint;
- private static final String TAG = "BuildingNumOverlay";
+ private static final String TAG = "BuildingNumOverlay";
- private final MapActivity context;
+ private final MapActivity context;
- private Dao<Building, String> buildingDao;
+ private Dao<Building, String> buildingDao;
- private float userScale = 1f;
+ private float userScale = 1f;
- public BuildingNumOverlay(MapActivity context, List<Building> buildings) throws SQLException {
- super(context);
+ public BuildingNumOverlay(MapActivity context, List<Building> buildings) throws SQLException {
+ super(context);
- this.context = context;
+ this.context = context;
- marker = context.getResources().getDrawable(R.drawable.building);
- favMarker = context.getResources().getDrawable(R.drawable.building_fav);
+ marker = context.getResources().getDrawable(R.drawable.building);
+ favMarker = context.getResources().getDrawable(R.drawable.building_fav);
- DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- buildingDao = helper.getBuildingDao();
+ DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ buildingDao = helper.getBuildingDao();
- paint = new Paint();
- paint.setColor(Color.BLACK);
- paint.setAntiAlias(true);
- paint.setStyle(Style.FILL);
- paint.setAlpha(120);
- paint.setStrokeWidth(6);
- paint.setTextAlign(Paint.Align.CENTER);
+ paint = new Paint();
+ paint.setColor(Color.BLACK);
+ paint.setAntiAlias(true);
+ paint.setStyle(Style.FILL);
+ paint.setAlpha(120);
+ paint.setStrokeWidth(6);
+ paint.setTextAlign(Paint.Align.CENTER);
- this.buildings = (ArrayList<Building>) buildings;
- }
-
- /**
- * Draw a marker on each of our items. populate() must have been called first.<br/>
- * <br/>
- * The marker will be drawn twice for each Item in the Overlay--once in the shadow phase, skewed and darkened, then
- * again in the non-shadow phase. The bottom-center of the marker will be aligned with the geographical coordinates
- * of the Item.<br/>
- * <br/>
- * The order of drawing may be changed by overriding the getIndexToDraw(int) method. An item may provide an
- * alternate marker via its OverlayItem.getMarker(int) method. If that method returns null, the default marker is
- * used.<br/>
- * <br/>
- * The focused item is always drawn last, which puts it visually on top of the other items.<br/>
- *
- * @param canvas
- * the Canvas upon which to draw. Note that this may already have a transformation applied, so be sure to
- * leave it the way you found it
- * @param mapView
- * the MapView that requested the draw. Use MapView.getProjection() to convert between on-screen pixels
- * and latitude/longitude pairs
- * @param shadow
- * if true, draw the shadow layer. If false, draw the overlay contents.
- */
- @Override
- public void draw(final Canvas canvas, final MapView mapView, final boolean shadow) {
-
- if (shadow || !isEnabled()) {
- return;
+ this.buildings = (ArrayList<Building>) buildings;
}
- float scale = mScale * userScale;
-
- final Projection pj = mapView.getProjection();
-
- final int markerWidth = (int) (marker.getIntrinsicWidth() * userScale);
- final int markerHeight = (int) (marker.getIntrinsicHeight() * userScale);
-
- mRect.set(0, 0, 0 + markerWidth, 0 + markerHeight);
- mRect.offset(-markerWidth / 2, -markerHeight);
- marker.setBounds(mRect);
- favMarker.setBounds(mRect);
-
- /* Draw in backward cycle, so the items with the least index are on the front. */
- for (Iterator<Building> buildingIter = buildings.iterator(); buildingIter.hasNext();) {
- final Building building = buildingIter.next();
-
- // Log.i(TAG, "Looking at drawing stop " + stop.id);
-
- pj.toMapPixels(building.point, mCurScreenCoords);
-
- // draw it
- if (building.favourite) {
- Overlay.drawAt(canvas, favMarker, mCurScreenCoords.x, mCurScreenCoords.y, false);
- } else {
- Overlay.drawAt(canvas, marker, mCurScreenCoords.x, mCurScreenCoords.y, false);
- }
-
- String idString = String.valueOf(building.id);
-
- int yOfset = 10;
- switch (idString.length()) {
- case 1:
- paint.setTextSize(25 * scale);
- yOfset = 18;
- break;
- case 2:
- paint.setTextSize(24 * scale);
- yOfset = 18;
- break;
- case 3:
- paint.setTextSize(17 * scale);
- yOfset = 20;
- break;
- case 4:
- paint.setTextSize(14 * scale);
- yOfset = 23;
- break;
- case 5:
- paint.setTextSize(10 * scale);
- yOfset = 20;
- break;
- case 6:
- paint.setTextSize(9 * scale);
- yOfset = 24;
- break;
- default:
- Log.w(TAG, "Reverting to default text size for length " + idString.length());
- paint.setTextSize(15 * scale);
- break;
- }
- canvas.drawText(idString, mCurScreenCoords.x, mCurScreenCoords.y - (yOfset * scale), paint);
- }
- }
+ /**
+ * Draw a marker on each of our items. populate() must have been called
+ * first.<br/>
+ * <br/>
+ * The marker will be drawn twice for each Item in the Overlay--once in the
+ * shadow phase, skewed and darkened, then again in the non-shadow phase.
+ * The bottom-center of the marker will be aligned with the geographical
+ * coordinates of the Item.<br/>
+ * <br/>
+ * The order of drawing may be changed by overriding the getIndexToDraw(int)
+ * method. An item may provide an alternate marker via its
+ * OverlayItem.getMarker(int) method. If that method returns null, the
+ * default marker is used.<br/>
+ * <br/>
+ * The focused item is always drawn last, which puts it visually on top of
+ * the other items.<br/>
+ *
+ * @param canvas
+ * the Canvas upon which to draw. Note that this may already have
+ * a transformation applied, so be sure to leave it the way you
+ * found it
+ * @param mapView
+ * the MapView that requested the draw. Use
+ * MapView.getProjection() to convert between on-screen pixels
+ * and latitude/longitude pairs
+ * @param shadow
+ * if true, draw the shadow layer. If false, draw the overlay
+ * contents.
+ */
+ @Override
+ public void draw(final Canvas canvas, final MapView mapView, final boolean shadow) {
+
+ if (shadow || !isEnabled()) {
+ return;
+ }
- @Override
- public boolean onSingleTapConfirmed(final MotionEvent event, final MapView mapView) {
+ float scale = mScale * userScale;
+
+ final Projection pj = mapView.getProjection();
+
+ final int markerWidth = (int) (marker.getIntrinsicWidth() * userScale);
+ final int markerHeight = (int) (marker.getIntrinsicHeight() * userScale);
+
+ mRect.set(0, 0, 0 + markerWidth, 0 + markerHeight);
+ mRect.offset(-markerWidth / 2, -markerHeight);
+ marker.setBounds(mRect);
+ favMarker.setBounds(mRect);
+
+ /*
+ * Draw in backward cycle, so the items with the least index are on the
+ * front.
+ */
+ for (Iterator<Building> buildingIter = buildings.iterator(); buildingIter.hasNext();) {
+ final Building building = buildingIter.next();
+
+ // Log.i(TAG, "Looking at drawing stop " + stop.id);
+
+ pj.toMapPixels(building.point, mCurScreenCoords);
+
+ // draw it
+ if (building.favourite) {
+ Overlay.drawAt(canvas, favMarker, mCurScreenCoords.x, mCurScreenCoords.y, false);
+ } else {
+ Overlay.drawAt(canvas, marker, mCurScreenCoords.x, mCurScreenCoords.y, false);
+ }
+
+ String idString = String.valueOf(building.id);
+
+ int yOfset = 10;
+ switch (idString.length()) {
+ case 1:
+ paint.setTextSize(25 * scale);
+ yOfset = 18;
+ break;
+ case 2:
+ paint.setTextSize(24 * scale);
+ yOfset = 18;
+ break;
+ case 3:
+ paint.setTextSize(17 * scale);
+ yOfset = 20;
+ break;
+ case 4:
+ paint.setTextSize(14 * scale);
+ yOfset = 23;
+ break;
+ case 5:
+ paint.setTextSize(10 * scale);
+ yOfset = 20;
+ break;
+ case 6:
+ paint.setTextSize(9 * scale);
+ yOfset = 24;
+ break;
+ default:
+ Log.w(TAG, "Reverting to default text size for length " + idString.length());
+ paint.setTextSize(15 * scale);
+ break;
+ }
+ canvas.drawText(idString, mCurScreenCoords.x, mCurScreenCoords.y - (yOfset * scale), paint);
+ }
+ }
- if (!this.isEnabled())
- return false;
+ @Override
+ public boolean onSingleTapConfirmed(final MotionEvent event, final MapView mapView) {
- final Building building = getSelectedItem(event, mapView);
+ if (!this.isEnabled())
+ return false;
- if (building == null) {
- // Log.v(TAG, "No building pressed");
- return false;
- } else {
- Log.v(TAG, "building Pressed " + building.id);
+ final Building building = getSelectedItem(event, mapView);
- if (context.activityToast == null) {
- context.activityToast = Toast.makeText(context, building.name + " (" + building.id + ")",
- Toast.LENGTH_SHORT);
- } else {
- context.activityToast.setDuration(Toast.LENGTH_SHORT);
- context.activityToast.setText(building.name + " (" + building.id + ")");
- }
- context.activityToast.show();
+ if (building == null) {
+ // Log.v(TAG, "No building pressed");
+ return false;
+ } else {
+ Log.v(TAG, "building Pressed " + building.id);
+
+ if (context.activityToast == null) {
+ context.activityToast = Toast.makeText(context, building.name + " (" + building.id + ")",
+ Toast.LENGTH_SHORT);
+ } else {
+ context.activityToast.setDuration(Toast.LENGTH_SHORT);
+ context.activityToast.setText(building.name + " (" + building.id + ")");
+ }
+ context.activityToast.show();
+
+ return true;
+ }
- return true;
}
- }
-
- public boolean onDoubleTap(final MotionEvent e, final MapView mapView) {
- return false;
- }
+ public boolean onDoubleTap(final MotionEvent event, final MapView mapView) {
+ Building building = getSelectedItem(event, mapView);
- @Override
- public boolean onLongPress(final MotionEvent event, final MapView mapView) {
+ if (building == null) {
+ // Log.v(TAG, "No busStop pressed");
+ return false;
+ } else {
+ Log.i(TAG, "Pressed " + building.id);
- if (!this.isEnabled())
- return false;
+ Intent i = new Intent(context, BuildingActivity.class);
+ i.putExtra("buildingID", building.id);
+ ((Activity) context).startActivityForResult(i, 0);
- final Building building = getSelectedItem(event, mapView);
+ return true;
+ }
+ }
- if (building == null) {
- // Log.v(TAG, "No building pressed");
- return false;
- } else {
- Log.v(TAG, "building Pressed " + building.id);
+ @Override
+ public boolean onLongPress(final MotionEvent event, final MapView mapView) {
- if (building.favourite) {
- building.favourite = false;
+ if (!this.isEnabled())
+ return false;
- if (context.activityToast == null) {
- context.activityToast = Toast.makeText(context, building.id + " removed from favourites",
- Toast.LENGTH_SHORT);
- } else {
- context.activityToast.setDuration(Toast.LENGTH_SHORT);
- context.activityToast.setText(building.id + " removed from favourites");
- }
- context.activityToast.show();
+ final Building building = getSelectedItem(event, mapView);
- } else {
- if (context.activityToast == null) {
- context.activityToast = Toast.makeText(context, building.id + " made a favourite",
- Toast.LENGTH_SHORT);
+ if (building == null) {
+ // Log.v(TAG, "No building pressed");
+ return false;
} else {
- context.activityToast.setDuration(Toast.LENGTH_SHORT);
- context.activityToast.setText(building.id + " made a favourite");
+ Log.v(TAG, "building Pressed " + building.id);
+
+ if (building.favourite) {
+ building.favourite = false;
+
+ if (context.activityToast == null) {
+ context.activityToast = Toast.makeText(context, building.id + " removed from favourites",
+ Toast.LENGTH_SHORT);
+ } else {
+ context.activityToast.setDuration(Toast.LENGTH_SHORT);
+ context.activityToast.setText(building.id + " removed from favourites");
+ }
+ context.activityToast.show();
+
+ } else {
+ if (context.activityToast == null) {
+ context.activityToast = Toast.makeText(context, building.id + " made a favourite",
+ Toast.LENGTH_SHORT);
+ } else {
+ context.activityToast.setDuration(Toast.LENGTH_SHORT);
+ context.activityToast.setText(building.id + " made a favourite");
+ }
+ context.activityToast.show();
+
+ building.favourite = true;
+ }
+
+ try {
+ buildingDao.update(building);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ Collections.sort(buildings, new POIFavouriteComparator());
+
+ mapView.invalidate();
+
+ return true;
}
- context.activityToast.show();
-
- building.favourite = true;
- }
-
- try {
- buildingDao.update(building);
- } catch (SQLException e) {
- e.printStackTrace();
- }
-
- Collections.sort(buildings, new POIFavouriteComparator());
- mapView.invalidate();
-
- return true;
}
- }
-
- private Building getSelectedItem(final MotionEvent event, final MapView mapView) {
- final Projection pj = mapView.getProjection();
- final int eventX = (int) event.getX();
- final int eventY = (int) event.getY();
+ private Building getSelectedItem(final MotionEvent event, final MapView mapView) {
+ final Projection pj = mapView.getProjection();
+ final int eventX = (int) event.getX();
+ final int eventY = (int) event.getY();
- /* These objects are created to avoid construct new ones every cycle. */
- pj.fromMapPixels(eventX, eventY, mTouchScreenPoint);
+ /* These objects are created to avoid construct new ones every cycle. */
+ pj.fromMapPixels(eventX, eventY, mTouchScreenPoint);
- // Iterate back through the array to properly deal with overlap
- for (int i = buildings.size() - 1; i > 0; i--) {
- final Building building = buildings.get(i);
+ // Iterate back through the array to properly deal with overlap
+ for (int i = buildings.size() - 1; i > 0; i--) {
+ final Building building = buildings.get(i);
- pj.toPixels(building.point, mItemPoint);
+ pj.toPixels(building.point, mItemPoint);
- if (marker.getBounds().contains(mTouchScreenPoint.x - mItemPoint.x, mTouchScreenPoint.y - mItemPoint.y)) {
- return building;
- }
+ if (marker.getBounds().contains(mTouchScreenPoint.x - mItemPoint.x, mTouchScreenPoint.y - mItemPoint.y)) {
+ return building;
+ }
+ }
+ return null;
}
- return null;
- }
- public void refresh() {
- for (int i = 0; i < buildings.size(); i++) {
- refresh(buildings.get(i));
+ public void refresh() {
+ for (int i = 0; i < buildings.size(); i++) {
+ refresh(buildings.get(i));
+ }
}
- }
- public void refresh(Building building) {
- if (building.favourite) {
- buildings.remove(building);
- buildings.add(building);
+ public void refresh(Building building) {
+ if (building.favourite) {
+ buildings.remove(building);
+ buildings.add(building);
+ }
}
- }
}
diff --git a/src/net/cbaines/suma/BusStopActivity.java b/src/net/cbaines/suma/BusStopActivity.java
index d9eaed3..0d4dea4 100644
--- a/src/net/cbaines/suma/BusStopActivity.java
+++ b/src/net/cbaines/suma/BusStopActivity.java
@@ -59,8 +59,8 @@ import com.j256.ormlite.dao.Dao;
import com.j256.ormlite.stmt.PreparedQuery;
import com.j256.ormlite.stmt.QueryBuilder;
-public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
- implements OnCheckedChangeListener, Preferences, OnItemClickListener {
+public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper> implements OnCheckedChangeListener,
+ Preferences, OnItemClickListener {
final static String TAG = "BusTimeActivity";
@@ -106,7 +106,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.bustimes);
+ setContentView(R.layout.bus_stop_activity);
final DatabaseHelper helper = getHelper();
@@ -132,15 +132,12 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
Dao<RouteStops, Integer> routeStopsDao = helper.getRouteStopsDao();
for (BusRoute route : busRouteDao) {
- QueryBuilder<RouteStops, Integer> queryBuilder = routeStopsDao
- .queryBuilder();
+ QueryBuilder<RouteStops, Integer> queryBuilder = routeStopsDao.queryBuilder();
- queryBuilder.where()
- .eq(RouteStops.ROUTE_ID_FIELD_NAME, route.id).and()
+ queryBuilder.where().eq(RouteStops.ROUTE_ID_FIELD_NAME, route.id).and()
.eq(RouteStops.STOP_ID_FIELD_NAME, busStopID);
queryBuilder.setCountOf(true);
- PreparedQuery<RouteStops> preparedQuery = queryBuilder
- .prepare();
+ PreparedQuery<RouteStops> preparedQuery = queryBuilder.prepare();
long count = routeStopsDao.countOf(preparedQuery);
@@ -211,12 +208,9 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
public void onResume() {
super.onResume();
- SharedPreferences sharedPrefs = PreferenceManager
- .getDefaultSharedPreferences(this);
- if (sharedPrefs.getBoolean(UNI_LINK_BUS_TIMES,
- UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT)
- || sharedPrefs.getBoolean(NON_UNI_LINK_BUS_TIMES,
- NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT)) {
+ SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ if (sharedPrefs.getBoolean(UNI_LINK_BUS_TIMES, UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT)
+ || sharedPrefs.getBoolean(NON_UNI_LINK_BUS_TIMES, NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT)) {
Log.i(TAG, "Live Times enabled");
timetable = (Timetable) getLastNonConfigurationInstance();
@@ -294,8 +288,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
return timetable;
}
- private class GetTimetableTask extends
- AsyncTask<String, Integer, Timetable> {
+ private class GetTimetableTask extends AsyncTask<String, Integer, Timetable> {
String errorMessage;
protected void onPreExecute() {
@@ -305,21 +298,12 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
protected Timetable doInBackground(String... activity) {
Timetable newTimetable = null;
try {
- final SharedPreferences sharedPrefs = PreferenceManager
- .getDefaultSharedPreferences(instance);
-
- newTimetable = DataManager
- .getTimetable(
- instance,
- busStopID,
- sharedPrefs
- .getBoolean(
- MapActivity.UNI_LINK_BUS_TIMES,
- MapActivity.UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT),
- sharedPrefs
- .getBoolean(
- MapActivity.NON_UNI_LINK_BUS_TIMES,
- MapActivity.NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT));
+ final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(instance);
+
+ newTimetable = DataManager.getTimetable(instance, busStopID, sharedPrefs.getBoolean(
+ MapActivity.UNI_LINK_BUS_TIMES, MapActivity.UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT), sharedPrefs
+ .getBoolean(MapActivity.NON_UNI_LINK_BUS_TIMES,
+ MapActivity.NON_UNI_LINK_BUS_TIMES_ENABLED_BY_DEFAULT));
} catch (SQLException e) {
errorMessage = "Error message regarding SQL?";
e.printStackTrace();
@@ -365,8 +349,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle item selection
- if (item.getItemId() == R.id.menu_previous_stop
- || item.getItemId() == R.id.menu_next_stop) {
+ if (item.getItemId() == R.id.menu_previous_stop || item.getItemId() == R.id.menu_next_stop) {
Log.v(TAG, "Got a request for the stop movement");
Log.v(TAG, routes.size() + " routes avalible from this stop");
@@ -377,11 +360,9 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
try {
Set<BusStop> tmpStops;
if (item.getItemId() == R.id.menu_next_stop) {
- tmpStops = route.moveInRoute(this, getHelper()
- .getBusStopDao().queryForId(busStopID), 1);
+ tmpStops = route.moveInRoute(this, getHelper().getBusStopDao().queryForId(busStopID), 1);
} else {
- tmpStops = route.moveInRoute(this, getHelper()
- .getBusStopDao().queryForId(busStopID), -1);
+ tmpStops = route.moveInRoute(this, getHelper().getBusStopDao().queryForId(busStopID), -1);
}
for (BusStop busStop : tmpStops) {
if (!busStops.contains(busStop)) {
@@ -410,8 +391,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
} else {
showDialog(POI_DIALOG_ID);
if (busDialog == null) {
- Log.e(TAG,
- "Very wierd, just tried to launch the favourite's dialog, but its null?");
+ Log.e(TAG, "Very wierd, just tried to launch the favourite's dialog, but its null?");
return false;
}
@@ -450,11 +430,9 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
busTimeContentLayout.setGravity(Gravity.CENTER);
} else {
- for (Iterator<Stop> stopIter = visibleTimetable.iterator(); stopIter
- .hasNext();) {
+ for (Iterator<Stop> stopIter = visibleTimetable.iterator(); stopIter.hasNext();) {
Stop stop = stopIter.next();
- Log.i(TAG, "Begin filtering, looking at " + stop
- + " with route " + stop.bus.route.code);
+ Log.i(TAG, "Begin filtering, looking at " + stop + " with route " + stop.bus.route.code);
if (stop.bus.route.code.equals("U1")) {
if (!U1RouteRadioButton.isChecked()) {
stopIter.remove();
@@ -480,8 +458,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
if (visibleTimetable.size() == 0) {
busTimeContentLayout.setGravity(Gravity.CENTER);
- busStopMessage
- .setText("No Busses (With the current enabled routes)");
+ busStopMessage.setText("No Busses (With the current enabled routes)");
busStopMessage.setVisibility(View.VISIBLE);
busTimeList.setVisibility(View.GONE);
} else {
@@ -510,8 +487,7 @@ public class BusStopActivity extends OrmLiteBaseActivity<DatabaseHelper>
return null;
}
- public void onItemClick(AdapterView<?> parent, View view, int position,
- long id) {
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Log.i(TAG, "OnItemClick pos " + position + " id " + id);
String poiId = busDialog.adapter.getItemStringId(position);
diff --git a/src/net/cbaines/suma/BusStopOverlay.java b/src/net/cbaines/suma/BusStopOverlay.java
index 06a1729..060ad47 100644
--- a/src/net/cbaines/suma/BusStopOverlay.java
+++ b/src/net/cbaines/suma/BusStopOverlay.java
@@ -44,308 +44,314 @@ import com.j256.ormlite.dao.Dao;
public class BusStopOverlay extends Overlay implements RouteColorConstants {
- List<BusStop> busStops;
+ List<BusStop> busStops;
- private final Point mCurScreenCoords = new Point();
- private final Point mTouchScreenPoint = new Point();
- private final Point mItemPoint = new Point();
+ private final Point mCurScreenCoords = new Point();
+ private final Point mTouchScreenPoint = new Point();
+ private final Point mItemPoint = new Point();
- private final Rect mRect = new Rect();
+ private final Rect mRect = new Rect();
- private final Drawable marker;
- private final Drawable favMarker;
+ private final Drawable marker;
+ private final Drawable favMarker;
- private final Paint paint;
+ private final Paint paint;
- private static final String TAG = "BusStopOverlay";
+ private static final String TAG = "BusStopOverlay";
- private final MapActivity context;
+ private final MapActivity context;
- private Dao<BusStop, String> busStopDao;
+ private Dao<BusStop, String> busStopDao;
- private float userScale = 1f;
+ private float userScale = 1f;
- private boolean[] routes = new boolean[5];
+ private boolean[] routes = new boolean[5];
- public BusStopOverlay(MapActivity context, List<BusStop> busStops) throws SQLException {
- super(context);
+ public BusStopOverlay(MapActivity context, List<BusStop> busStops) throws SQLException {
+ super(context);
- this.context = context;
+ this.context = context;
- marker = context.getResources().getDrawable(R.drawable.busstop);
- favMarker = context.getResources().getDrawable(R.drawable.busstop_fav);
+ marker = context.getResources().getDrawable(R.drawable.busstop);
+ favMarker = context.getResources().getDrawable(R.drawable.busstop_fav);
- DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- busStopDao = helper.getBusStopDao();
+ DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ busStopDao = helper.getBusStopDao();
- paint = new Paint();
- paint.setStyle(Style.FILL);
- paint.setStrokeWidth(6);
+ paint = new Paint();
+ paint.setStyle(Style.FILL);
+ paint.setStrokeWidth(6);
- this.busStops = busStops;
- }
-
- void setRoutes(int route, boolean visible) {
- routes[route] = visible;
- }
-
- @Override
- public void draw(final Canvas canvas, final MapView mapView, final boolean shadow) {
-
- if (shadow) {
- return;
+ this.busStops = busStops;
}
- float scale = mScale * userScale;
+ void setRoutes(int route, boolean visible) {
+ routes[route] = visible;
+ }
- final Projection pj = mapView.getProjection();
+ @Override
+ public void draw(final Canvas canvas, final MapView mapView, final boolean shadow) {
- final int markerWidth = (int) (marker.getIntrinsicWidth() * userScale);
- final int markerHeight = (int) (marker.getIntrinsicHeight() * userScale);
+ if (shadow) {
+ return;
+ }
- mRect.set(0, 0, 0 + markerWidth, 0 + markerHeight);
- mRect.offset(-markerWidth / 2, -markerHeight);
- marker.setBounds(mRect);
- favMarker.setBounds(mRect);
+ float scale = mScale * userScale;
- /* Draw in backward cycle, so the items with the least index are on the front. */
+ final Projection pj = mapView.getProjection();
- for (int stopNum = 0; stopNum < busStops.size(); stopNum++) {
- BusStop stop = busStops.get(stopNum);
+ final int markerWidth = (int) (marker.getIntrinsicWidth() * userScale);
+ final int markerHeight = (int) (marker.getIntrinsicHeight() * userScale);
- byte routeNum = 0;
- final byte stopRoutes = stop.routes;
+ mRect.set(0, 0, 0 + markerWidth, 0 + markerHeight);
+ mRect.offset(-markerWidth / 2, -markerHeight);
+ marker.setBounds(mRect);
+ favMarker.setBounds(mRect);
- boolean drawing = false;
+ /*
+ * Draw in backward cycle, so the items with the least index are on the
+ * front.
+ */
- if (stop.uniLink) {
+ for (int stopNum = 0; stopNum < busStops.size(); stopNum++) {
+ BusStop stop = busStops.get(stopNum);
- for (int i = 0; i < 5; i++) {
- if ((stopRoutes & (1 << i)) != 0) {
- routeNum++;
- if (routes[i]) {
- drawing = true;
- }
- }
- }
+ byte routeNum = 0;
+ final byte stopRoutes = stop.routes;
- if (!drawing)
- continue;
+ boolean drawing = false;
- }
+ if (stop.uniLink) {
- pj.toMapPixels(stop.point, mCurScreenCoords);
+ for (int i = 0; i < 5; i++) {
+ if ((stopRoutes & (1 << i)) != 0) {
+ routeNum++;
+ if (routes[i]) {
+ drawing = true;
+ }
+ }
+ }
- if (stop.favourite) {
- Overlay.drawAt(canvas, favMarker, mCurScreenCoords.x, mCurScreenCoords.y, false);
- } else {
- Overlay.drawAt(canvas, marker, mCurScreenCoords.x, mCurScreenCoords.y, false);
- }
+ if (!drawing)
+ continue;
- if (stop.uniLink) {
+ }
- int makersPlaced = 0;
- int yOfsetPerMarker = (int) (10 * scale);
- int markerYSize = (int) (8 * scale);
+ pj.toMapPixels(stop.point, mCurScreenCoords);
- float rectLeft = mCurScreenCoords.x + (8.8f * scale);
- float rectRight = rectLeft + markerYSize;
+ if (stop.favourite) {
+ Overlay.drawAt(canvas, favMarker, mCurScreenCoords.x, mCurScreenCoords.y, false);
+ } else {
+ Overlay.drawAt(canvas, marker, mCurScreenCoords.x, mCurScreenCoords.y, false);
+ }
- if (routeNum == 5) {
- markerYSize = (int) (5 * scale);
- yOfsetPerMarker = (int) (7 * scale);
- } else if (routeNum == 4) {
- markerYSize = (int) (6.5f * scale);
- yOfsetPerMarker = (int) (8 * scale);
+ if (stop.uniLink) {
+
+ int makersPlaced = 0;
+ int yOfsetPerMarker = (int) (10 * scale);
+ int markerYSize = (int) (8 * scale);
+
+ float rectLeft = mCurScreenCoords.x + (8.8f * scale);
+ float rectRight = rectLeft + markerYSize;
+
+ if (routeNum == 5) {
+ markerYSize = (int) (5 * scale);
+ yOfsetPerMarker = (int) (7 * scale);
+ } else if (routeNum == 4) {
+ markerYSize = (int) (6.5f * scale);
+ yOfsetPerMarker = (int) (8 * scale);
+ }
+
+ for (int i = 0; i < 5; i++) {
+ if ((stopRoutes & (1 << i)) != 0) {
+
+ // Log.i(TAG, "Route " + route + " is " +
+ // routes.get(route));
+
+ // Log.i(TAG, "Index is " + busRoutes.indexOf(route) +
+ // " busRoutes " + busRoutes);
+
+ if (i == 0) {
+ paint.setColor(U1);
+ } else if (i == 1) {
+ paint.setColor(U1N);
+ } else if (i == 2) {
+ paint.setColor(U2);
+ } else if (i == 3) {
+ paint.setColor(U6);
+ } else if (i == 4) {
+ paint.setColor(U9);
+ } else {
+ Log.e(TAG, "Unknown route code");
+ }
+
+ canvas.drawRect(rectLeft, mCurScreenCoords.y
+ + ((yOfsetPerMarker * makersPlaced) - (45 * scale)), rectRight, mCurScreenCoords.y
+ + (yOfsetPerMarker * makersPlaced) - ((45 * scale) - markerYSize), paint);
+
+ makersPlaced++;
+ }
+ }
+ }
}
+ }
- for (int i = 0; i < 5; i++) {
- if ((stopRoutes & (1 << i)) != 0) {
+ @Override
+ public boolean onSingleTapConfirmed(final MotionEvent event, final MapView mapView) {
- // Log.i(TAG, "Route " + route + " is " + routes.get(route));
+ BusStop busStop = getSelectedItem(event, mapView);
- // Log.i(TAG, "Index is " + busRoutes.indexOf(route) + " busRoutes " + busRoutes);
+ if (busStop == null) {
+ // Log.v(TAG, "No busStop pressed");
+ return false;
+ } else {
+ Log.i(TAG, "busStop Pressed " + busStop.id);
- if (i == 0) {
- paint.setColor(U1);
- } else if (i == 1) {
- paint.setColor(U1N);
- } else if (i == 2) {
- paint.setColor(U2);
- } else if (i == 3) {
- paint.setColor(U6);
- } else if (i == 4) {
- paint.setColor(U9);
+ if (context.activityToast == null) {
+ context.activityToast = Toast.makeText(context, busStop.description + " (" + busStop.id + ")",
+ Toast.LENGTH_SHORT);
} else {
- Log.e(TAG, "Unknown route code");
+ context.activityToast.setDuration(Toast.LENGTH_SHORT);
+ context.activityToast.setText(busStop.description + " (" + busStop.id + ")");
}
+ context.activityToast.show();
- canvas.drawRect(rectLeft, mCurScreenCoords.y
- + ((yOfsetPerMarker * makersPlaced) - (45 * scale)), rectRight, mCurScreenCoords.y
- + (yOfsetPerMarker * makersPlaced) - ((45 * scale) - markerYSize), paint);
-
- makersPlaced++;
- }
+ return true;
}
- }
}
- }
-
- @Override
- public boolean onSingleTapConfirmed(final MotionEvent event, final MapView mapView) {
- BusStop busStop = getSelectedItem(event, mapView);
+ public boolean onDoubleTap(final MotionEvent event, final MapView mapView) {
- if (busStop == null) {
- // Log.v(TAG, "No busStop pressed");
- return false;
- } else {
- Log.i(TAG, "busStop Pressed " + busStop.id);
+ BusStop busStop = getSelectedItem(event, mapView);
- if (context.activityToast == null) {
- context.activityToast = Toast.makeText(context, busStop.description + " (" + busStop.id + ")",
- Toast.LENGTH_SHORT);
- } else {
- context.activityToast.setDuration(Toast.LENGTH_SHORT);
- context.activityToast.setText(busStop.description + " (" + busStop.id + ")");
- }
- context.activityToast.show();
-
- return true;
- }
- }
-
- public boolean onDoubleTap(final MotionEvent event, final MapView mapView) {
-
- BusStop busStop = getSelectedItem(event, mapView);
+ if (busStop == null) {
+ // Log.v(TAG, "No busStop pressed");
+ return false;
+ } else {
+ Log.i(TAG, "Pressed " + busStop.id);
- if (busStop == null) {
- // Log.v(TAG, "No busStop pressed");
- return false;
- } else {
- Log.i(TAG, "Pressed " + busStop.id);
+ Intent i = new Intent(context, BusStopActivity.class);
+ i.putExtra("busStopID", busStop.id);
+ i.putExtra("busStopName", busStop.description);
+ ((Activity) context).startActivityForResult(i, 0);
- Intent i = new Intent(context, BusStopActivity.class);
- i.putExtra("busStopID", busStop.id);
- i.putExtra("busStopName", busStop.description);
- ((Activity) context).startActivityForResult(i, 0);
+ return true;
+ }
- return true;
}
- }
-
- @Override
- public boolean onLongPress(final MotionEvent event, final MapView mapView) {
-
- BusStop busStop = getSelectedItem(event, mapView);
+ @Override
+ public boolean onLongPress(final MotionEvent event, final MapView mapView) {
- if (busStop == null) {
- // Log.v(TAG, "No busStop pressed");
- return false;
- } else {
- Log.i(TAG, "Pressed " + busStop.id);
+ BusStop busStop = getSelectedItem(event, mapView);
- if (busStop.favourite) {
- busStop.favourite = false;
-
- if (context.activityToast == null) {
- context.activityToast = Toast.makeText(context, busStop.id + " removed from favourites",
- Toast.LENGTH_SHORT);
- } else {
- context.activityToast.setDuration(Toast.LENGTH_SHORT);
- context.activityToast.setText(busStop.id + " removed from favourites");
- }
- context.activityToast.show();
- } else {
- if (context.activityToast == null) {
- context.activityToast = Toast.makeText(context, busStop.id + " made a favourite",
- Toast.LENGTH_SHORT);
+ if (busStop == null) {
+ // Log.v(TAG, "No busStop pressed");
+ return false;
} else {
- context.activityToast.setDuration(Toast.LENGTH_SHORT);
- context.activityToast.setText(busStop.id + " made a favourite");
- }
- context.activityToast.show();
-
- busStop.favourite = true;
- }
+ Log.i(TAG, "Pressed " + busStop.id);
+
+ if (busStop.favourite) {
+ busStop.favourite = false;
+
+ if (context.activityToast == null) {
+ context.activityToast = Toast.makeText(context, busStop.id + " removed from favourites",
+ Toast.LENGTH_SHORT);
+ } else {
+ context.activityToast.setDuration(Toast.LENGTH_SHORT);
+ context.activityToast.setText(busStop.id + " removed from favourites");
+ }
+ context.activityToast.show();
+ } else {
+ if (context.activityToast == null) {
+ context.activityToast = Toast.makeText(context, busStop.id + " made a favourite",
+ Toast.LENGTH_SHORT);
+ } else {
+ context.activityToast.setDuration(Toast.LENGTH_SHORT);
+ context.activityToast.setText(busStop.id + " made a favourite");
+ }
+ context.activityToast.show();
+
+ busStop.favourite = true;
+ }
- try {
- busStopDao.update(busStop);
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ try {
+ busStopDao.update(busStop);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
- Collections.sort(busStops, new POIFavouriteComparator());
+ Collections.sort(busStops, new POIFavouriteComparator());
- mapView.invalidate();
+ mapView.invalidate();
- return true;
- }
- }
-
- public void refresh() {
- try {
- for (int i = 0; i < busStops.size(); i++) {
- BusStop busStop = busStops.get(i);
- busStopDao.refresh(busStop);
- if (busStop.favourite) {
- busStops.remove(i);
- busStops.add(busStop);
- } else {
- busStops.set(i, busStop);
+ return true;
}
- }
- } catch (SQLException e) {
- e.printStackTrace();
}
- }
-
- /**
- * Replaces any bus stops that equal the argument in the overlay with the argument
- *
- * @param busStop
- */
- public void refresh(BusStop busStop) {
- for (int i = 0; i < busStops.size(); i++) {
- if (busStop.equals(busStops.get(i))) {
- busStops.set(i, busStop);
- }
+
+ public void refresh() {
+ try {
+ for (int i = 0; i < busStops.size(); i++) {
+ BusStop busStop = busStops.get(i);
+ busStopDao.refresh(busStop);
+ if (busStop.favourite) {
+ busStops.remove(i);
+ busStops.add(busStop);
+ } else {
+ busStops.set(i, busStop);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
}
- }
-
- private BusStop getSelectedItem(final MotionEvent event, final MapView mapView) {
- final Projection pj = mapView.getProjection();
- final int eventX = (int) event.getX();
- final int eventY = (int) event.getY();
-
- /* These objects are created to avoid construct new ones every cycle. */
- pj.fromMapPixels(eventX, eventY, mTouchScreenPoint);
-
- for (int i = busStops.size() - 1; i > 0; i--) {
- BusStop busStop = busStops.get(i);
-
- pj.toPixels(busStop.point, mItemPoint);
-
- if (marker.getBounds().contains(mTouchScreenPoint.x - mItemPoint.x, mTouchScreenPoint.y - mItemPoint.y)) {
- if (busStop.uniLink) {
- boolean drawing = false;
- for (int route = 0; route < 5; route++) {
- if ((busStop.routes & (1 << route)) != 0) {
- if (routes[route]) {
- drawing = true;
- break;
- }
+
+ /**
+ * Replaces any bus stops that equal the argument in the overlay with the
+ * argument
+ *
+ * @param busStop
+ */
+ public void refresh(BusStop busStop) {
+ for (int i = 0; i < busStops.size(); i++) {
+ if (busStop.equals(busStops.get(i))) {
+ busStops.set(i, busStop);
}
- }
- if (!drawing)
- continue;
}
+ }
- return busStop;
- }
+ private BusStop getSelectedItem(final MotionEvent event, final MapView mapView) {
+ final Projection pj = mapView.getProjection();
+ final int eventX = (int) event.getX();
+ final int eventY = (int) event.getY();
+
+ /* These objects are created to avoid construct new ones every cycle. */
+ pj.fromMapPixels(eventX, eventY, mTouchScreenPoint);
+
+ for (int i = busStops.size() - 1; i > 0; i--) {
+ BusStop busStop = busStops.get(i);
+
+ pj.toPixels(busStop.point, mItemPoint);
+
+ if (marker.getBounds().contains(mTouchScreenPoint.x - mItemPoint.x, mTouchScreenPoint.y - mItemPoint.y)) {
+ if (busStop.uniLink) {
+ boolean drawing = false;
+ for (int route = 0; route < 5; route++) {
+ if ((busStop.routes & (1 << route)) != 0) {
+ if (routes[route]) {
+ drawing = true;
+ break;
+ }
+ }
+ }
+ if (!drawing)
+ continue;
+ }
+
+ return busStop;
+ }
+ }
+ return null;
}
- return null;
- }
}
diff --git a/src/net/cbaines/suma/DataManager.java b/src/net/cbaines/suma/DataManager.java
index c6a3a36..56dac5c 100644
--- a/src/net/cbaines/suma/DataManager.java
+++ b/src/net/cbaines/suma/DataManager.java
@@ -23,6 +23,8 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Calendar;
@@ -58,6 +60,10 @@ import org.xml.sax.XMLReader;
import android.content.Context;
import android.util.Log;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.tdb.TDBFactory;
import com.j256.ormlite.android.apptools.OpenHelperManager;
import com.j256.ormlite.dao.Dao;
import com.j256.ormlite.stmt.PreparedQuery;
@@ -66,823 +72,914 @@ import com.j256.ormlite.table.TableUtils;
public class DataManager {
- private final static String TAG = "DataManager";
+ private final static String TAG = "DataManager";
- private final static String busStopUrl = "http://data.southampton.ac.uk/bus-stop/";
+ private final static String busStopUrl = "http://data.southampton.ac.uk/bus-stop/";
- private static DatabaseHelper helper;
- private static Dao<BusRoute, Integer> busRouteDao;
- private static Dao<Bus, Integer> busDao;
- private static Dao<BusStop, String> busStopDao;
+ private static DatabaseHelper helper;
+ private static Dao<BusRoute, Integer> busRouteDao;
+ private static Dao<Bus, Integer> busDao;
+ private static Dao<BusStop, String> busStopDao;
- public static void loadBuildings(Context context) throws SQLException, IOException {
- DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- Dao<Building, String> buildingDao = helper.getBuildingDao();
+ public static void loadBuildings(Context context) throws SQLException, IOException {
+ DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ Dao<Building, String> buildingDao = helper.getBuildingDao();
- TableUtils.clearTable(helper.getConnectionSource(), Building.class);
+ TableUtils.clearTable(helper.getConnectionSource(), Building.class);
- Log.i(TAG, "Begining loading buildings from csv");
+ Log.i(TAG, "Begining loading buildings from csv");
- HashMap<String, GeoPoint> buildingPoints = new HashMap<String, GeoPoint>();
+ HashMap<String, GeoPoint> buildingPoints = new HashMap<String, GeoPoint>();
- InputStream inputStream = context.getAssets().open("buildings_points.csv");
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
- String strLine;
- try {
- String def = bufferedReader.readLine();
- // Log.i(TAG, "Reading the definition " + def);
+ InputStream inputStream = context.getAssets().open("buildings_points.csv");
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ String strLine;
+ try {
+ String def = bufferedReader.readLine();
+ // Log.i(TAG, "Reading the definition " + def);
- while ((strLine = bufferedReader.readLine()) != null) {
- // Log.i(TAG, "Data: " + strLine);
- String[] dataBits = strLine.split(",");
- GeoPoint point = Util.csLatLongToGeoPoint(dataBits[2], dataBits[1]);
- // Log.i(TAG, "Creating building with id " + dataBits[0] + " and " + point.getLatitudeE6() + " " +
- // point.getLongitudeE6());
- buildingPoints.put(dataBits[0], point);
- }
+ while ((strLine = bufferedReader.readLine()) != null) {
+ // Log.i(TAG, "Data: " + strLine);
+ String[] dataBits = strLine.split(",");
+ GeoPoint point = Util.csLatLongToGeoPoint(dataBits[2], dataBits[1]);
+ // Log.i(TAG, "Creating building with id " + dataBits[0] +
+ // " and " + point.getLatitudeE6() + " " +
+ // point.getLongitudeE6());
+ buildingPoints.put(dataBits[0], point);
+ }
+
+ bufferedReader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ // Log.i(TAG, "Number of building points " + buildingPoints.size());
+
+ inputStream = context.getAssets().open("building_estates.csv");
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+ try {
+ String def = bufferedReader.readLine();
+ // Log.i(TAG, "Reading the definition " + def);
+
+ while ((strLine = bufferedReader.readLine()) != null) {
+ // Log.i(TAG, "Data: " + strLine);
+ if (strLine.startsWith("\"")) {
+ String[] quoteBits = strLine.split("\"");
+ // Log.i(TAG, "QuoteBits " + quoteBits[0] + " | " +
+ // quoteBits[1]);
+ String[] dataBits = quoteBits[2].split(",");
+ // Log.i(TAG, "dataBits " + dataBits[0] + " | " +
+ // dataBits[1]);
+
+ if (buildingPoints.get(dataBits[1]) == null) {
+ // Log.w(TAG, "Building " + dataBits[1] +
+ // " has a null point");
+ continue;
+ }
+
+ Building bdg = new Building(dataBits[1], buildingPoints.get(dataBits[1]), dataBits[3].equals("R"),
+ quoteBits[0]);
+ /*
+ * Polygon poly = buildingPolys.get(dataBits[1]);
+ *
+ * if (poly != null) { bdg.outline = poly; // Log.i(TAG,
+ * "Adding building " + key + " " +
+ * bdg.point.getLatitudeE6() + " " +
+ * bdg.point.getLongitudeE6() + " " + poly); } else { //
+ * Log.i(TAG, "Adding building " + key + " " +
+ * bdg.point.getLatitudeE6() + " " +
+ * bdg.point.getLongitudeE6()); }
+ */
+
+ // Log.i(TAG, "Creating building " + bdg.id + " " + bdg.name
+ // + " " + bdg.point + " " +
+ // bdg.residential + " " + bdg.outline);
+
+ buildingDao.create(bdg);
+
+ } else {
+
+ String[] dataBits = strLine.split(",");
+
+ if (buildingPoints.get(dataBits[1]) == null) {
+ // Log.w(TAG, "Building " + dataBits[1] +
+ // " has a null point");
+ continue;
+ }
+
+ Building bdg = new Building(dataBits[1], buildingPoints.get(dataBits[1]), dataBits[3].equals("R"),
+ dataBits[0]);
+ /*
+ * Polygon poly = buildingPolys.get(dataBits[1]);
+ *
+ * if (poly != null) { bdg.outline = poly; // Log.i(TAG,
+ * "Adding building " + key + " " +
+ * bdg.point.getLatitudeE6() + " " +
+ * bdg.point.getLongitudeE6() + " " + poly); } else { //
+ * Log.i(TAG, "Adding building " + key + " " +
+ * bdg.point.getLatitudeE6() + " " +
+ * bdg.point.getLongitudeE6()); }
+ */
+
+ // Log.i(TAG, "Creating building " + bdg.id + " " + bdg.name
+ // + " " + bdg.point + " " +
+ // bdg.residential + " " + bdg.outline);
+
+ buildingDao.create(bdg);
+
+ }
+ }
+
+ bufferedReader.close();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ /*
+ * for (Iterator<String> iter = buildingPoints.keySet().iterator();
+ * iter.hasNext();) { String key = iter.next();
+ *
+ * Building bdg = new Building(key, buildingPoints.get(key), false);
+ * Polygon poly = buildingPolys.get(key);
+ *
+ * if (poly != null) { bdg.outline = poly; // Log.i(TAG,
+ * "Adding building " + key + " " + bdg.point.getLatitudeE6() + " " +
+ * bdg.point.getLongitudeE6() + " " + poly); } else { // Log.i(TAG,
+ * "Adding building " + key + " " + bdg.point.getLatitudeE6() + " " +
+ * bdg.point.getLongitudeE6()); }
+ *
+ * buildingDao.create(bdg); }
+ */
- bufferedReader.close();
- } catch (IOException e) {
- e.printStackTrace();
}
- // Log.i(TAG, "Number of building points " + buildingPoints.size());
+ public static void loadBuildingPhotos(Context context) {
+ // Direct way: Make a TDB-backed Jena model in the named directory.
+ String directory = "/data/data/net.cbaines.suma/databases";
+ Model model = TDBFactory.createModel(directory);
- inputStream = context.getAssets().open("building_estates.csv");
- bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ Log.i(TAG, "Created the model");
- try {
- String def = bufferedReader.readLine();
- // Log.i(TAG, "Reading the definition " + def);
+ // write it to standard out
+ StringWriter sw = new StringWriter();
+ model.write(new PrintWriter(sw));
+ Log.v(TAG, sw.toString());
- while ((strLine = bufferedReader.readLine()) != null) {
- // Log.i(TAG, "Data: " + strLine);
- if (strLine.startsWith("\"")) {
- String[] quoteBits = strLine.split("\"");
- // Log.i(TAG, "QuoteBits " + quoteBits[0] + " | " + quoteBits[1]);
- String[] dataBits = quoteBits[2].split(",");
- // Log.i(TAG, "dataBits " + dataBits[0] + " | " + dataBits[1]);
+ Log.i(TAG, "Finished the first output");
- if (buildingPoints.get(dataBits[1]) == null) {
- // Log.w(TAG, "Building " + dataBits[1] + " has a null point");
- continue;
- }
+ if (model.isEmpty()) {
- Building bdg = new Building(dataBits[1], buildingPoints.get(dataBits[1]), dataBits[3].equals("R"),
- quoteBits[0]);
- /*
- * Polygon poly = buildingPolys.get(dataBits[1]);
- *
- * if (poly != null) { bdg.outline = poly; // Log.i(TAG, "Adding building " + key + " " +
- * bdg.point.getLatitudeE6() + " " + bdg.point.getLongitudeE6() + " " + poly); } else { //
- * Log.i(TAG, "Adding building " + key + " " + bdg.point.getLatitudeE6() + " " +
- * bdg.point.getLongitudeE6()); }
- */
+ Log.i(TAG, "Model is empty");
- // Log.i(TAG, "Creating building " + bdg.id + " " + bdg.name + " " + bdg.point + " " +
- // bdg.residential + " " + bdg.outline);
+ // use the FileManager to find the input file
+ InputStream in;
+ try {
- buildingDao.create(bdg);
+ String[] datasets = { "photos.rdf", "places.rdf" };
- } else {
+ for (String dataset : datasets) {
+
+ in = context.getAssets().open(dataset);
+
+ if (in == null) {
+ throw new IllegalArgumentException(dataset + " not found");
+ }
- String[] dataBits = strLine.split(",");
+ // read the RDF/XML file
+ model.read(in, null);
- if (buildingPoints.get(dataBits[1]) == null) {
- // Log.w(TAG, "Building " + dataBits[1] + " has a null point");
- continue;
- }
+ Log.i(TAG, "Finished the read of " + dataset);
- Building bdg = new Building(dataBits[1], buildingPoints.get(dataBits[1]), dataBits[3].equals("R"),
- dataBits[0]);
- /*
- * Polygon poly = buildingPolys.get(dataBits[1]);
- *
- * if (poly != null) { bdg.outline = poly; // Log.i(TAG, "Adding building " + key + " " +
- * bdg.point.getLatitudeE6() + " " + bdg.point.getLongitudeE6() + " " + poly); } else { //
- * Log.i(TAG, "Adding building " + key + " " + bdg.point.getLatitudeE6() + " " +
- * bdg.point.getLongitudeE6()); }
- */
+ }
- // Log.i(TAG, "Creating building " + bdg.id + " " + bdg.name + " " + bdg.point + " " +
- // bdg.residential + " " + bdg.outline);
+ // write it to standard out
+ sw = new StringWriter();
+ model.write(new PrintWriter(sw));
+ Log.i(TAG, sw.toString());
- buildingDao.create(bdg);
+ Log.i(TAG, "Finished the second output");
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
- }
- bufferedReader.close();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ model.close();
- /*
- * for (Iterator<String> iter = buildingPoints.keySet().iterator(); iter.hasNext();) { String key = iter.next();
- *
- * Building bdg = new Building(key, buildingPoints.get(key), false); Polygon poly = buildingPolys.get(key);
- *
- * if (poly != null) { bdg.outline = poly; // Log.i(TAG, "Adding building " + key + " " +
- * bdg.point.getLatitudeE6() + " " + bdg.point.getLongitudeE6() + " " + poly); } else { // Log.i(TAG,
- * "Adding building " + key + " " + bdg.point.getLatitudeE6() + " " + bdg.point.getLongitudeE6()); }
- *
- * buildingDao.create(bdg); }
- */
-
- }
-
- public static void loadBusData(Context context, boolean onlyUniLink) throws SQLException, IOException {
- DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
-
- Dao<BusStop, String> busStopDao = helper.getBusStopDao();
- Dao<BusRoute, Integer> busRouteDao = helper.getBusRouteDao();
- Dao<RouteStops, Integer> routeStopsDao = helper.getRouteStopsDao();
-
- TableUtils.clearTable(helper.getConnectionSource(), BusStop.class);
- TableUtils.clearTable(helper.getConnectionSource(), BusRoute.class);
- TableUtils.clearTable(helper.getConnectionSource(), RouteStops.class);
-
- Log.i(TAG, "Loading busstops from csv");
-
- InputStream inputStream = context.getAssets().open("bus_stops.csv");
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
- String strLine = "";
-
- try {
- String def = bufferedReader.readLine();
- // Log.i(TAG, "Reading the definition " +def );
-
- while ((strLine = bufferedReader.readLine()) != null) {
- // Log.i(TAG, "Data: " + strLine);
- String[] dataBits = strLine.split(",");
-
- String[] quBitsLat = dataBits[3].substring(1, dataBits[3].length() - 1).split(" ");
- String[] quBitsLng = dataBits[4].substring(1, dataBits[4].length() - 1).split(" ");
-
- // Log.i(TAG, "Whole " + dataBits[3] + " First bit " + quBitsLat[0] + " last bit " + quBitsLat[1]);
- double lat = Double.valueOf(quBitsLat[0])
- + Double.valueOf(quBitsLat[1].substring(0, quBitsLat[1].length() - 1)) / 60d;
- // Log.i(TAG, "Whole " + dataBits[4] + " First bit " + quBitsLng[0] + " last bit " + quBitsLng[1]);
- double lng = Double.valueOf(quBitsLng[0])
- + Double.valueOf(quBitsLng[1].substring(0, quBitsLng[1].length() - 1)) / 60d;
- GeoPoint point = new GeoPoint((int) (lat * 1e6), (int) (lng * -1e6));
- // Log.i(TAG, "Lat " + point.getLatitudeE6() + " lng " + point.getLongitudeE6());
-
- busStopDao.create(new BusStop(dataBits[0].replace("\"", ""), dataBits[1].replace("\"", ""), dataBits[2]
- .replace("\"", ""), point));
-
- }
-
- bufferedReader.close();
- } catch (IOException e) {
- Log.e(TAG, "Line: " + strLine);
- e.printStackTrace();
+ Log.i(TAG, "Closed the model");
}
- Log.i(TAG, "Finished loading busstops, now loading routes");
+ public static void loadBusData(Context context, boolean onlyUniLink) throws SQLException, IOException {
+ DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- inputStream = context.getAssets().open("routes.csv");
- bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ Dao<BusStop, String> busStopDao = helper.getBusStopDao();
+ Dao<BusRoute, Integer> busRouteDao = helper.getBusRouteDao();
+ Dao<RouteStops, Integer> routeStopsDao = helper.getRouteStopsDao();
- try {
- String def = bufferedReader.readLine();
- // Log.i(TAG, "Reading the definition " + def);
+ TableUtils.clearTable(helper.getConnectionSource(), BusStop.class);
+ TableUtils.clearTable(helper.getConnectionSource(), BusRoute.class);
+ TableUtils.clearTable(helper.getConnectionSource(), RouteStops.class);
- while ((strLine = bufferedReader.readLine()) != null) {
- // Log.i(TAG, "Data: " + strLine);
- String[] dataBits = strLine.split(",");
+ Log.i(TAG, "Loading busstops from csv");
- BusRoute route;
+ InputStream inputStream = context.getAssets().open("bus_stops.csv");
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ String strLine = "";
- boolean uniLink;
- int id = Integer.parseInt(dataBits[0]);
- if (id == 326 || id == 468 || id == 327 || id == 329 || id == 354) {
- uniLink = true;
- } else {
- uniLink = false;
- }
+ try {
+ String def = bufferedReader.readLine();
+ // Log.i(TAG, "Reading the definition " +def );
+
+ while ((strLine = bufferedReader.readLine()) != null) {
+ // Log.i(TAG, "Data: " + strLine);
+ String[] dataBits = strLine.split(",");
+
+ String[] quBitsLat = dataBits[3].substring(1, dataBits[3].length() - 1).split(" ");
+ String[] quBitsLng = dataBits[4].substring(1, dataBits[4].length() - 1).split(" ");
+
+ // Log.i(TAG, "Whole " + dataBits[3] + " First bit " +
+ // quBitsLat[0] + " last bit " + quBitsLat[1]);
+ double lat = Double.valueOf(quBitsLat[0])
+ + Double.valueOf(quBitsLat[1].substring(0, quBitsLat[1].length() - 1)) / 60d;
+ // Log.i(TAG, "Whole " + dataBits[4] + " First bit " +
+ // quBitsLng[0] + " last bit " + quBitsLng[1]);
+ double lng = Double.valueOf(quBitsLng[0])
+ + Double.valueOf(quBitsLng[1].substring(0, quBitsLng[1].length() - 1)) / 60d;
+ GeoPoint point = new GeoPoint((int) (lat * 1e6), (int) (lng * -1e6));
+ // Log.i(TAG, "Lat " + point.getLatitudeE6() + " lng " +
+ // point.getLongitudeE6());
+
+ busStopDao.create(new BusStop(dataBits[0].replace("\"", ""), dataBits[1].replace("\"", ""), dataBits[2]
+ .replace("\"", ""), point));
+
+ }
- route = new BusRoute(id, dataBits[1], dataBits[2].replace("\"", ""), uniLink);
-
- if (id == 326) { // U1
- route.forwardDirection = "A";
- route.reverseDirection = "C";
- } else if (id == 329) { // U2
- route.forwardDirection = "B";
- route.reverseDirection = "C";
- } else if (id == 327) { // U6
- route.forwardDirection = "H";
- route.reverseDirection = "C";
+ bufferedReader.close();
+ } catch (IOException e) {
+ Log.e(TAG, "Line: " + strLine);
+ e.printStackTrace();
}
- // Log.i(TAG, "Loaded route " + route.id + " " + route.code + " " + route.label);
- busRouteDao.create(route);
+ Log.i(TAG, "Finished loading busstops, now loading routes");
- }
+ inputStream = context.getAssets().open("routes.csv");
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
- bufferedReader.close();
- } catch (IOException e) {
- Log.e(TAG, "Line: " + strLine);
- e.printStackTrace();
- }
+ try {
+ String def = bufferedReader.readLine();
+ // Log.i(TAG, "Reading the definition " + def);
- Log.i(TAG, "Finished loading routes, now loading routestops");
+ while ((strLine = bufferedReader.readLine()) != null) {
+ // Log.i(TAG, "Data: " + strLine);
+ String[] dataBits = strLine.split(",");
- inputStream = context.getAssets().open("routestops.csv");
- bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ BusRoute route;
- try {
- String def = bufferedReader.readLine();
- // Log.i(TAG, "Reading the definition " + def);
+ boolean uniLink;
+ int id = Integer.parseInt(dataBits[0]);
+ if (id == 326 || id == 468 || id == 327 || id == 329 || id == 354) {
+ uniLink = true;
+ } else {
+ uniLink = false;
+ }
- while ((strLine = bufferedReader.readLine()) != null) {
- // Log.i(TAG, "Data: " + strLine);
- String[] dataBits = strLine.split(",");
+ route = new BusRoute(id, dataBits[1], dataBits[2].replace("\"", ""), uniLink);
- BusStop busStop = busStopDao.queryForId(dataBits[2]);
- if (busStop != null) {
- // Log.i(TAG, "Found stop " + stop.id);
- } else {
- Log.w(TAG, "No stop found for " + dataBits[2]);
- continue;
- }
+ if (id == 326) { // U1
+ route.forwardDirection = "A";
+ route.reverseDirection = "C";
+ } else if (id == 329) { // U2
+ route.forwardDirection = "B";
+ route.reverseDirection = "C";
+ } else if (id == 327) { // U6
+ route.forwardDirection = "H";
+ route.reverseDirection = "C";
+ }
- BusRoute busRoute = busRouteDao.queryForId(Integer.parseInt(dataBits[0]));
- if (busRoute != null) {
- // Log.i(TAG, "Found route " + route.id);
- } else {
- Log.w(TAG, "No route found for " + dataBits[0]);
- continue;
- }
+ // Log.i(TAG, "Loaded route " + route.id + " " + route.code +
+ // " " + route.label);
+ busRouteDao.create(route);
- int sequence = Integer.parseInt(dataBits[1]);
- Log.i(TAG, "Creating RouteStop " + busStop.id + " " + busRoute.code + " " + sequence);
-
- routeStopsDao.create(new RouteStops(busStop, busRoute, sequence));
-
- if (busRoute.id == 326) { // U1
- busStop.routes = (byte) (busStop.routes | 1);
- busStop.uniLink = true;
- } else if (busRoute.id == 468) { // U1N
- busStop.routes = (byte) (busStop.routes | (1 << 1));
- busStop.uniLink = true;
- } else if (busRoute.id == 329) { // U2
- busStop.routes = (byte) (busStop.routes | (1 << 2));
- busStop.uniLink = true;
- } else if (busRoute.id == 327) { // U6
- busStop.routes = (byte) (busStop.routes | (1 << 3));
- busStop.uniLink = true;
- } else if (busRoute.id == 354) { // U9
- busStop.routes = (byte) (busStop.routes | (1 << 4));
- busStop.uniLink = true;
- } else {
- busStop.routes = 0;
+ }
+
+ bufferedReader.close();
+ } catch (IOException e) {
+ Log.e(TAG, "Line: " + strLine);
+ e.printStackTrace();
}
- // Log.v(TAG, "Stop routes " + busStop.routes);
- busStopDao.update(busStop);
+ Log.i(TAG, "Finished loading routes, now loading routestops");
+
+ inputStream = context.getAssets().open("routestops.csv");
+ bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+ try {
+ String def = bufferedReader.readLine();
+ // Log.i(TAG, "Reading the definition " + def);
+
+ while ((strLine = bufferedReader.readLine()) != null) {
+ // Log.i(TAG, "Data: " + strLine);
+ String[] dataBits = strLine.split(",");
+
+ BusStop busStop = busStopDao.queryForId(dataBits[2]);
+ if (busStop != null) {
+ // Log.i(TAG, "Found stop " + stop.id);
+ } else {
+ Log.w(TAG, "No stop found for " + dataBits[2]);
+ continue;
+ }
+
+ BusRoute busRoute = busRouteDao.queryForId(Integer.parseInt(dataBits[0]));
+ if (busRoute != null) {
+ // Log.i(TAG, "Found route " + route.id);
+ } else {
+ Log.w(TAG, "No route found for " + dataBits[0]);
+ continue;
+ }
+
+ int sequence = Integer.parseInt(dataBits[1]);
+ Log.i(TAG, "Creating RouteStop " + busStop.id + " " + busRoute.code + " " + sequence);
+
+ routeStopsDao.create(new RouteStops(busStop, busRoute, sequence));
+
+ if (busRoute.id == 326) { // U1
+ busStop.routes = (byte) (busStop.routes | 1);
+ busStop.uniLink = true;
+ } else if (busRoute.id == 468) { // U1N
+ busStop.routes = (byte) (busStop.routes | (1 << 1));
+ busStop.uniLink = true;
+ } else if (busRoute.id == 329) { // U2
+ busStop.routes = (byte) (busStop.routes | (1 << 2));
+ busStop.uniLink = true;
+ } else if (busRoute.id == 327) { // U6
+ busStop.routes = (byte) (busStop.routes | (1 << 3));
+ busStop.uniLink = true;
+ } else if (busRoute.id == 354) { // U9
+ busStop.routes = (byte) (busStop.routes | (1 << 4));
+ busStop.uniLink = true;
+ } else {
+ busStop.routes = 0;
+ }
+
+ // Log.v(TAG, "Stop routes " + busStop.routes);
+ busStopDao.update(busStop);
- }
+ }
- bufferedReader.close();
- } catch (IOException e) {
- Log.e(TAG, "Line: " + strLine);
- e.printStackTrace();
+ bufferedReader.close();
+ } catch (IOException e) {
+ Log.e(TAG, "Line: " + strLine);
+ e.printStackTrace();
+ }
+
+ /*
+ * for (Iterator<BusStop> busStopIter = busStopDao.iterator();
+ * busStopIter.hasNext();) { BusStop stop = busStopIter.next(); //
+ * Log.i(TAG, "Looking at stop " + stop.id);
+ *
+ *
+ * QueryBuilder<RouteStops, Integer> routeStopsQueryBuilder =
+ * routeStopsDao.queryBuilder();
+ * routeStopsQueryBuilder.where().eq(columnName, value)
+ *
+ * DeleteBuilder<BusStop, String> deleteBuilder =
+ * busStopDao.deleteBuilder(); // only delete the rows where password is
+ * null deleteBuilder.where().in(RouteStops.STOP_ID_FIELD_NAME, objects)
+ * accountDao.delete(deleteBuilder.prepare());
+ *
+ *
+ * QueryBuilder<RouteStops, Integer> routeStopsQueryBuilder =
+ * routeStopsDao.queryBuilder();
+ * routeStopsQueryBuilder.setCountOf(true);
+ * routeStopsQueryBuilder.where().eq(RouteStops.STOP_ID_FIELD_NAME,
+ * stop);
+ *
+ * PreparedQuery<RouteStops> routeStopsPreparedQuery =
+ * routeStopsQueryBuilder.prepare(); List<RouteStops> routeStops =
+ * routeStopsDao.query(routeStopsPreparedQuery); // long num =
+ * routeStopsDao.query(routeStopsPreparedQuery).size(); // Log.i(TAG,
+ * "Number is " + num);
+ *
+ * stop.uniLink = false; for (RouteStops routeStop : routeStops) { if
+ * (routeStop.busRoute.uniLink) { stop.uniLink = true; } }
+ * busStopDao.update(stop); }
+ */
+
+ Log.i(TAG, "Finished loading bus data");
}
- /*
- * for (Iterator<BusStop> busStopIter = busStopDao.iterator(); busStopIter.hasNext();) { BusStop stop =
- * busStopIter.next(); // Log.i(TAG, "Looking at stop " + stop.id);
- *
- *
- * QueryBuilder<RouteStops, Integer> routeStopsQueryBuilder = routeStopsDao.queryBuilder();
- * routeStopsQueryBuilder.where().eq(columnName, value)
- *
- * DeleteBuilder<BusStop, String> deleteBuilder = busStopDao.deleteBuilder(); // only delete the rows where
- * password is null deleteBuilder.where().in(RouteStops.STOP_ID_FIELD_NAME, objects)
- * accountDao.delete(deleteBuilder.prepare());
- *
- *
- * QueryBuilder<RouteStops, Integer> routeStopsQueryBuilder = routeStopsDao.queryBuilder();
- * routeStopsQueryBuilder.setCountOf(true); routeStopsQueryBuilder.where().eq(RouteStops.STOP_ID_FIELD_NAME,
- * stop);
- *
- * PreparedQuery<RouteStops> routeStopsPreparedQuery = routeStopsQueryBuilder.prepare(); List<RouteStops>
- * routeStops = routeStopsDao.query(routeStopsPreparedQuery); // long num =
- * routeStopsDao.query(routeStopsPreparedQuery).size(); // Log.i(TAG, "Number is " + num);
- *
- * stop.uniLink = false; for (RouteStops routeStop : routeStops) { if (routeStop.busRoute.uniLink) {
- * stop.uniLink = true; } } busStopDao.update(stop); }
- */
-
- Log.i(TAG, "Finished loading bus data");
- }
-
- public static void loadSiteData(Context context) throws SQLException, IOException {
- Log.i(TAG, "Begining loading site data");
-
- DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
-
- TableUtils.clearTable(helper.getConnectionSource(), Site.class);
-
- Dao<Site, String> siteDao = helper.getSiteDao();
-
- InputStream inputStream = context.getAssets().open("sites.csv");
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
- String strLine = null;
-
- try {
- String def = bufferedReader.readLine();
- // Log.i(TAG, "Reading the site definition " + def);
-
- while ((strLine = bufferedReader.readLine()) != null) {
- // Log.i(TAG, "Site Data: " + strLine);
- String[] dataBits = strLine.split(",");
-
- GeoPoint point = null;
- if (dataBits[2].length() > 1 && dataBits[3].length() > 1) {
- point = Util.csLatLongToGeoPoint(dataBits[2], dataBits[3]);
- } else {
- point = new GeoPoint(0, 0);
- }
+ public static void loadSiteData(Context context) throws SQLException, IOException {
+ Log.i(TAG, "Begining loading site data");
- Polygon poly = Util.csPolygonToPolygon(strLine.split("\"")[1]);
- // Log.i(TAG, "Polygon: " + poly);
+ DatabaseHelper helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- siteDao.create(new Site(dataBits[0], dataBits[1], point, poly));
- }
+ TableUtils.clearTable(helper.getConnectionSource(), Site.class);
- bufferedReader.close();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- Log.e(TAG, "Site Line: " + strLine);
- e.printStackTrace();
- }
+ Dao<Site, String> siteDao = helper.getSiteDao();
- Log.i(TAG, "Loaded sites from csv");
- }
-
- private static Stop getStop(Context context, JSONObject stopObj, Set<BusRoute> routes, BusStop busStop)
- throws SQLException, JSONException {
-
- if (helper == null)
- helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- if (busRouteDao == null)
- busRouteDao = helper.getBusRouteDao();
- Dao<RouteStops, Integer> routeStopsDao = null;
- if (routeStopsDao == null)
- routeStopsDao = helper.getRouteStopsDao();
- if (busDao == null)
- busDao = helper.getBusDao();
- if (busStopDao == null)
- busStopDao = helper.getBusStopDao();
-
- String time = stopObj.getString("time");
-
- GregorianCalendar calender = new GregorianCalendar();
- boolean live = true;
- if (!time.equals("Due")) {
-
- // Log.v(TAG, "Time: " + time + " current time " + calender.getTime());
-
- if (time.contains(":")) {
- String[] minAndHour = time.split(":");
- calender.set(Calendar.HOUR_OF_DAY, Integer.parseInt(minAndHour[0]));
- calender.set(Calendar.MINUTE, Integer.parseInt(minAndHour[1]));
- live = false;
- } else {
- // Log.i(TAG, "Parsing " + time.substring(0, time.length() - 1) + " for min");
- calender.add(Calendar.MINUTE, Integer.parseInt(time.substring(0, time.length() - 1)));
- }
-
- // Log.v(TAG, "Date: " + calender.getTime());
- }
+ InputStream inputStream = context.getAssets().open("sites.csv");
+ BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+ String strLine = null;
- String name = stopObj.getString("name");
+ try {
+ String def = bufferedReader.readLine();
+ // Log.i(TAG, "Reading the site definition " + def);
- BusRoute route = null;
- String dir = "";
+ while ((strLine = bufferedReader.readLine()) != null) {
+ // Log.i(TAG, "Site Data: " + strLine);
+ String[] dataBits = strLine.split(",");
- for (BusRoute tempRoute : routes) {
- if (name.contains("U")) {
- if (name.equals("U1N")) {
- if (tempRoute.code.equals(name)) {
- route = tempRoute;
- dir = null;
- }
- } else {
- if (tempRoute == null) {
- Log.e(TAG, "tempRoute == null");
- }
- if (tempRoute.code == null) {
- Log.e(TAG, "tempRoute.code == null");
- }
- if (tempRoute.code.equals(name.substring(0, 2))) {
- route = tempRoute;
- if (route.forwardDirection.equals(name.substring(2))) {
- dir = route.forwardDirection;
- } else if (route.reverseDirection.equals(name.substring(2))) {
- dir = route.reverseDirection;
- } else {
- Log.e(TAG, "Error detecting direction for " + name);
- dir = null;
- return null;
+ GeoPoint point = null;
+ if (dataBits[2].length() > 1 && dataBits[3].length() > 1) {
+ point = Util.csLatLongToGeoPoint(dataBits[2], dataBits[3]);
+ } else {
+ point = new GeoPoint(0, 0);
+ }
+
+ Polygon poly = Util.csPolygonToPolygon(strLine.split("\"")[1]);
+ // Log.i(TAG, "Polygon: " + poly);
+
+ siteDao.create(new Site(dataBits[0], dataBits[1], point, poly));
}
- }
- }
- } else {
- if (tempRoute.code.equals(name)) {
- route = tempRoute;
- dir = null;
+
+ bufferedReader.close();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ Log.e(TAG, "Site Line: " + strLine);
+ e.printStackTrace();
}
- }
- }
- if (route == null) {
- Log.e(TAG, "Route not found (route == null) " + name);
- return null;
+ Log.i(TAG, "Loaded sites from csv");
}
- if (dir != null && dir.equals("")) {
- Log.e(TAG, "Error detecting direction for " + name);
- return null;
- }
+ private static Stop getStop(Context context, JSONObject stopObj, Set<BusRoute> routes, BusStop busStop)
+ throws SQLException, JSONException {
+
+ if (helper == null)
+ helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ if (busRouteDao == null)
+ busRouteDao = helper.getBusRouteDao();
+ Dao<RouteStops, Integer> routeStopsDao = null;
+ if (routeStopsDao == null)
+ routeStopsDao = helper.getRouteStopsDao();
+ if (busDao == null)
+ busDao = helper.getBusDao();
+ if (busStopDao == null)
+ busStopDao = helper.getBusStopDao();
+
+ String time = stopObj.getString("time");
+
+ GregorianCalendar calender = new GregorianCalendar();
+ boolean live = true;
+ if (!time.equals("Due")) {
+
+ // Log.v(TAG, "Time: " + time + " current time " +
+ // calender.getTime());
+
+ if (time.contains(":")) {
+ String[] minAndHour = time.split(":");
+ calender.set(Calendar.HOUR_OF_DAY, Integer.parseInt(minAndHour[0]));
+ calender.set(Calendar.MINUTE, Integer.parseInt(minAndHour[1]));
+ live = false;
+ } else {
+ // Log.i(TAG, "Parsing " + time.substring(0, time.length() - 1)
+ // + " for min");
+ calender.add(Calendar.MINUTE, Integer.parseInt(time.substring(0, time.length() - 1)));
+ }
- String destString = stopObj.getString("dest");
- BusStop destStop = null;
-
- if (destString.equals("Central Station")) {
- destStop = busStopDao.queryForId("SN120520");
- } else if (destString.equals("Civic Centre")) {
- destStop = busStopDao.queryForId("SN120527");
- } else if (destString.equals("City DG4")) {
- destStop = busStopDao.queryForId("HAA13579");
- } else if (destString.equals("Airport")) {
- destStop = busStopDao.queryForId("HA030184");
- } else if (destString.equals("City, Town Quay")) {
- destStop = busStopDao.queryForId("SNA13766");
- } else if (destString.equals("City Centre")) {
- destStop = busStopDao.queryForId("SNA13766");
- } else if (destString.equals("Dock Gate 4")) {
- destStop = busStopDao.queryForId("MG1031");
- } else if (destString.equals("Eastleigh")) {
- destStop = busStopDao.queryForId("HA030212");
- } else if (destString.equals("Crematorium")) {
- destStop = busStopDao.queryForId("SN121009");
- } else if (destString.equals("General Hosp")) {
- destStop = busStopDao.queryForId("SNA19482");
- } else if (destString.equals("Wessex Lane")) {
- destStop = busStopDao.queryForId("SNA19780");
- } else {
- Log.e(TAG, "Unknown end dest " + destString + " for route " + route.code);
- }
+ // Log.v(TAG, "Date: " + calender.getTime());
+ }
- if (destStop != null) {
-
- QueryBuilder<RouteStops, Integer> routeStopsQueryBuilder = routeStopsDao.queryBuilder();
- routeStopsQueryBuilder.where().eq(RouteStops.ROUTE_ID_FIELD_NAME, route.id).and()
- .eq(RouteStops.STOP_ID_FIELD_NAME, destStop.id);
- PreparedQuery<RouteStops> routeStopsPreparedQuery = routeStopsQueryBuilder.prepare();
-
- List<RouteStops> routeStops = routeStopsDao.query(routeStopsPreparedQuery);
- if (routeStops.size() > 0) {
- Log.i(TAG, "Found " + routeStops.size() + " stops matching the destStop " + destStop + " on route "
- + route.code);
- } else {
- Log.w(TAG, "Found " + routeStops.size() + " stops matching the destStop " + destStop + " on route "
- + route.code);
- }
- }
+ String name = stopObj.getString("name");
+
+ BusRoute route = null;
+ String dir = "";
+
+ for (BusRoute tempRoute : routes) {
+ if (name.contains("U")) {
+ if (name.equals("U1N")) {
+ if (tempRoute.code.equals(name)) {
+ route = tempRoute;
+ dir = null;
+ }
+ } else {
+ if (tempRoute == null) {
+ Log.e(TAG, "tempRoute == null");
+ }
+ if (tempRoute.code == null) {
+ Log.e(TAG, "tempRoute.code == null");
+ }
+ if (tempRoute.code.equals(name.substring(0, 2))) {
+ route = tempRoute;
+ if (route.forwardDirection.equals(name.substring(2))) {
+ dir = route.forwardDirection;
+ } else if (route.reverseDirection.equals(name.substring(2))) {
+ dir = route.reverseDirection;
+ } else {
+ Log.e(TAG, "Error detecting direction for " + name);
+ dir = null;
+ return null;
+ }
+ }
+ }
+ } else {
+ if (tempRoute.code.equals(name)) {
+ route = tempRoute;
+ dir = null;
+ }
+ }
+ }
- Date now = new Date(System.currentTimeMillis());
-
- String busID = null;
- Stop stop;
- Bus bus;
- if (stopObj.has("vehicle")) {
- busID = stopObj.getString("vehicle");
-
- QueryBuilder<Bus, Integer> busQueryBuilder = busDao.queryBuilder();
- busQueryBuilder.where().eq(Bus.ID_FIELD_NAME, busID);
- PreparedQuery<Bus> busPreparedQuery = busQueryBuilder.prepare();
-
- bus = busDao.queryForFirst(busPreparedQuery);
-
- if (bus == null) {
- bus = new Bus(busID, route, dir);
- bus.destination = destStop;
- busDao.create(bus);
- } else {
- bus.destination = destStop;
- bus.route = route;
- bus.direction = dir;
- busDao.update(bus);
- }
-
- } else {
- bus = new Bus(null, route, dir);
- busDao.create(bus);
- }
+ if (route == null) {
+ Log.e(TAG, "Route not found (route == null) " + name);
+ return null;
+ }
- stop = new Stop(bus, busStop, calender.getTime(), now, live);
+ if (dir != null && dir.equals("")) {
+ Log.e(TAG, "Error detecting direction for " + name);
+ return null;
+ }
+
+ String destString = stopObj.getString("dest");
+ BusStop destStop = null;
+
+ if (destString.equals("Central Station")) {
+ destStop = busStopDao.queryForId("SN120520");
+ } else if (destString.equals("Civic Centre")) {
+ destStop = busStopDao.queryForId("SN120527");
+ } else if (destString.equals("City DG4")) {
+ destStop = busStopDao.queryForId("HAA13579");
+ } else if (destString.equals("Airport")) {
+ destStop = busStopDao.queryForId("HA030184");
+ } else if (destString.equals("City, Town Quay")) {
+ destStop = busStopDao.queryForId("SNA13766");
+ } else if (destString.equals("City Centre")) {
+ destStop = busStopDao.queryForId("SNA13766");
+ } else if (destString.equals("Dock Gate 4")) {
+ destStop = busStopDao.queryForId("MG1031");
+ } else if (destString.equals("Eastleigh")) {
+ destStop = busStopDao.queryForId("HA030212");
+ } else if (destString.equals("Crematorium")) {
+ destStop = busStopDao.queryForId("SN121009");
+ } else if (destString.equals("General Hosp")) {
+ destStop = busStopDao.queryForId("SNA19482");
+ } else if (destString.equals("Wessex Lane")) {
+ destStop = busStopDao.queryForId("SNA19780");
+ } else {
+ Log.e(TAG, "Unknown end dest " + destString + " for route " + route.code);
+ }
- return stop;
- }
+ if (destStop != null) {
- public static Timetable getTimetable(Context context, String busStop, boolean keepUniLink, boolean keepNonUniLink)
- throws SQLException, ClientProtocolException, IOException, JSONException {
+ QueryBuilder<RouteStops, Integer> routeStopsQueryBuilder = routeStopsDao.queryBuilder();
+ routeStopsQueryBuilder.where().eq(RouteStops.ROUTE_ID_FIELD_NAME, route.id).and()
+ .eq(RouteStops.STOP_ID_FIELD_NAME, destStop.id);
+ PreparedQuery<RouteStops> routeStopsPreparedQuery = routeStopsQueryBuilder.prepare();
+
+ List<RouteStops> routeStops = routeStopsDao.query(routeStopsPreparedQuery);
+ if (routeStops.size() > 0) {
+ Log.i(TAG, "Found " + routeStops.size() + " stops matching the destStop " + destStop + " on route "
+ + route.code);
+ } else {
+ Log.w(TAG, "Found " + routeStops.size() + " stops matching the destStop " + destStop + " on route "
+ + route.code);
+ }
+ }
- if (helper == null)
- helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- if (busRouteDao == null)
- busRouteDao = helper.getBusRouteDao();
- if (busStopDao == null)
- busStopDao = helper.getBusStopDao();
+ Date now = new Date(System.currentTimeMillis());
- Timetable timetable = new Timetable();
+ String busID = null;
+ Stop stop;
+ Bus bus;
+ if (stopObj.has("vehicle")) {
+ busID = stopObj.getString("vehicle");
- String file = getFileFromServer(busStopUrl + busStop + ".json");
+ QueryBuilder<Bus, Integer> busQueryBuilder = busDao.queryBuilder();
+ busQueryBuilder.where().eq(Bus.ID_FIELD_NAME, busID);
+ PreparedQuery<Bus> busPreparedQuery = busQueryBuilder.prepare();
- JSONObject data = new JSONObject(file);
- JSONArray stopsArray = data.getJSONArray("stops");
- JSONObject routesObject = data.getJSONObject("routes");
+ bus = busDao.queryForFirst(busPreparedQuery);
- HashSet<BusRoute> busRoutes = new HashSet<BusRoute>();
- for (Iterator<String> keyIter = routesObject.keys(); keyIter.hasNext();) {
- String key = keyIter.next();
+ if (bus == null) {
+ bus = new Bus(busID, route, dir);
+ bus.destination = destStop;
+ busDao.create(bus);
+ } else {
+ bus.destination = destStop;
+ bus.route = route;
+ bus.direction = dir;
+ busDao.update(bus);
+ }
- Log.v(TAG, "Route Key: " + key);
+ } else {
+ bus = new Bus(null, route, dir);
+ busDao.create(bus);
+ }
- BusRoute route = busRouteDao.queryForId(Integer.parseInt(key.substring(key.length() - 3, key.length())));
+ stop = new Stop(bus, busStop, calender.getTime(), now, live);
- if (route != null) {
- busRoutes.add(route);
- } else {
- throw new RuntimeException("Route not found " + key.substring(key.length() - 3, key.length()) + " "
- + key);
- }
+ return stop;
}
- Log.i(TAG, "Number of entries " + data.length());
+ public static Timetable getTimetable(Context context, String busStop, boolean keepUniLink, boolean keepNonUniLink)
+ throws SQLException, ClientProtocolException, IOException, JSONException {
- Log.i(TAG, "Stops: " + data.getJSONArray("stops"));
+ if (helper == null)
+ helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ if (busRouteDao == null)
+ busRouteDao = helper.getBusRouteDao();
+ if (busStopDao == null)
+ busStopDao = helper.getBusStopDao();
- for (int stopNum = 0; stopNum < stopsArray.length(); stopNum++) {
- JSONObject stopObj = stopsArray.getJSONObject(stopNum);
+ Timetable timetable = new Timetable();
- if (!keepNonUniLink && !stopObj.getString("name").startsWith("U")) {
- Log.v(TAG, "Skipping non uni-link stop " + stopObj.getString("name"));
- continue;
- }
+ String file = getFileFromServer(busStopUrl + busStop + ".json");
- if (!keepUniLink && stopObj.getString("name").startsWith("U")) {
- Log.v(TAG, "Skipping uni-link stop " + stopObj.getString("name"));
- continue;
- }
+ JSONObject data = new JSONObject(file);
+ JSONArray stopsArray = data.getJSONArray("stops");
+ JSONObject routesObject = data.getJSONObject("routes");
- BusStop busStopObj = busStopDao.queryForId(busStop);
- if (busStopObj == null) {
- Log.e(TAG, "BusStopObj == null");
- }
+ HashSet<BusRoute> busRoutes = new HashSet<BusRoute>();
+ for (Iterator<String> keyIter = routesObject.keys(); keyIter.hasNext();) {
+ String key = keyIter.next();
- Stop stop = getStop(context, stopObj, busRoutes, busStopObj);
+ Log.v(TAG, "Route Key: " + key);
- if (stop == null) {
- Log.w(TAG, "Null stop, skiping");
- continue;
- }
+ BusRoute route = busRouteDao.queryForId(Integer.parseInt(key.substring(key.length() - 3, key.length())));
- Log.v(TAG, "Found stop for a unidentified " + stop.bus.toString() + " at " + stop.busStop.id + " at "
- + stop.arivalTime);
+ if (route != null) {
+ busRoutes.add(route);
+ } else {
+ throw new RuntimeException("Route not found " + key.substring(key.length() - 3, key.length()) + " "
+ + key);
+ }
+ }
- timetable.add(stop);
- }
+ Log.i(TAG, "Number of entries " + data.length());
- timetable.fetchTime = new Date(System.currentTimeMillis());
- return timetable;
- }
+ Log.i(TAG, "Stops: " + data.getJSONArray("stops"));
- public static Timetable getTimetable(Context context, Bus bus, BusStop startStop, int num) throws SQLException,
- ClientProtocolException, IOException, JSONException {
+ for (int stopNum = 0; stopNum < stopsArray.length(); stopNum++) {
+ JSONObject stopObj = stopsArray.getJSONObject(stopNum);
- if (helper == null)
- helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- if (busRouteDao == null)
- busRouteDao = helper.getBusRouteDao();
- if (busStopDao == null)
- busStopDao = helper.getBusStopDao();
+ if (!keepNonUniLink && !stopObj.getString("name").startsWith("U")) {
+ Log.v(TAG, "Skipping non uni-link stop " + stopObj.getString("name"));
+ continue;
+ }
- Timetable timetable = new Timetable();
+ if (!keepUniLink && stopObj.getString("name").startsWith("U")) {
+ Log.v(TAG, "Skipping uni-link stop " + stopObj.getString("name"));
+ continue;
+ }
- List<BusStop> busStops = new ArrayList<BusStop>(num);
- busStops.add(startStop);
+ BusStop busStopObj = busStopDao.queryForId(busStop);
+ if (busStopObj == null) {
+ Log.e(TAG, "BusStopObj == null");
+ }
+
+ Stop stop = getStop(context, stopObj, busRoutes, busStopObj);
- BusRoute route = bus.route;
+ if (stop == null) {
+ Log.w(TAG, "Null stop, skiping");
+ continue;
+ }
- for (int i = 0; i < num; i++) {
- BusStop nextStop = route.moveInRoute(context, busStops.get(i), bus.direction, 1);
+ Log.v(TAG, "Found stop for a unidentified " + stop.bus.toString() + " at " + stop.busStop.id + " at "
+ + stop.arivalTime);
- if (nextStop != null) {
- busStops.add(nextStop);
- } else {
- Log.e(TAG, "nextStop is null");
- }
+ timetable.add(stop);
+ }
+
+ timetable.fetchTime = new Date(System.currentTimeMillis());
+ return timetable;
}
- for (BusStop busStop : busStops) {
+ public static Timetable getTimetable(Context context, Bus bus, BusStop startStop, int num) throws SQLException,
+ ClientProtocolException, IOException, JSONException {
+
+ if (helper == null)
+ helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ if (busRouteDao == null)
+ busRouteDao = helper.getBusRouteDao();
+ if (busStopDao == null)
+ busStopDao = helper.getBusStopDao();
+
+ Timetable timetable = new Timetable();
+
+ List<BusStop> busStops = new ArrayList<BusStop>(num);
+ busStops.add(startStop);
+
+ BusRoute route = bus.route;
- String file = getFileFromServer(busStopUrl + busStop.id + ".json");
+ for (int i = 0; i < num; i++) {
+ BusStop nextStop = route.moveInRoute(context, busStops.get(i), bus.direction, 1);
- JSONObject data = new JSONObject(file);
- JSONArray stopsArray = data.getJSONArray("stops");
+ if (nextStop != null) {
+ busStops.add(nextStop);
+ } else {
+ Log.e(TAG, "nextStop is null");
+ }
+ }
+
+ for (BusStop busStop : busStops) {
- HashSet<BusRoute> busRoutes = new HashSet<BusRoute>();
- busRoutes.add(bus.route);
+ String file = getFileFromServer(busStopUrl + busStop.id + ".json");
- Log.v(TAG, "Number of entries " + data.length());
+ JSONObject data = new JSONObject(file);
+ JSONArray stopsArray = data.getJSONArray("stops");
- Log.v(TAG, "Stops: " + data.getJSONArray("stops"));
+ HashSet<BusRoute> busRoutes = new HashSet<BusRoute>();
+ busRoutes.add(bus.route);
- for (int stopNum = 0; stopNum < stopsArray.length(); stopNum++) {
- JSONObject stopObj = stopsArray.getJSONObject(stopNum);
+ Log.v(TAG, "Number of entries " + data.length());
- if (stopObj.getString("vehicle").equals(bus.id)) {
+ Log.v(TAG, "Stops: " + data.getJSONArray("stops"));
- Stop stop = getStop(context, stopObj, busRoutes, busStop);
+ for (int stopNum = 0; stopNum < stopsArray.length(); stopNum++) {
+ JSONObject stopObj = stopsArray.getJSONObject(stopNum);
- if (stop == null) {
- Log.w(TAG, "Null stop, skiping");
- continue;
- }
+ if (stopObj.getString("vehicle").equals(bus.id)) {
- Log.v(TAG, "Found stop for a unidentified " + stop.bus.toString() + " at " + stop.busStop.id
- + " at " + stop.arivalTime);
+ Stop stop = getStop(context, stopObj, busRoutes, busStop);
- timetable.add(stop);
+ if (stop == null) {
+ Log.w(TAG, "Null stop, skiping");
+ continue;
+ }
+ Log.v(TAG, "Found stop for a unidentified " + stop.bus.toString() + " at " + stop.busStop.id
+ + " at " + stop.arivalTime);
+
+ timetable.add(stop);
+
+ }
+ }
}
- }
- }
- timetable.fetchTime = new Date(System.currentTimeMillis());
+ timetable.fetchTime = new Date(System.currentTimeMillis());
- return timetable;
- }
+ return timetable;
+ }
- public static Stop getStop(Context context, Bus bus, BusStop busStop) throws SQLException, ClientProtocolException,
- IOException, JSONException {
+ public static Stop getStop(Context context, Bus bus, BusStop busStop) throws SQLException, ClientProtocolException,
+ IOException, JSONException {
- if (helper == null)
- helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- if (busRouteDao == null)
- busRouteDao = helper.getBusRouteDao();
- if (busStopDao == null)
- busStopDao = helper.getBusStopDao();
+ if (helper == null)
+ helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ if (busRouteDao == null)
+ busRouteDao = helper.getBusRouteDao();
+ if (busStopDao == null)
+ busStopDao = helper.getBusStopDao();
- String file = getFileFromServer(busStopUrl + busStop.id + ".json");
+ String file = getFileFromServer(busStopUrl + busStop.id + ".json");
- JSONObject data = new JSONObject(file);
- JSONArray stopsArray = data.getJSONArray("stops");
+ JSONObject data = new JSONObject(file);
+ JSONArray stopsArray = data.getJSONArray("stops");
- HashSet<BusRoute> busRoutes = new HashSet<BusRoute>();
- busRouteDao.refresh(bus.route);
- busRoutes.add(bus.route);
+ HashSet<BusRoute> busRoutes = new HashSet<BusRoute>();
+ busRouteDao.refresh(bus.route);
+ busRoutes.add(bus.route);
- Stop stop = null;
+ Stop stop = null;
- // Log.v(TAG, "Number of entries " + data.length());
+ // Log.v(TAG, "Number of entries " + data.length());
- // Log.v(TAG, "Stops: " + data.getJSONArray("stops"));
+ // Log.v(TAG, "Stops: " + data.getJSONArray("stops"));
- for (int stopNum = 0; stopNum < stopsArray.length(); stopNum++) {
- JSONObject stopObj = stopsArray.getJSONObject(stopNum);
+ for (int stopNum = 0; stopNum < stopsArray.length(); stopNum++) {
+ JSONObject stopObj = stopsArray.getJSONObject(stopNum);
- // Log.v(TAG, "stopObj: " + stopObj);
- if (stopObj.has("vehicle") && stopObj.getString("vehicle").equals(bus.id)) {
+ // Log.v(TAG, "stopObj: " + stopObj);
+ if (stopObj.has("vehicle") && stopObj.getString("vehicle").equals(bus.id)) {
- stop = getStop(context, stopObj, busRoutes, busStop);
- break;
+ stop = getStop(context, stopObj, busRoutes, busStop);
+ break;
- // Log.v(TAG, "Found stop for a unidentified " + stop.bus.toString() + " at " + stop.busStop.id + " at "
- // + stop.arivalTime);
- }
+ // Log.v(TAG, "Found stop for a unidentified " +
+ // stop.bus.toString() + " at " + stop.busStop.id + " at "
+ // + stop.arivalTime);
+ }
+ }
+
+ return stop;
}
- return stop;
- }
+ static PathOverlay getRoutePath(InputStream routeResource, int colour, ResourceProxy resProxy) {
+ PathOverlay data = null;
- static PathOverlay getRoutePath(InputStream routeResource, int colour, ResourceProxy resProxy) {
- PathOverlay data = null;
+ // sax stuff
+ try {
+ SAXParserFactory spf = SAXParserFactory.newInstance();
+ SAXParser sp = spf.newSAXParser();
- // sax stuff
- try {
- SAXParserFactory spf = SAXParserFactory.newInstance();
- SAXParser sp = spf.newSAXParser();
+ XMLReader xr = sp.getXMLReader();
- XMLReader xr = sp.getXMLReader();
+ DataHandler dataHandler = new DataHandler(colour, resProxy);
+ xr.setContentHandler(dataHandler);
- DataHandler dataHandler = new DataHandler(colour, resProxy);
- xr.setContentHandler(dataHandler);
+ xr.parse(new InputSource(routeResource));
- xr.parse(new InputSource(routeResource));
+ data = dataHandler.getData();
- data = dataHandler.getData();
+ } catch (ParserConfigurationException pce) {
+ Log.e("SAX XML", "sax parse error", pce);
+ } catch (SAXException se) {
+ Log.e("SAX XML", "sax error", se);
+ } catch (IOException ioe) {
+ Log.e("SAX XML", "sax parse io error", ioe);
+ }
- } catch (ParserConfigurationException pce) {
- Log.e("SAX XML", "sax parse error", pce);
- } catch (SAXException se) {
- Log.e("SAX XML", "sax error", se);
- } catch (IOException ioe) {
- Log.e("SAX XML", "sax parse io error", ioe);
+ return data;
}
- return data;
- }
-
- public static String getFileFromServer(String request) throws ClientProtocolException, IOException {
- StringBuilder builder = new StringBuilder();
- HttpClient client = new DefaultHttpClient();
- HttpGet httpGet = new HttpGet(request);
- Log.v("Util.getFileFromServer", "Request used: " + request);
-
- HttpResponse response = client.execute(httpGet);
- StatusLine statusLine = response.getStatusLine();
- int statusCode = statusLine.getStatusCode();
- if (statusCode == 200) {
- HttpEntity entity = response.getEntity();
- InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(content));
- String line;
- while ((line = reader.readLine()) != null) {
- builder.append(line);
- }
- } else {
- Log.e("", "Failed to download file");
+ public static String getFileFromServer(String request) throws ClientProtocolException, IOException {
+ StringBuilder builder = new StringBuilder();
+ HttpClient client = new DefaultHttpClient();
+ HttpGet httpGet = new HttpGet(request);
+ Log.v("Util.getFileFromServer", "Request used: " + request);
+
+ HttpResponse response = client.execute(httpGet);
+ StatusLine statusLine = response.getStatusLine();
+ int statusCode = statusLine.getStatusCode();
+ if (statusCode == 200) {
+ HttpEntity entity = response.getEntity();
+ InputStream content = entity.getContent();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
+ }
+ } else {
+ Log.e("", "Failed to download file");
+ }
+
+ return builder.toString();
}
- return builder.toString();
- }
-
- public static void routeMovementTest(Context context) throws SQLException {
-
- Dao<RouteStops, Integer> routeStopsDao = null;
-
- if (helper == null)
- helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
- if (routeStopsDao == null)
- routeStopsDao = helper.getRouteStopsDao();
- if (busRouteDao == null)
- busRouteDao = helper.getBusRouteDao();
- if (busStopDao == null)
- busStopDao = helper.getBusStopDao();
-
- for (BusRoute busRoute : busRouteDao) {
- if (!busRoute.code.startsWith("U") || busRoute.code.equals("U9")) {
- continue;
- }
- List<RouteStops> routeStops = routeStopsDao.queryForEq(RouteStops.ROUTE_ID_FIELD_NAME, busRoute.id);
-
- ArrayList<String> directions = new ArrayList<String>();
- if (busRoute.forwardDirection != null) {
- directions.add(busRoute.forwardDirection);
- }
- if (busRoute.reverseDirection != null) {
- directions.add(busRoute.reverseDirection);
- }
- if (directions.size() == 0) {
- directions.add(null);
- }
-
- BusStop startBusStop = null;
-
- for (int moveAmount = 1; moveAmount >= -1; moveAmount = moveAmount - 2) {
- for (String direction : directions) {
- for (int busStop = 0; busStop < routeStops.size() && busStop >= 0; busStop = busStop + moveAmount) {
- // if (routeStops.get(busStop).stop.equals(startBusStop))
- // continue;
- startBusStop = routeStops.get(busStop).busStop;
- busStopDao.refresh(startBusStop);
-
- BusStop predictedNextStop = busRoute.moveInRoute(context, startBusStop, direction, moveAmount);
-
- BusStop nextStop;
- if (busStop == routeStops.size() - 1) {
- nextStop = routeStops.get(0).busStop;
- } else {
- nextStop = routeStops.get(busStop + 1).busStop;
+ public static void routeMovementTest(Context context) throws SQLException {
+
+ Dao<RouteStops, Integer> routeStopsDao = null;
+
+ if (helper == null)
+ helper = OpenHelperManager.getHelper(context, DatabaseHelper.class);
+ if (routeStopsDao == null)
+ routeStopsDao = helper.getRouteStopsDao();
+ if (busRouteDao == null)
+ busRouteDao = helper.getBusRouteDao();
+ if (busStopDao == null)
+ busStopDao = helper.getBusStopDao();
+
+ for (BusRoute busRoute : busRouteDao) {
+ if (!busRoute.code.startsWith("U") || busRoute.code.equals("U9")) {
+ continue;
}
- busStopDao.refresh(nextStop);
+ List<RouteStops> routeStops = routeStopsDao.queryForEq(RouteStops.ROUTE_ID_FIELD_NAME, busRoute.id);
- if (!nextStop.equals(predictedNextStop) && !startBusStop.equals(nextStop)) {
- Log.e(TAG, "predicted: " + predictedNextStop + " next: " + nextStop);
- Log.e(TAG, startBusStop.id + " " + nextStop.id);
- return;
+ ArrayList<String> directions = new ArrayList<String>();
+ if (busRoute.forwardDirection != null) {
+ directions.add(busRoute.forwardDirection);
+ }
+ if (busRoute.reverseDirection != null) {
+ directions.add(busRoute.reverseDirection);
+ }
+ if (directions.size() == 0) {
+ directions.add(null);
+ }
+
+ BusStop startBusStop = null;
+
+ for (int moveAmount = 1; moveAmount >= -1; moveAmount = moveAmount - 2) {
+ for (String direction : directions) {
+ for (int busStop = 0; busStop < routeStops.size() && busStop >= 0; busStop = busStop + moveAmount) {
+ // if
+ // (routeStops.get(busStop).stop.equals(startBusStop))
+ // continue;
+ startBusStop = routeStops.get(busStop).busStop;
+ busStopDao.refresh(startBusStop);
+
+ BusStop predictedNextStop = busRoute.moveInRoute(context, startBusStop, direction, moveAmount);
+
+ BusStop nextStop;
+ if (busStop == routeStops.size() - 1) {
+ nextStop = routeStops.get(0).busStop;
+ } else {
+ nextStop = routeStops.get(busStop + 1).busStop;
+ }
+ busStopDao.refresh(nextStop);
+
+ if (!nextStop.equals(predictedNextStop) && !startBusStop.equals(nextStop)) {
+ Log.e(TAG, "predicted: " + predictedNextStop + " next: " + nextStop);
+ Log.e(TAG, startBusStop.id + " " + nextStop.id);
+ return;
+ }
+ }
+ }
}
- }
}
- }
- }
- }
+ }
}
diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java
index cad7567..ff61c4e 100644
--- a/src/net/cbaines/suma/MapActivity.java
+++ b/src/net/cbaines/suma/MapActivity.java
@@ -71,1243 +71,1272 @@ import com.j256.ormlite.dao.Dao;
*
*/
public class MapActivity extends OrmLiteBaseActivity<DatabaseHelper> implements MapViewConstants, Runnable,
- RouteColorConstants, OnItemClickListener, OnItemLongClickListener, OnSharedPreferenceChangeListener,
- Preferences {
+ RouteColorConstants, OnItemClickListener, OnItemLongClickListener, OnSharedPreferenceChangeListener,
+ Preferences {
- /**
- * Enable to use the database in the assets folder, if its not enabled, the database is built from the csv files in
- * the assets folder
- */
- private boolean useBundledDatabase = true;
-
- private MapView mapView;
- private MapController mapController;
- private ResourceProxy mResourceProxy;
-
- private long startTime;
-
- static final int VIEW_DIALOG_ID = 0;
- static final int FAVOURITE_DIALOG_ID = 1;
- private POIDialog favDialog;
-
- private HashMap<String, Overlay> overlays = new HashMap<String, Overlay>();
- private HashMap<String, Overlay> pastOverlays;
-
- // Overlays
-
- // -- Building Overlays
- static final String BUILDING_OVERLAYS = "buildingOverlays:";
-
- // ---- Residential Building Overlay
- private static final String RESIDENTIAL_BUILDING_OVERLAY = "residentialBuildingOverlay";
- private BuildingNumOverlay residentialBuildingOverlay;
- static final boolean RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT = true;
- private static final int RESIDENTIAL_BUILDING_OVERLAY_RANK = 6;
-
- // ---- Non-Residential Building Overlay
- private static final String NON_RESIDENTIAL_BUILDING_OVERLAY = "nonResidentialBuildingOverlay";
- private BuildingNumOverlay nonResidentialBuildingOverlay;
- static final boolean NON_RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT = true;
- private static final int NON_RESIDENTIAL_BUILDING_OVERLAY_RANK = 5;
-
- static final String[] BUILDING_TYPES = { RESIDENTIAL_BUILDING_OVERLAY, NON_RESIDENTIAL_BUILDING_OVERLAY };
-
- // -- Bus Stop Overlays
- static final String BUS_STOP_OVERLAYS = "busStopOverlays:";
-
- // ---- Uni-Link Bus Stop Overlay
- private static final String UNI_LINK_BUS_STOP_OVERLAY = "uniLinkBusStopOverlay";
- private BusStopOverlay uniLinkBusStopOverlay;
- static final boolean UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT = true;
- private static final int UNI_LINK_BUS_STOP_OVERLAY_RANK = 3;
+ /**
+ * Enable to use the database in the assets folder, if its not enabled, the
+ * database is built from the csv files in the assets folder
+ */
+ private boolean useBundledDatabase = true;
- // ---- Non Uni-Link Bus Stop Overlay
- private BusStopOverlay nonUniLinkBusStopOverlay;
- private static final int NON_UNI_LINK_BUS_STOP_OVERLAY_RANK = 4;
+ private MapView mapView;
+ private MapController mapController;
+ private ResourceProxy mResourceProxy;
- // -- Site Overlays
- static final String[] SITE_NAMES = { "Highfield Campus", "Boldrewood Campus", "Avenue Campus",
- "Winchester School of Art", "The University of Southampton Science Park",
- "National Oceanography Centre Campus", "Boat House", "Southampton General Hospital",
- "Royal South Hants Hospital", "Belgrave Industrial Site", "Highfield Hall", "Glen Eyre Hall",
- "South Hill Hall", "Chamberlain Hall", "Hartley Grove", "Bencraft Hall", "Connaught Hall",
- "Montefiore Hall", "Stoneham Hall", "Erasmus Park" };
+ private long startTime;
- private static final String SITE_OVERLAYS = "siteOverlays:";
- private HashMap<Site, PathOverlay> siteOverlays = new HashMap<Site, PathOverlay>(21);
- static final boolean SITE_OVERLAYS_ENABLED_BY_DEFAULT = false;
- private static final int SITE_OVERLAYS_RANK = 8;
+ static final int VIEW_DIALOG_ID = 0;
+ static final int FAVOURITE_DIALOG_ID = 1;
+ private POIDialog favDialog;
- // -- Route Overlays
- private static final String BUS_ROUTE_OVERLAYS = "routeOverlays:";
- private HashMap<BusRoute, PathOverlay> busRouteOverlays = new HashMap<BusRoute, PathOverlay>(5);
- static final boolean BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT = true;
- private static final int BUS_ROUTE_OVERLAYS_RANK = 7;
+ private HashMap<String, Overlay> overlays = new HashMap<String, Overlay>();
+ private HashMap<String, Overlay> pastOverlays;
- // -- Other
- static final String OTHER_OVERLAYS = "otherOverlay:";
+ // Overlays
- // ---- Scale Bar Overlay
- private static final String SCALE_BAR_OVERLAY = "scaleBarOverlay";
- private ScaleBarOverlay scaleBarOverlay;
- static final boolean SCALE_BAR_OVERLAY_ENABLED_BY_DEFAULT = true;
- private static final int SCALE_BAR_OVERLAY_RANK = 1;
+ // -- Building Overlays
+ static final String BUILDING_OVERLAYS = "buildingOverlays:";
- // ---- My Location Overlay
- private static final String MY_LOCATION_OVERLAY = "myLocationOverlay";
- private static final String MY_LOCATION_OVERLAY_COMPASS = "myLocationOverlayCompass";
- private MyLocationOverlay myLocationOverlay;
- static final boolean MY_LOCATION_OVERLAY_ENABLED_BY_DEFAULT = true;
- static final boolean MY_LOCATION_OVERLAY_COMPASS_ENABLED_BY_DEFAULT = true;
- private static final int MY_LOCATION_OVERLAY_RANK = 2;
+ // ---- Residential Building Overlay
+ private static final String RESIDENTIAL_BUILDING_OVERLAY = "residentialBuildingOverlay";
+ private BuildingNumOverlay residentialBuildingOverlay;
+ static final boolean RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT = true;
+ private static final int RESIDENTIAL_BUILDING_OVERLAY_RANK = 6;
- static final String[] OTHER_OVERLAY_NAMES = { SCALE_BAR_OVERLAY, MY_LOCATION_OVERLAY, MY_LOCATION_OVERLAY_COMPASS };
+ // ---- Non-Residential Building Overlay
+ private static final String NON_RESIDENTIAL_BUILDING_OVERLAY = "nonResidentialBuildingOverlay";
+ private BuildingNumOverlay nonResidentialBuildingOverlay;
+ static final boolean NON_RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT = true;
+ private static final int NON_RESIDENTIAL_BUILDING_OVERLAY_RANK = 5;
- // Other bits
+ static final String[] BUILDING_TYPES = { RESIDENTIAL_BUILDING_OVERLAY, NON_RESIDENTIAL_BUILDING_OVERLAY };
- // Uni-Link routes
- static final String[] UNI_LINK_ROUTES = { "U1", "U1N", "U2", "U6", "U9" };
+ // -- Bus Stop Overlays
+ static final String BUS_STOP_OVERLAYS = "busStopOverlays:";
- static final String[] PREFERENCES_GROUPS = { BUS_STOP_OVERLAYS, BUS_ROUTE_OVERLAYS, BUILDING_OVERLAYS,
- SITE_OVERLAYS, OTHER_OVERLAYS };
+ // ---- Uni-Link Bus Stop Overlay
+ private static final String UNI_LINK_BUS_STOP_OVERLAY = "uniLinkBusStopOverlay";
+ private BusStopOverlay uniLinkBusStopOverlay;
+ static final boolean UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT = true;
+ private static final int UNI_LINK_BUS_STOP_OVERLAY_RANK = 3;
- static final String[][] PREFERENCES_CHILDREN = { UNI_LINK_ROUTES, UNI_LINK_ROUTES, BUILDING_TYPES, SITE_NAMES,
- OTHER_OVERLAY_NAMES };
+ // ---- Non Uni-Link Bus Stop Overlay
+ private BusStopOverlay nonUniLinkBusStopOverlay;
+ private static final int NON_UNI_LINK_BUS_STOP_OVERLAY_RANK = 4;
- /**
- * The toast for this activity, storing the toast centrally allows it to be changed quickly, instead of a queue
- * building up
- */
- Toast activityToast;
+ // -- Site Overlays
+ static final String[] SITE_NAMES = { "Highfield Campus", "Boldrewood Campus", "Avenue Campus",
+ "Winchester School of Art", "The University of Southampton Science Park",
+ "National Oceanography Centre Campus", "Boat House", "Southampton General Hospital",
+ "Royal South Hants Hospital", "Belgrave Industrial Site", "Highfield Hall", "Glen Eyre Hall",
+ "South Hill Hall", "Chamberlain Hall", "Hartley Grove", "Bencraft Hall", "Connaught Hall",
+ "Montefiore Hall", "Stoneham Hall", "Erasmus Park" };
- private MapActivity instance;
+ private static final String SITE_OVERLAYS = "siteOverlays:";
+ private HashMap<Site, PathOverlay> siteOverlays = new HashMap<Site, PathOverlay>(21);
+ static final boolean SITE_OVERLAYS_ENABLED_BY_DEFAULT = false;
+ private static final int SITE_OVERLAYS_RANK = 8;
- private static final String TAG = "SUM";
+ // -- Route Overlays
+ private static final String BUS_ROUTE_OVERLAYS = "routeOverlays:";
+ private HashMap<BusRoute, PathOverlay> busRouteOverlays = new HashMap<BusRoute, PathOverlay>(5);
+ static final boolean BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT = true;
+ private static final int BUS_ROUTE_OVERLAYS_RANK = 7;
- @SuppressWarnings("unchecked")
- public void onCreate(Bundle savedInstanceState) {
- startTime = System.currentTimeMillis();
+ // -- Other
+ static final String OTHER_OVERLAYS = "otherOverlay:";
- super.onCreate(savedInstanceState);
+ // ---- Scale Bar Overlay
+ private static final String SCALE_BAR_OVERLAY = "scaleBarOverlay";
+ private ScaleBarOverlay scaleBarOverlay;
+ static final boolean SCALE_BAR_OVERLAY_ENABLED_BY_DEFAULT = true;
+ private static final int SCALE_BAR_OVERLAY_RANK = 1;
- instance = this;
+ // ---- My Location Overlay
+ private static final String MY_LOCATION_OVERLAY = "myLocationOverlay";
+ private static final String MY_LOCATION_OVERLAY_COMPASS = "myLocationOverlayCompass";
+ private MyLocationOverlay myLocationOverlay;
+ static final boolean MY_LOCATION_OVERLAY_ENABLED_BY_DEFAULT = true;
+ static final boolean MY_LOCATION_OVERLAY_COMPASS_ENABLED_BY_DEFAULT = true;
+ private static final int MY_LOCATION_OVERLAY_RANK = 2;
- Thread databaseThread = new Thread(this); // Start the database thread
- databaseThread.start();
+ static final String[] OTHER_OVERLAY_NAMES = { SCALE_BAR_OVERLAY, MY_LOCATION_OVERLAY, MY_LOCATION_OVERLAY_COMPASS };
- setContentView(R.layout.main);
+ // Other bits
- Log.i(TAG, "Finished setting content view " + (System.currentTimeMillis() - startTime));
+ // Uni-Link routes
+ static final String[] UNI_LINK_ROUTES = { "U1", "U1N", "U2", "U6", "U9" };
- mapView = (MapView) this.findViewById(R.id.mapview);
- mapView.setTileSource(TileSourceFactory.MAPQUESTOSM);
- mapView.setBuiltInZoomControls(true);
- mapView.setMultiTouchControls(true);
+ static final String[] PREFERENCES_GROUPS = { BUS_STOP_OVERLAYS, BUS_ROUTE_OVERLAYS, BUILDING_OVERLAYS,
+ SITE_OVERLAYS, OTHER_OVERLAYS };
- pastOverlays = (HashMap<String, Overlay>) getLastNonConfigurationInstance();
+ static final String[][] PREFERENCES_CHILDREN = { UNI_LINK_ROUTES, UNI_LINK_ROUTES, BUILDING_TYPES, SITE_NAMES,
+ OTHER_OVERLAY_NAMES };
- /*
- * SensorManager mSensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE); This code in the
- * following constructor causes problems in some emulators, disable sensors to fix.
+ /**
+ * The toast for this activity, storing the toast centrally allows it to be
+ * changed quickly, instead of a queue building up
*/
- Log.i(TAG, "Starting creating myLocationOverlay");
- myLocationOverlay = new MyLocationOverlay(instance, mapView);
- Log.i(TAG, "Finished creating myLocationOverlay");
+ Toast activityToast;
- while (databaseThread.isAlive()) {
- Thread.yield();
- }
+ private MapActivity instance;
- new Thread(new Runnable() {
- public void run() {
- Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
- try {
- showOverlays();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
- }).start();
-
- Log.i(TAG, "Started loading thread " + (System.currentTimeMillis() - startTime));
-
- mapController = mapView.getController();
- mResourceProxy = new DefaultResourceProxyImpl(getApplicationContext());
-
- GeoPoint userLocation = null;
+ private static final String TAG = "SUM";
- Bundle extras = getIntent().getExtras();
- if (extras != null && extras.containsKey("poiPoint")) {
- String poiPoint = getIntent().getExtras().getString("poiPoint");
- Log.i(TAG, "poiPoint " + poiPoint);
+ @SuppressWarnings("unchecked")
+ public void onCreate(Bundle savedInstanceState) {
+ startTime = System.currentTimeMillis();
- String[] bits = poiPoint.split(",");
-
- userLocation = new GeoPoint(Double.valueOf(bits[0]), Double.valueOf(bits[1]));
- mapController.setZoom(20);
-
- } else {
- userLocation = myLocationOverlay.getMyLocation();
- if (userLocation == null) {
- userLocation = new GeoPoint(50935551, -1393488); // ECS
- }
- mapController.setZoom(15);
- }
+ super.onCreate(savedInstanceState);
- mapController.setCenter(userLocation);
-
- Log.i(TAG, "Finished onCreate " + (System.currentTimeMillis() - startTime));
- }
-
- public void onResume() {
- super.onResume();
- Log.i(TAG, "OnResume");
- if (myLocationOverlay != null) {
- final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- final SharedPreferences activityPrefs = getPreferences(0);
-
- if (activityPrefs.getBoolean(OTHER_OVERLAYS + MY_LOCATION_OVERLAY_COMPASS, false)) {
- myLocationOverlay.enableCompass();
- } else {
- myLocationOverlay.disableCompass();
- }
-
- if (activityPrefs.getBoolean(OTHER_OVERLAYS + MY_LOCATION_OVERLAY, false)
- && sharedPrefs.getBoolean(GPS_ENABLED, false)) {
- myLocationOverlay.enableMyLocation();
- } else {
- myLocationOverlay.disableMyLocation();
- }
-
- sharedPrefs.registerOnSharedPreferenceChangeListener(this);
- activityPrefs.registerOnSharedPreferenceChangeListener(this);
- }
- }
-
- public void onPause() {
- super.onResume();
- Log.i(TAG, "OnPause");
- if (myLocationOverlay != null) {
- myLocationOverlay.disableMyLocation();
- myLocationOverlay.disableCompass();
- }
- }
+ instance = this;
- public void finish() {
- super.finish();
- }
+ Thread databaseThread = new Thread(this); // Start the database thread
+ databaseThread.start();
- @Override
- public Object onRetainNonConfigurationInstance() {
- return overlays;
- }
+ setContentView(R.layout.main);
- public void run() {
- Log.i(TAG, "Begining loading database " + (System.currentTimeMillis() - startTime));
+ Log.i(TAG, "Finished setting content view " + (System.currentTimeMillis() - startTime));
- DatabaseHelper helper = getHelper();
- Log.i(TAG, "Got the helper at " + (System.currentTimeMillis() - startTime));
+ mapView = (MapView) this.findViewById(R.id.mapview);
+ mapView.setTileSource(TileSourceFactory.MAPQUESTOSM);
+ mapView.setBuiltInZoomControls(true);
+ mapView.setMultiTouchControls(true);
- boolean dbExist = helper.checkDataBase();
- Log.i(TAG, "Finished checking the database at " + (System.currentTimeMillis() - startTime));
+ pastOverlays = (HashMap<String, Overlay>) getLastNonConfigurationInstance();
- if (dbExist) {
- // do nothing - database already exist
- } else {
+ /*
+ * SensorManager mSensorManager = (SensorManager)
+ * getSystemService(Context.SENSOR_SERVICE); This code in the following
+ * constructor causes problems in some emulators, disable sensors to
+ * fix.
+ */
+ Log.i(TAG, "Starting creating myLocationOverlay");
+ myLocationOverlay = new MyLocationOverlay(instance, mapView);
+ Log.i(TAG, "Finished creating myLocationOverlay");
- if (useBundledDatabase) {
- try {
- // By calling this method and empty database will be created into the default system path
- // of your application so we are gonna be able to overwrite that database with our database.
- Log.i(TAG, "GetReadableDatabase");
- helper.getWritableDatabase().close();
-
- helper.copyDataBase();
- Log.i(TAG, "Out of copy database");
- } catch (IOException ioe) {
- throw new Error("Unable to create database");
+ while (databaseThread.isAlive()) {
+ Thread.yield();
}
- } else {
- Thread buildingThread = null;
- Thread busStopThread = null;
- Thread siteThread = null;
-
- Log.i(TAG, "Begining loading databases " + (System.currentTimeMillis() - startTime));
- try {
- Dao<Building, String> buildingDao;
-
- buildingDao = helper.getBuildingDao();
- long buildingCount = buildingDao.countOf();
- Log.i(TAG, "Building count " + buildingCount);
- if (buildingCount < 260) {
- buildingThread = new Thread(new Runnable() {
- public void run() {
+ new Thread(new Runnable() {
+ public void run() {
+ Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
try {
- DataManager.loadBuildings(instance);
- Log.i(TAG, "Loaded building database " + (System.currentTimeMillis() - startTime));
+ showOverlays();
} catch (SQLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
+ e.printStackTrace();
}
- }
- });
-
- buildingThread.start();
- }
-
- Dao<BusStop, String> busStopDao = helper.getBusStopDao();
- Dao<BusRoute, Integer> busRouteDao = helper.getBusRouteDao();
- Dao<RouteStops, Integer> routeStopsDao = helper.getRouteStopsDao();
-
- long busStopCount = busStopDao.countOf();
- long busRouteCount = busRouteDao.countOf();
- long routeStopsCount = routeStopsDao.countOf();
-
- Log.i(TAG, "BusStop count " + busStopCount);
- Log.i(TAG, "BusRoute count " + busRouteCount);
- Log.i(TAG, "RouteStops count " + routeStopsCount);
- if (busStopCount < 217 || busRouteCount < 5 || routeStopsCount < 327) {
- busStopThread = new Thread(new Runnable() {
- public void run() {
- try {
- DataManager.loadBusData(instance, true);
- Log.i(TAG, "Loaded bus stop database " + (System.currentTimeMillis() - startTime));
- } catch (SQLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- });
-
- busStopThread.start();
- }
+ }
+ }).start();
- Dao<Site, String> siteDao = helper.getSiteDao();
+ Log.i(TAG, "Started loading thread " + (System.currentTimeMillis() - startTime));
- long siteCount = siteDao.countOf();
- Log.i(TAG, "Sites count " + siteCount);
- if (siteCount < 21) {
- siteThread = new Thread(new Runnable() {
- public void run() {
- try {
- DataManager.loadSiteData(instance);
- Log.i(TAG, "Loaded site database " + (System.currentTimeMillis() - startTime));
- } catch (SQLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- });
+ mapController = mapView.getController();
+ mResourceProxy = new DefaultResourceProxyImpl(getApplicationContext());
- siteThread.start();
- }
+ GeoPoint userLocation = null;
- while (true) {
- if ((buildingThread == null || !buildingThread.isAlive())
- && (busStopThread == null || !busStopThread.isAlive())
- && (siteThread == null || !siteThread.isAlive()))
- break;
+ Bundle extras = getIntent().getExtras();
+ if (extras != null && extras.containsKey("poiPoint")) {
+ String poiPoint = getIntent().getExtras().getString("poiPoint");
+ Log.i(TAG, "poiPoint " + poiPoint);
- Thread.yield();
- }
+ String[] bits = poiPoint.split(",");
- Log.i(TAG, "Finished loading databases " + (System.currentTimeMillis() - startTime));
+ userLocation = new GeoPoint(Double.valueOf(bits[0]), Double.valueOf(bits[1]));
+ mapController.setZoom(20);
- } catch (SQLException e1) {
- e1.printStackTrace();
+ } else {
+ userLocation = myLocationOverlay.getMyLocation();
+ if (userLocation == null) {
+ userLocation = new GeoPoint(50935551, -1393488); // ECS
+ }
+ mapController.setZoom(15);
}
- }
-
- }
- Log.i(TAG, "Begining setting up the static values " + (System.currentTimeMillis() - startTime));
+ mapController.setCenter(userLocation);
- Log.i(TAG, "Finished the database thread " + (System.currentTimeMillis() - startTime));
- }
+ Log.i(TAG, "Finished onCreate " + (System.currentTimeMillis() - startTime));
- private void showOverlays() throws SQLException {
- Log.i(TAG, "Began showing overlays at " + (System.currentTimeMillis() - startTime));
-
- if (pastOverlays != null) {
- Log.i(TAG, "Able to recover some/all of the overlays from a previous activity");
- } else {
- Log.i(TAG, "Unable to recover overlays");
+ new Thread() {
+ public void run() {
+ DataManager.loadBuildingPhotos(instance);
+ }
+ }.start();
}
- final SharedPreferences activityPrefs = getPreferences(0);
+ public void onResume() {
+ super.onResume();
+ Log.i(TAG, "OnResume");
+ if (myLocationOverlay != null) {
+ final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ final SharedPreferences activityPrefs = getPreferences(0);
- showUtilityOverlays();
+ if (activityPrefs.getBoolean(OTHER_OVERLAYS + MY_LOCATION_OVERLAY_COMPASS, false)) {
+ myLocationOverlay.enableCompass();
+ } else {
+ myLocationOverlay.disableCompass();
+ }
- showUniLinkBusStopOverlay();
+ if (activityPrefs.getBoolean(OTHER_OVERLAYS + MY_LOCATION_OVERLAY, false)
+ && sharedPrefs.getBoolean(GPS_ENABLED, false)) {
+ myLocationOverlay.enableMyLocation();
+ } else {
+ myLocationOverlay.disableMyLocation();
+ }
- showNonUniLinkBusStopOverlay();
+ sharedPrefs.registerOnSharedPreferenceChangeListener(this);
+ activityPrefs.registerOnSharedPreferenceChangeListener(this);
+ }
+ }
- if (activityPrefs.getBoolean(BUILDING_OVERLAYS + RESIDENTIAL_BUILDING_OVERLAY,
- RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT)
- || activityPrefs.getBoolean(BUILDING_OVERLAYS + NON_RESIDENTIAL_BUILDING_OVERLAY,
- NON_RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT)) {
- showBuildingOverlays();
+ public void onPause() {
+ super.onResume();
+ Log.i(TAG, "OnPause");
+ if (myLocationOverlay != null) {
+ myLocationOverlay.disableMyLocation();
+ myLocationOverlay.disableCompass();
+ }
}
- Log.i(TAG, "Begining to show the route overlays at " + (System.currentTimeMillis() - startTime));
- for (BusRoute busRoute : getHelper().getBusRouteDao()) {
- if (!busRoute.uniLink) {
- Log.v(TAG, "Bus route " + busRoute.code + "(" + busRoute.id + ") is not unilink");
- continue;
- }
- Log.v(TAG, "Looking at showing " + busRoute.code + " route overlay");
- if (activityPrefs.getBoolean(BUS_ROUTE_OVERLAYS + busRoute.code, BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT)) {
- showRouteOverlay(busRoute);
- }
+ public void finish() {
+ super.finish();
}
- Log.i(TAG, "Finished loading routes " + (System.currentTimeMillis() - startTime));
-
- Log.i(TAG, "Begining to show the site overlays at " + (System.currentTimeMillis() - startTime));
- try {
- for (Site site : getHelper().getSiteDao()) {
- Log.v(TAG, "Looking at showing " + site.name + " site overlay");
- if (activityPrefs.getBoolean(SITE_OVERLAYS + site.name, SITE_OVERLAYS_ENABLED_BY_DEFAULT)) {
- showSiteOverlay(site);
- }
- }
- } catch (SQLException e) {
- e.printStackTrace();
+
+ @Override
+ public Object onRetainNonConfigurationInstance() {
+ return overlays;
}
- Log.i(TAG, "Finished showing the site overlays " + (System.currentTimeMillis() - startTime));
- Log.i(TAG, "Finished showing all the overlays " + (System.currentTimeMillis() - startTime));
- }
+ public void run() {
+ Log.i(TAG, "Begining loading database " + (System.currentTimeMillis() - startTime));
- private void showUtilityOverlays() {
- new Thread(new Runnable() {
- public void run() {
- Log.i(TAG, "Begining showing the utility overlays " + (System.currentTimeMillis() - startTime));
+ DatabaseHelper helper = getHelper();
+ Log.i(TAG, "Got the helper at " + (System.currentTimeMillis() - startTime));
- final SharedPreferences activityPrefs = getPreferences(0);
- final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
+ boolean dbExist = helper.checkDataBase();
+ Log.i(TAG, "Finished checking the database at " + (System.currentTimeMillis() - startTime));
- if (scaleBarOverlay != null) {
- Log.v(TAG, "ScaleBarOverlay is already created");
+ if (dbExist) {
+ // do nothing - database already exist
} else {
- if (pastOverlays != null
- && (scaleBarOverlay = (ScaleBarOverlay) pastOverlays.get(SCALE_BAR_OVERLAY)) != null) {
- Log.i(TAG, "Finished restoring utility overlays " + (System.currentTimeMillis() - startTime));
- } else {
- scaleBarOverlay = new ScaleBarOverlay(instance);
- }
- overlays.put(SCALE_BAR_OVERLAY, scaleBarOverlay);
+ if (useBundledDatabase) {
+ try {
+ // By calling this method and empty database will be created
+ // into the default system path
+ // of your application so we are gonna be able to overwrite
+ // that database with our database.
+ Log.i(TAG, "GetReadableDatabase");
+ helper.getWritableDatabase().close();
+
+ helper.copyDataBase();
+ Log.i(TAG, "Out of copy database");
+ } catch (IOException ioe) {
+ throw new Error("Unable to create database");
+ }
+ } else {
+ Thread buildingThread = null;
+ Thread busStopThread = null;
+ Thread siteThread = null;
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().add(scaleBarOverlay);
- mapView.getOverlays().add(myLocationOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
- }
+ Log.i(TAG, "Begining loading databases " + (System.currentTimeMillis() - startTime));
+ try {
+ Dao<Building, String> buildingDao;
+
+ buildingDao = helper.getBuildingDao();
+
+ long buildingCount = buildingDao.countOf();
+ Log.i(TAG, "Building count " + buildingCount);
+ if (buildingCount < 260) {
+ buildingThread = new Thread(new Runnable() {
+ public void run() {
+ try {
+ DataManager.loadBuildings(instance);
+ Log.i(TAG, "Loaded building database " + (System.currentTimeMillis() - startTime));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ buildingThread.start();
+ }
+
+ Dao<BusStop, String> busStopDao = helper.getBusStopDao();
+ Dao<BusRoute, Integer> busRouteDao = helper.getBusRouteDao();
+ Dao<RouteStops, Integer> routeStopsDao = helper.getRouteStopsDao();
+
+ long busStopCount = busStopDao.countOf();
+ long busRouteCount = busRouteDao.countOf();
+ long routeStopsCount = routeStopsDao.countOf();
+
+ Log.i(TAG, "BusStop count " + busStopCount);
+ Log.i(TAG, "BusRoute count " + busRouteCount);
+ Log.i(TAG, "RouteStops count " + routeStopsCount);
+ if (busStopCount < 217 || busRouteCount < 5 || routeStopsCount < 327) {
+ busStopThread = new Thread(new Runnable() {
+ public void run() {
+ try {
+ DataManager.loadBusData(instance, true);
+ Log.i(TAG, "Loaded bus stop database " + (System.currentTimeMillis() - startTime));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ busStopThread.start();
+ }
+
+ Dao<Site, String> siteDao = helper.getSiteDao();
+
+ long siteCount = siteDao.countOf();
+ Log.i(TAG, "Sites count " + siteCount);
+ if (siteCount < 21) {
+ siteThread = new Thread(new Runnable() {
+ public void run() {
+ try {
+ DataManager.loadSiteData(instance);
+ Log.i(TAG, "Loaded site database " + (System.currentTimeMillis() - startTime));
+ } catch (SQLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ siteThread.start();
+ }
+
+ while (true) {
+ if ((buildingThread == null || !buildingThread.isAlive())
+ && (busStopThread == null || !busStopThread.isAlive())
+ && (siteThread == null || !siteThread.isAlive()))
+ break;
+
+ Thread.yield();
+ }
+
+ Log.i(TAG, "Finished loading databases " + (System.currentTimeMillis() - startTime));
+
+ } catch (SQLException e1) {
+ e1.printStackTrace();
+ }
+ }
}
- scaleBarOverlay.setEnabled(activityPrefs.getBoolean(OTHER_OVERLAYS + SCALE_BAR_OVERLAY,
- SCALE_BAR_OVERLAY_ENABLED_BY_DEFAULT));
-
- mapView.postInvalidate();
-
- Log.i(TAG, "Finished showing utility overlays " + (System.currentTimeMillis() - startTime));
- }
- }).start();
- }
+ Log.i(TAG, "Begining setting up the static values " + (System.currentTimeMillis() - startTime));
- private void showRouteOverlay(final BusRoute route) {
- new Thread(new Runnable() {
- public void run() {
- Log.i(TAG, "Begining showing route " + route.code + " overlay at "
- + (System.currentTimeMillis() - startTime));
+ Log.i(TAG, "Finished the database thread " + (System.currentTimeMillis() - startTime));
+ }
- final SharedPreferences activityPrefs = getPreferences(0);
- final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
+ private void showOverlays() throws SQLException {
+ Log.i(TAG, "Began showing overlays at " + (System.currentTimeMillis() - startTime));
- PathOverlay routeOverlay;
- if ((routeOverlay = busRouteOverlays.get(route)) != null) {
- Log.v(TAG, route.code + " route overlay already existed");
+ if (pastOverlays != null) {
+ Log.i(TAG, "Able to recover some/all of the overlays from a previous activity");
} else {
- if (pastOverlays != null
- && (routeOverlay = (PathOverlay) pastOverlays.get(BUS_ROUTE_OVERLAYS + route.code)) != null) {
- Log.v(TAG, "Restored " + route.code + " route overlay");
- if (route.code.equals("U1")) {
- PathOverlay routeOverlayU1E = (PathOverlay) pastOverlays.get(BUS_ROUTE_OVERLAYS + "U1E");
- overlays.put(BUS_ROUTE_OVERLAYS + "U1E", routeOverlayU1E);
- }
- } else {
- InputStream resource = null;
- int colour = 0;
- if (route.code.equals("U1")) {
- resource = getResources().openRawResource(R.raw.u1);
- colour = U1;
-
- // TODO Is this a route like U1N or, something else, this hack works somewhat for now?
- PathOverlay routeOverlayU1E = DataManager.getRoutePath(
- getResources().openRawResource(R.raw.u1e), colour, mResourceProxy);
- routeOverlayU1E.getPaint().setAntiAlias(true);
- routeOverlayU1E.getPaint().setAlpha(145);
- routeOverlayU1E.getPaint().setStrokeWidth(12);
- routeOverlayU1E.getPaint().setPathEffect(new DashPathEffect(new float[] { 20, 16 }, 0));
- routeOverlayU1E.setEnabled(activityPrefs.getBoolean("Bus Routes:" + route.code, true));
-
- busRouteOverlays.put(new BusRoute(1000, "U1E", "U1E Route Label", true), routeOverlayU1E);
- overlays.put(BUS_ROUTE_OVERLAYS + route.code + "E", routeOverlayU1E);
- } else if (route.code.equals("U1N")) {
- resource = getResources().openRawResource(R.raw.u1n);
- colour = U1N;
- } else if (route.code.equals("U2")) {
- resource = getResources().openRawResource(R.raw.u2);
- colour = U2;
- } else if (route.code.equals("U6")) {
- resource = getResources().openRawResource(R.raw.u6);
- colour = U6;
- } else if (route.code.equals("U9")) {
- resource = getResources().openRawResource(R.raw.u9);
- colour = U9;
- } else {
- Log.w(TAG, "Wierd route " + route);
- }
+ Log.i(TAG, "Unable to recover overlays");
+ }
- routeOverlay = DataManager.getRoutePath(resource, colour, mResourceProxy);
+ final SharedPreferences activityPrefs = getPreferences(0);
- Log.v(TAG, "Path overlay has " + routeOverlay.getNumberOfPoints() + " points");
+ showUtilityOverlays();
- routeOverlay.getPaint().setAntiAlias(true);
- routeOverlay.getPaint().setAlpha(145);
- routeOverlay.getPaint().setStrokeWidth(12);
- }
+ showUniLinkBusStopOverlay();
- busRouteOverlays.put(route, routeOverlay);
- overlays.put(BUS_ROUTE_OVERLAYS + route.code, routeOverlay);
+ showNonUniLinkBusStopOverlay();
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().add(routeOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
- }
+ if (activityPrefs.getBoolean(BUILDING_OVERLAYS + RESIDENTIAL_BUILDING_OVERLAY,
+ RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT)
+ || activityPrefs.getBoolean(BUILDING_OVERLAYS + NON_RESIDENTIAL_BUILDING_OVERLAY,
+ NON_RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT)) {
+ showBuildingOverlays();
+ }
+ Log.i(TAG, "Begining to show the route overlays at " + (System.currentTimeMillis() - startTime));
+ for (BusRoute busRoute : getHelper().getBusRouteDao()) {
+ if (!busRoute.uniLink) {
+ Log.v(TAG, "Bus route " + busRoute.code + "(" + busRoute.id + ") is not unilink");
+ continue;
+ }
+ Log.v(TAG, "Looking at showing " + busRoute.code + " route overlay");
+ if (activityPrefs.getBoolean(BUS_ROUTE_OVERLAYS + busRoute.code, BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT)) {
+ showRouteOverlay(busRoute);
+ }
}
+ Log.i(TAG, "Finished loading routes " + (System.currentTimeMillis() - startTime));
- routeOverlay.setEnabled(activityPrefs.getBoolean(BUS_ROUTE_OVERLAYS + route.code,
- BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT));
- if (route.code.equals("U1")) {
- overlays.get(BUS_ROUTE_OVERLAYS + "U1E").setEnabled(
- activityPrefs.getBoolean(BUS_ROUTE_OVERLAYS + "U1", BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT));
+ Log.i(TAG, "Begining to show the site overlays at " + (System.currentTimeMillis() - startTime));
+ try {
+ for (Site site : getHelper().getSiteDao()) {
+ Log.v(TAG, "Looking at showing " + site.name + " site overlay");
+ if (activityPrefs.getBoolean(SITE_OVERLAYS + site.name, SITE_OVERLAYS_ENABLED_BY_DEFAULT)) {
+ showSiteOverlay(site);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
}
+ Log.i(TAG, "Finished showing the site overlays " + (System.currentTimeMillis() - startTime));
- mapView.postInvalidate();
+ Log.i(TAG, "Finished showing all the overlays " + (System.currentTimeMillis() - startTime));
+ }
- Log.i(TAG, "Finished showing route " + route.code + " overlay at "
- + (System.currentTimeMillis() - startTime));
- }
- }).start();
- }
+ private void showUtilityOverlays() {
+ new Thread(new Runnable() {
+ public void run() {
+ Log.i(TAG, "Begining showing the utility overlays " + (System.currentTimeMillis() - startTime));
- private void showSiteOverlay(final Site site) {
+ final SharedPreferences activityPrefs = getPreferences(0);
+ final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
- new Thread(new Runnable() {
- public void run() {
- Log.i(TAG, "Begining showing site " + site.name + " overlay at "
- + (System.currentTimeMillis() - startTime));
+ if (scaleBarOverlay != null) {
+ Log.v(TAG, "ScaleBarOverlay is already created");
+ } else {
+ if (pastOverlays != null
+ && (scaleBarOverlay = (ScaleBarOverlay) pastOverlays.get(SCALE_BAR_OVERLAY)) != null) {
+ Log.i(TAG, "Finished restoring utility overlays " + (System.currentTimeMillis() - startTime));
+ } else {
+ scaleBarOverlay = new ScaleBarOverlay(instance);
+ }
- final SharedPreferences activityPrefs = getPreferences(0);
- final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
+ overlays.put(SCALE_BAR_OVERLAY, scaleBarOverlay);
- PathOverlay siteOverlay;
- if ((siteOverlay = siteOverlays.get(site)) != null) {
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().add(scaleBarOverlay);
+ mapView.getOverlays().add(myLocationOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
- } else {
- if (pastOverlays != null
- && (siteOverlay = (PathOverlay) pastOverlays.get(SITE_OVERLAYS + site.name)) != null) {
- Log.i(TAG, "Restored " + site.name + " site overlay");
- } else {
-
- siteOverlay = new PathOverlay(Color.BLUE, instance);
- Paint paint = siteOverlay.getPaint();
- paint.setAntiAlias(true);
- paint.setStrokeWidth(1.5f);
- for (int i = 0; i < site.outline.points.length; i++) {
- siteOverlay.addPoint(site.outline.points[i]);
- }
- siteOverlay.addPoint(site.outline.points[0]);
-
- }
+ }
- siteOverlays.put(site, siteOverlay);
- overlays.put(SITE_OVERLAYS + site.name, siteOverlay);
+ scaleBarOverlay.setEnabled(activityPrefs.getBoolean(OTHER_OVERLAYS + SCALE_BAR_OVERLAY,
+ SCALE_BAR_OVERLAY_ENABLED_BY_DEFAULT));
- Log.v(TAG, "Applyed the site overlay, now sorting them");
+ mapView.postInvalidate();
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().add(siteOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
- }
- }
+ Log.i(TAG, "Finished showing utility overlays " + (System.currentTimeMillis() - startTime));
+ }
+ }).start();
+ }
- siteOverlay.setEnabled(activityPrefs.getBoolean(SITE_OVERLAYS + site.name,
- SITE_OVERLAYS_ENABLED_BY_DEFAULT));
+ private void showRouteOverlay(final BusRoute route) {
+ new Thread(new Runnable() {
+ public void run() {
+ Log.i(TAG, "Begining showing route " + route.code + " overlay at "
+ + (System.currentTimeMillis() - startTime));
- mapView.postInvalidate();
+ final SharedPreferences activityPrefs = getPreferences(0);
+ final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
- Log.i(TAG, "Finished showing site " + site.name + " overlay at "
- + (System.currentTimeMillis() - startTime));
- }
- }).start();
- }
+ PathOverlay routeOverlay;
+ if ((routeOverlay = busRouteOverlays.get(route)) != null) {
+ Log.v(TAG, route.code + " route overlay already existed");
+ } else {
+ if (pastOverlays != null
+ && (routeOverlay = (PathOverlay) pastOverlays.get(BUS_ROUTE_OVERLAYS + route.code)) != null) {
+ Log.v(TAG, "Restored " + route.code + " route overlay");
+ if (route.code.equals("U1")) {
+ PathOverlay routeOverlayU1E = (PathOverlay) pastOverlays.get(BUS_ROUTE_OVERLAYS + "U1E");
+ overlays.put(BUS_ROUTE_OVERLAYS + "U1E", routeOverlayU1E);
+ }
+ } else {
+ InputStream resource = null;
+ int colour = 0;
+ if (route.code.equals("U1")) {
+ resource = getResources().openRawResource(R.raw.u1);
+ colour = U1;
+
+ // TODO Is this a route like U1N or, something else,
+ // this hack works somewhat for now?
+ PathOverlay routeOverlayU1E = DataManager.getRoutePath(
+ getResources().openRawResource(R.raw.u1e), colour, mResourceProxy);
+ routeOverlayU1E.getPaint().setAntiAlias(true);
+ routeOverlayU1E.getPaint().setAlpha(145);
+ routeOverlayU1E.getPaint().setStrokeWidth(12);
+ routeOverlayU1E.getPaint().setPathEffect(new DashPathEffect(new float[] { 20, 16 }, 0));
+ routeOverlayU1E.setEnabled(activityPrefs.getBoolean("Bus Routes:" + route.code, true));
+
+ busRouteOverlays.put(new BusRoute(1000, "U1E", "U1E Route Label", true), routeOverlayU1E);
+ overlays.put(BUS_ROUTE_OVERLAYS + route.code + "E", routeOverlayU1E);
+ } else if (route.code.equals("U1N")) {
+ resource = getResources().openRawResource(R.raw.u1n);
+ colour = U1N;
+ } else if (route.code.equals("U2")) {
+ resource = getResources().openRawResource(R.raw.u2);
+ colour = U2;
+ } else if (route.code.equals("U6")) {
+ resource = getResources().openRawResource(R.raw.u6);
+ colour = U6;
+ } else if (route.code.equals("U9")) {
+ resource = getResources().openRawResource(R.raw.u9);
+ colour = U9;
+ } else {
+ Log.w(TAG, "Wierd route " + route);
+ }
+
+ routeOverlay = DataManager.getRoutePath(resource, colour, mResourceProxy);
+
+ Log.v(TAG, "Path overlay has " + routeOverlay.getNumberOfPoints() + " points");
+
+ routeOverlay.getPaint().setAntiAlias(true);
+ routeOverlay.getPaint().setAlpha(145);
+ routeOverlay.getPaint().setStrokeWidth(12);
+ }
+
+ busRouteOverlays.put(route, routeOverlay);
+ overlays.put(BUS_ROUTE_OVERLAYS + route.code, routeOverlay);
+
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().add(routeOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
- private void showBuildingOverlays() {
- new Thread(new Runnable() {
- public void run() {
- Log.i(TAG, "Begining showing building overlays at " + (System.currentTimeMillis() - startTime));
+ }
- final SharedPreferences activityPrefs = getPreferences(0);
- final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
+ routeOverlay.setEnabled(activityPrefs.getBoolean(BUS_ROUTE_OVERLAYS + route.code,
+ BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT));
+ if (route.code.equals("U1")) {
+ overlays.get(BUS_ROUTE_OVERLAYS + "U1E").setEnabled(
+ activityPrefs.getBoolean(BUS_ROUTE_OVERLAYS + "U1", BUS_ROUTE_OVERLAYS_ENABLED_BY_DEFAULT));
+ }
- if (residentialBuildingOverlay != null) {
+ mapView.postInvalidate();
- } else {
- if (pastOverlays != null
- && (residentialBuildingOverlay = (BuildingNumOverlay) pastOverlays
- .get(RESIDENTIAL_BUILDING_OVERLAY)) != null) {
- nonResidentialBuildingOverlay = (BuildingNumOverlay) pastOverlays
- .get(NON_RESIDENTIAL_BUILDING_OVERLAY);
-
- Log.i(TAG, "Restored building overlays");
- } else {
- try {
+ Log.i(TAG, "Finished showing route " + route.code + " overlay at "
+ + (System.currentTimeMillis() - startTime));
+ }
+ }).start();
+ }
- Log.v(TAG, "Begining the creation of the building overlays");
+ private void showSiteOverlay(final Site site) {
- ArrayList<Building> residentialBuildings = new ArrayList<Building>();
- ArrayList<Building> nonResidentialBuildings = new ArrayList<Building>();
+ new Thread(new Runnable() {
+ public void run() {
+ Log.i(TAG, "Begining showing site " + site.name + " overlay at "
+ + (System.currentTimeMillis() - startTime));
- Dao<Building, String> buildingDao;
+ final SharedPreferences activityPrefs = getPreferences(0);
+ final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
- buildingDao = getHelper().getBuildingDao();
+ PathOverlay siteOverlay;
+ if ((siteOverlay = siteOverlays.get(site)) != null) {
- for (Building building : buildingDao) {
- if (building.residential == true) {
- if (building.favourite) {
- residentialBuildings.add(building);
- } else {
- residentialBuildings.add(0, building);
- }
} else {
- if (building.favourite) {
- nonResidentialBuildings.add(building);
- } else {
- nonResidentialBuildings.add(0, building);
- }
+ if (pastOverlays != null
+ && (siteOverlay = (PathOverlay) pastOverlays.get(SITE_OVERLAYS + site.name)) != null) {
+ Log.i(TAG, "Restored " + site.name + " site overlay");
+ } else {
+
+ siteOverlay = new PathOverlay(Color.BLUE, instance);
+ Paint paint = siteOverlay.getPaint();
+ paint.setAntiAlias(true);
+ paint.setStrokeWidth(1.5f);
+ for (int i = 0; i < site.outline.points.length; i++) {
+ siteOverlay.addPoint(site.outline.points[i]);
+ }
+ siteOverlay.addPoint(site.outline.points[0]);
+
+ }
+
+ siteOverlays.put(site, siteOverlay);
+ overlays.put(SITE_OVERLAYS + site.name, siteOverlay);
+
+ Log.v(TAG, "Applyed the site overlay, now sorting them");
+
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().add(siteOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
}
- }
- residentialBuildingOverlay = new BuildingNumOverlay(instance, residentialBuildings);
- nonResidentialBuildingOverlay = new BuildingNumOverlay(instance, nonResidentialBuildings);
+ siteOverlay.setEnabled(activityPrefs.getBoolean(SITE_OVERLAYS + site.name,
+ SITE_OVERLAYS_ENABLED_BY_DEFAULT));
- Log.v(TAG, "Applyed the site overlay, now sorting them");
+ mapView.postInvalidate();
- } catch (SQLException e) {
- e.printStackTrace();
+ Log.i(TAG, "Finished showing site " + site.name + " overlay at "
+ + (System.currentTimeMillis() - startTime));
}
- }
+ }).start();
+ }
- overlays.put(RESIDENTIAL_BUILDING_OVERLAY, residentialBuildingOverlay);
- overlays.put(NON_RESIDENTIAL_BUILDING_OVERLAY, nonResidentialBuildingOverlay);
+ private void showBuildingOverlays() {
+ new Thread(new Runnable() {
+ public void run() {
+ Log.i(TAG, "Begining showing building overlays at " + (System.currentTimeMillis() - startTime));
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().add(residentialBuildingOverlay);
- mapView.getOverlays().add(nonResidentialBuildingOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
- }
- }
+ final SharedPreferences activityPrefs = getPreferences(0);
+ final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
- residentialBuildingOverlay.setEnabled(activityPrefs.getBoolean(BUILDING_OVERLAYS
- + RESIDENTIAL_BUILDING_OVERLAY, RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT));
- nonResidentialBuildingOverlay.setEnabled(activityPrefs.getBoolean(BUILDING_OVERLAYS
- + NON_RESIDENTIAL_BUILDING_OVERLAY, NON_RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT));
+ if (residentialBuildingOverlay != null) {
- mapView.postInvalidate();
+ } else {
+ if (pastOverlays != null
+ && (residentialBuildingOverlay = (BuildingNumOverlay) pastOverlays
+ .get(RESIDENTIAL_BUILDING_OVERLAY)) != null) {
+ nonResidentialBuildingOverlay = (BuildingNumOverlay) pastOverlays
+ .get(NON_RESIDENTIAL_BUILDING_OVERLAY);
+
+ Log.i(TAG, "Restored building overlays");
+ } else {
+ try {
+
+ Log.v(TAG, "Begining the creation of the building overlays");
+
+ ArrayList<Building> residentialBuildings = new ArrayList<Building>();
+ ArrayList<Building> nonResidentialBuildings = new ArrayList<Building>();
+
+ Dao<Building, String> buildingDao;
+
+ buildingDao = getHelper().getBuildingDao();
+
+ for (Building building : buildingDao) {
+ if (building.residential == true) {
+ if (building.favourite) {
+ residentialBuildings.add(building);
+ } else {
+ residentialBuildings.add(0, building);
+ }
+ } else {
+ if (building.favourite) {
+ nonResidentialBuildings.add(building);
+ } else {
+ nonResidentialBuildings.add(0, building);
+ }
+ }
+ }
+
+ residentialBuildingOverlay = new BuildingNumOverlay(instance, residentialBuildings);
+ nonResidentialBuildingOverlay = new BuildingNumOverlay(instance, nonResidentialBuildings);
+
+ Log.v(TAG, "Applyed the site overlay, now sorting them");
+
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ overlays.put(RESIDENTIAL_BUILDING_OVERLAY, residentialBuildingOverlay);
+ overlays.put(NON_RESIDENTIAL_BUILDING_OVERLAY, nonResidentialBuildingOverlay);
+
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().add(residentialBuildingOverlay);
+ mapView.getOverlays().add(nonResidentialBuildingOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
+ }
- Log.i(TAG, "Finished showing building overlays at " + (System.currentTimeMillis() - startTime));
- }
- }).start();
- }
+ residentialBuildingOverlay.setEnabled(activityPrefs.getBoolean(BUILDING_OVERLAYS
+ + RESIDENTIAL_BUILDING_OVERLAY, RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT));
+ nonResidentialBuildingOverlay.setEnabled(activityPrefs.getBoolean(BUILDING_OVERLAYS
+ + NON_RESIDENTIAL_BUILDING_OVERLAY, NON_RESIDENTIAL_BUILDING_OVERLAY_ENABLED_BY_DEFAULT));
- private void showUniLinkBusStopOverlay() {
- new Thread(new Runnable() {
- public void run() {
- Log.i(TAG, "Begining showing bus stop overlays at " + (System.currentTimeMillis() - startTime));
+ mapView.postInvalidate();
- final SharedPreferences activityPrefs = getPreferences(0);
- final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
-
- if (uniLinkBusStopOverlay != null) {
- if (!activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)) {
- Log.i(TAG, "Uni-Link bus stop overlay not needed");
- overlays.remove(UNI_LINK_BUS_STOP_OVERLAY);
-
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().remove(uniLinkBusStopOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
+ Log.i(TAG, "Finished showing building overlays at " + (System.currentTimeMillis() - startTime));
}
+ }).start();
+ }
- uniLinkBusStopOverlay = null;
- } else {
- uniLinkBusStopOverlay.setRoutes(0, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(1, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(2, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(3, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(4, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- }
- } else {
- if (activityPrefs
- .getBoolean(BUS_STOP_OVERLAYS + "U1", UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
- || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)) {
- if (pastOverlays != null
- && (uniLinkBusStopOverlay = (BusStopOverlay) pastOverlays
- .get(UNI_LINK_BUS_STOP_OVERLAY)) != null) {
- Log.i(TAG, "Restored Uni-Link bus stop overlay");
- } else {
-
- try {
- List<BusStop> busStops;
- Log.v(TAG, "Begin fetching BusStops at " + (System.currentTimeMillis() - startTime));
-
- busStops = getHelper().getBusStopDao().queryForEq(BusStop.UNI_LINK_FIELD_NAME, true);
+ private void showUniLinkBusStopOverlay() {
+ new Thread(new Runnable() {
+ public void run() {
+ Log.i(TAG, "Begining showing bus stop overlays at " + (System.currentTimeMillis() - startTime));
+
+ final SharedPreferences activityPrefs = getPreferences(0);
+ final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
+
+ if (uniLinkBusStopOverlay != null) {
+ if (!activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ && !activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)) {
+ Log.i(TAG, "Uni-Link bus stop overlay not needed");
+ overlays.remove(UNI_LINK_BUS_STOP_OVERLAY);
+
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().remove(uniLinkBusStopOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
+
+ uniLinkBusStopOverlay = null;
+ } else {
+ uniLinkBusStopOverlay.setRoutes(0, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(1, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(2, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(3, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(4, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ }
+ } else {
+ if (activityPrefs
+ .getBoolean(BUS_STOP_OVERLAYS + "U1", UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)
+ || activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)) {
+ if (pastOverlays != null
+ && (uniLinkBusStopOverlay = (BusStopOverlay) pastOverlays
+ .get(UNI_LINK_BUS_STOP_OVERLAY)) != null) {
+ Log.i(TAG, "Restored Uni-Link bus stop overlay");
+ } else {
+
+ try {
+ List<BusStop> busStops;
+ Log.v(TAG, "Begin fetching BusStops at " + (System.currentTimeMillis() - startTime));
+
+ busStops = getHelper().getBusStopDao().queryForEq(BusStop.UNI_LINK_FIELD_NAME, true);
+
+ Log.v(TAG, "Finished fetching BusStops at " + (System.currentTimeMillis() - startTime));
+
+ uniLinkBusStopOverlay = new BusStopOverlay(instance, busStops);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ uniLinkBusStopOverlay.setRoutes(0, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(1, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(2, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(3, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ uniLinkBusStopOverlay.setRoutes(4, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
+ UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+
+ overlays.put(UNI_LINK_BUS_STOP_OVERLAY, uniLinkBusStopOverlay);
+
+ Log.v(TAG, "Applyed the site overlay, now sorting them");
+
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().add(uniLinkBusStopOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
+ }
+ }
- Log.v(TAG, "Finished fetching BusStops at " + (System.currentTimeMillis() - startTime));
+ mapView.postInvalidate();
- uniLinkBusStopOverlay = new BusStopOverlay(instance, busStops);
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ Log.i(TAG, "Finished showing bus stop overlays at " + (System.currentTimeMillis() - startTime));
}
+ }).start();
+ }
- uniLinkBusStopOverlay.setRoutes(0, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(1, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U1N",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(2, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U2",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(3, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U6",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- uniLinkBusStopOverlay.setRoutes(4, activityPrefs.getBoolean(BUS_STOP_OVERLAYS + "U9",
- UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
-
- overlays.put(UNI_LINK_BUS_STOP_OVERLAY, uniLinkBusStopOverlay);
+ private void showNonUniLinkBusStopOverlay() {
+ new Thread(new Runnable() {
+ public void run() {
+ Log.i(TAG, "Begining showing non uni link bus stop overlays at "
+ + (System.currentTimeMillis() - startTime));
+
+ // final SharedPreferences activityPrefs = getPreferences(0);
+ final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(instance);
+ final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
+
+ if (nonUniLinkBusStopOverlay != null) {
+ nonUniLinkBusStopOverlay.setEnabled(sharedPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY,
+ NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+
+ Log.i(TAG,
+ "nonUniLinkBusStopOverlay enabled ? "
+ + sharedPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY,
+ NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
+ } else if (sharedPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY,
+ NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)) {
+ if (pastOverlays != null
+ && (nonUniLinkBusStopOverlay = (BusStopOverlay) pastOverlays
+ .get(NON_UNI_LINK_BUS_STOPS_OVERLAY)) != null) {
+ Log.i(TAG, "Restored non Uni-Link bus stop overlays");
+ } else {
+ try {
+ List<BusStop> busStops;
+ Log.v(TAG, "Begin fetching non Uni-Link BusStops at "
+ + (System.currentTimeMillis() - startTime));
+
+ busStops = getHelper().getBusStopDao().queryForEq(BusStop.UNI_LINK_FIELD_NAME, false);
+
+ Log.v(TAG,
+ "Finished fetching " + busStops.size() + " non Uni-Link BusStops at "
+ + (System.currentTimeMillis() - startTime));
+
+ nonUniLinkBusStopOverlay = new BusStopOverlay(instance, busStops);
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ overlays.put(NON_UNI_LINK_BUS_STOPS_OVERLAY, nonUniLinkBusStopOverlay);
+
+ Log.v(TAG, "Applyed the site overlay, now sorting them");
+
+ synchronized (mapView.getOverlays()) {
+ mapView.getOverlays().add(nonUniLinkBusStopOverlay);
+ Collections.sort(mapView.getOverlays(), comparator);
+ }
+ }
- Log.v(TAG, "Applyed the site overlay, now sorting them");
+ if (nonUniLinkBusStopOverlay != null) {
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().add(uniLinkBusStopOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
- }
- }
- }
+ }
- mapView.postInvalidate();
-
- Log.i(TAG, "Finished showing bus stop overlays at " + (System.currentTimeMillis() - startTime));
- }
- }).start();
- }
-
- private void showNonUniLinkBusStopOverlay() {
- new Thread(new Runnable() {
- public void run() {
- Log.i(TAG, "Begining showing non uni link bus stop overlays at "
- + (System.currentTimeMillis() - startTime));
-
- // final SharedPreferences activityPrefs = getPreferences(0);
- final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(instance);
- final OverlayRankComparator comparator = new OverlayRankComparator(getPreferences(0));
-
- if (nonUniLinkBusStopOverlay != null) {
- nonUniLinkBusStopOverlay.setEnabled(sharedPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY,
- NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
-
- Log.i(TAG,
- "nonUniLinkBusStopOverlay enabled ? "
- + sharedPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY,
- NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT));
- } else if (sharedPrefs.getBoolean(NON_UNI_LINK_BUS_STOPS_OVERLAY,
- NON_UNI_LINK_BUS_STOP_OVERLAY_ENABLED_BY_DEFAULT)) {
- if (pastOverlays != null
- && (nonUniLinkBusStopOverlay = (BusStopOverlay) pastOverlays
- .get(NON_UNI_LINK_BUS_STOPS_OVERLAY)) != null) {
- Log.i(TAG, "Restored non Uni-Link bus stop overlays");
- } else {
- try {
- List<BusStop> busStops;
- Log.v(TAG, "Begin fetching non Uni-Link BusStops at "
- + (System.currentTimeMillis() - startTime));
+ mapView.postInvalidate();
- busStops = getHelper().getBusStopDao().queryForEq(BusStop.UNI_LINK_FIELD_NAME, false);
+ Log.i(TAG, "Finished showing non Uni-Link bus stop overlays at "
+ + (System.currentTimeMillis() - startTime));
+ }
+ }).start();
+ }
- Log.v(TAG,
- "Finished fetching " + busStops.size() + " non Uni-Link BusStops at "
- + (System.currentTimeMillis() - startTime));
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater inflater = getMenuInflater();
+ inflater.inflate(R.menu.map_menu, menu);
+ return true;
+ }
- nonUniLinkBusStopOverlay = new BusStopOverlay(instance, busStops);
- } catch (SQLException e) {
- e.printStackTrace();
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ // Handle item selection
+ switch (item.getItemId()) {
+ case R.id.menu_find:
+ Intent i = new Intent(MapActivity.this, FindActivity.class);
+ startActivityForResult(i, 0);
+ return true;
+ case R.id.menu_preferences:
+ Intent settingsActivity = new Intent(getBaseContext(), PreferencesActivity.class);
+ startActivity(settingsActivity);
+ return true;
+ case R.id.menu_find_my_location:
+ final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ if (sharedPrefs.getBoolean("GPSEnabled", false)) {
+ GeoPoint userLocation = myLocationOverlay.getMyLocation();
+ if (userLocation != null) {
+ Log.i(TAG, "Found user location, scrolling to " + userLocation);
+ mapController.animateTo(userLocation);
+ myLocationOverlay.enableFollowLocation();
+ }
+ } else {
+ DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ switch (which) {
+ case DialogInterface.BUTTON_POSITIVE:
+ Editor editor = sharedPrefs.edit();
+ editor.putBoolean("GPSEnabled", true);
+ editor.commit();
+ break;
+
+ case DialogInterface.BUTTON_NEGATIVE:
+ // No button clicked
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ builder.setMessage("GPS is not enabled, do you wish to enable it?")
+ .setPositiveButton("Yes", dialogClickListener).setNegativeButton("No", dialogClickListener)
+ .show();
}
- }
- overlays.put(NON_UNI_LINK_BUS_STOPS_OVERLAY, nonUniLinkBusStopOverlay);
+ return true;
+ case R.id.menu_view:
+ Log.i(TAG, "Showing view dialog");
+ showDialog(VIEW_DIALOG_ID);
+ return false;
+ case R.id.menu_favourites:
+ Log.i(TAG, "Showing favourite dialog");
+
+ showDialog(FAVOURITE_DIALOG_ID);
+ if (favDialog == null) {
+ Log.e(TAG, "Very wierd, just tried to launch the favourite's dialog, but its null?");
+ return false;
+ }
- Log.v(TAG, "Applyed the site overlay, now sorting them");
+ refreshFavouriteDialog();
- synchronized (mapView.getOverlays()) {
- mapView.getOverlays().add(nonUniLinkBusStopOverlay);
- Collections.sort(mapView.getOverlays(), comparator);
- }
+ return false;
+ case R.id.menu_about:
+ Intent aboutIntent = new Intent(MapActivity.this, AboutActivity.class);
+ startActivityForResult(aboutIntent, 0);
+ return true;
+ default:
+ Log.e(TAG, "No known menu option selected");
+ return super.onOptionsItemSelected(item);
}
+ }
- if (nonUniLinkBusStopOverlay != null) {
+ private void refreshFavouriteDialog() {
+ ArrayList<POI> newFavouriteItems = new ArrayList<POI>();
+ try {
+ Dao<Building, String> buildingDao = getHelper().getBuildingDao();
+ Dao<BusStop, String> busStopDao = getHelper().getBusStopDao();
+
+ newFavouriteItems.addAll(buildingDao.queryForEq(POI.FAVOURITE_FIELD_NAME, true));
+ newFavouriteItems.addAll(busStopDao.queryForEq(POI.FAVOURITE_FIELD_NAME, true));
+ } catch (SQLException e) {
+ e.printStackTrace();
}
- mapView.postInvalidate();
-
- Log.i(TAG, "Finished showing non Uni-Link bus stop overlays at "
- + (System.currentTimeMillis() - startTime));
- }
- }).start();
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.map_menu, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- // Handle item selection
- switch (item.getItemId()) {
- case R.id.menu_find:
- Intent i = new Intent(MapActivity.this, FindActivity.class);
- startActivityForResult(i, 0);
- return true;
- case R.id.menu_preferences:
- Intent settingsActivity = new Intent(getBaseContext(), PreferencesActivity.class);
- startActivity(settingsActivity);
- return true;
- case R.id.menu_find_my_location:
- final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- if (sharedPrefs.getBoolean("GPSEnabled", false)) {
- GeoPoint userLocation = myLocationOverlay.getMyLocation();
- if (userLocation != null) {
- Log.i(TAG, "Found user location, scrolling to " + userLocation);
- mapController.animateTo(userLocation);
- myLocationOverlay.enableFollowLocation();
+ Log.i(TAG, "There are " + newFavouriteItems.size() + " favourites");
+ if (newFavouriteItems.size() == 0) {
+ Log.i(TAG, "Favourite dialog has no favourites, displaying message");
+ favDialog.setMessage(getResources().getString(R.string.favourites_dialog_message));
+ favDialog.setItems(null);
+ } else {
+ favDialog.setMessage("");
+ favDialog.setItems(newFavouriteItems);
}
- } else {
- DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- switch (which) {
- case DialogInterface.BUTTON_POSITIVE:
- Editor editor = sharedPrefs.edit();
- editor.putBoolean("GPSEnabled", true);
- editor.commit();
- break;
-
- case DialogInterface.BUTTON_NEGATIVE:
- // No button clicked
- break;
- }
- }
- };
-
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setMessage("GPS is not enabled, do you wish to enable it?")
- .setPositiveButton("Yes", dialogClickListener).setNegativeButton("No", dialogClickListener)
- .show();
- }
-
- return true;
- case R.id.menu_view:
- Log.i(TAG, "Showing view dialog");
- showDialog(VIEW_DIALOG_ID);
- return false;
- case R.id.menu_favourites:
- Log.i(TAG, "Showing favourite dialog");
-
- showDialog(FAVOURITE_DIALOG_ID);
- if (favDialog == null) {
- Log.e(TAG, "Very wierd, just tried to launch the favourite's dialog, but its null?");
- return false;
- }
-
- refreshFavouriteDialog();
-
- return false;
- case R.id.menu_about:
- Intent aboutIntent = new Intent(MapActivity.this, AboutActivity.class);
- startActivityForResult(aboutIntent, 0);
- return true;
- default:
- Log.e(TAG, "No known menu option selected");
- return super.onOptionsItemSelected(item);
}
- }
-
- private void refreshFavouriteDialog() {
- ArrayList<POI> newFavouriteItems = new ArrayList<POI>();
- try {
- Dao<Building, String> buildingDao = getHelper().getBuildingDao();
- Dao<BusStop, String> busStopDao = getHelper().getBusStopDao();
-
- newFavouriteItems.addAll(buildingDao.queryForEq(POI.FAVOURITE_FIELD_NAME, true));
- newFavouriteItems.addAll(busStopDao.queryForEq(POI.FAVOURITE_FIELD_NAME, true));
- } catch (SQLException e) {
- e.printStackTrace();
+ @Override
+ public boolean onSearchRequested() {
+ Intent i = new Intent(MapActivity.this, FindActivity.class);
+ startActivityForResult(i, 0);
+ return false;
}
- Log.i(TAG, "There are " + newFavouriteItems.size() + " favourites");
- if (newFavouriteItems.size() == 0) {
- Log.i(TAG, "Favourite dialog has no favourites, displaying message");
- favDialog.setMessage(getResources().getString(R.string.favourites_dialog_message));
- favDialog.setItems(null);
- } else {
- favDialog.setMessage("");
- favDialog.setItems(newFavouriteItems);
- }
- }
-
- @Override
- public boolean onSearchRequested() {
- Intent i = new Intent(MapActivity.this, FindActivity.class);
- startActivityForResult(i, 0);
- return false;
- }
-
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- Log.i(TAG, "Got activity result");
- if (resultCode == RESULT_OK) {
-
- POI poi = null;
- Bundle bundle = data.getExtras();
- if (bundle == null) {
- Log.i(TAG, "Bundle is null");
- } else {
- String poiId = (String) bundle.get("poi");
- if (poiId != null) {
- Log.i(TAG, "Got id " + poiId);
- try {
- poi = getHelper().getBuildingDao().queryForId(poiId);
- if (poi == null) {
- poi = getHelper().getBusStopDao().queryForId(poiId);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
-
- if (poi == null) {
- Log.e(TAG, "Could not find poi " + poiId + " in onActivityResult");
- } else {
- if (myLocationOverlay != null) {
- // It could be null if it has not been enabled
- myLocationOverlay.disableFollowLocation();
- }
- mapController.setZoom(20);
- mapController.setCenter(poi.point);
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ Log.i(TAG, "Got activity result");
+ if (resultCode == RESULT_OK) {
- }
- } else {
- Log.i(TAG, "Got null poi id");
+ POI poi = null;
+ Bundle bundle = data.getExtras();
+ if (bundle == null) {
+ Log.i(TAG, "Bundle is null");
+ } else {
+ String poiId = (String) bundle.get("poi");
+ if (poiId != null) {
+ Log.i(TAG, "Got id " + poiId);
+ try {
+ poi = getHelper().getBuildingDao().queryForId(poiId);
+ if (poi == null) {
+ poi = getHelper().getBusStopDao().queryForId(poiId);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ if (poi == null) {
+ Log.e(TAG, "Could not find poi " + poiId + " in onActivityResult");
+ } else {
+ if (myLocationOverlay != null) {
+ // It could be null if it has not been enabled
+ myLocationOverlay.disableFollowLocation();
+ }
+ mapController.setZoom(20);
+ mapController.setCenter(poi.point);
+
+ }
+ } else {
+ Log.i(TAG, "Got null poi id");
- // mapController.setZoom(15);
- // mapController.setCenter(new GeoPoint(50935551, -1393488));
- }
+ // mapController.setZoom(15);
+ // mapController.setCenter(new GeoPoint(50935551,
+ // -1393488));
+ }
- // This handles the possible change in favourite state caused by the user within the BusTimeActivity
- try {
- String busStopID = bundle.getString("busStopChanged");
- if (busStopID != null && busStopID.length() != 0) {
- Log.v(TAG, "Got a busStop id back from the BusTimeActivity " + busStopID);
- BusStop busStop = getHelper().getBusStopDao().queryForId(busStopID);
-
- if (busStop.uniLink) {
- uniLinkBusStopOverlay.refresh(busStop); // This does not invalidate the map, but it seems to
- // make the changes appear
- } else {
- nonUniLinkBusStopOverlay.refresh(busStop); // This does not invalidate the map, but it seems
- // to
- // make the changes appear
+ // This handles the possible change in favourite state caused by
+ // the user within the BusTimeActivity
+ try {
+ String busStopID = bundle.getString("busStopChanged");
+ if (busStopID != null && busStopID.length() != 0) {
+ Log.v(TAG, "Got a busStop id back from the BusTimeActivity " + busStopID);
+ BusStop busStop = getHelper().getBusStopDao().queryForId(busStopID);
+
+ if (busStop.uniLink) {
+ uniLinkBusStopOverlay.refresh(busStop); // This does
+ // not
+ // invalidate
+ // the map,
+ // but it
+ // seems to
+ // make the changes appear
+ } else {
+ nonUniLinkBusStopOverlay.refresh(busStop); // This
+ // does
+ // not
+ // invalidate
+ // the
+ // map,
+ // but
+ // it
+ // seems
+ // to
+ // make the changes appear
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+
+ if (favDialog != null) {
+ refreshFavouriteDialog();
+ }
}
- }
- } catch (SQLException e) {
- e.printStackTrace();
}
- if (favDialog != null) {
- refreshFavouriteDialog();
- }
- }
}
- }
-
- /*
- * public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
- *
- * mapView.post(new Runnable() { public void run() { // updateEnabledOverlays(); TODO Fix whatever this did?
- * mapView.invalidate(); } });
- *
- * return true; }
- */
-
- protected Dialog onCreateDialog(int id) {
- switch (id) {
- case VIEW_DIALOG_ID:
- ViewDialog viewDialog = new ViewDialog(instance);
- return viewDialog;
- case FAVOURITE_DIALOG_ID:
- favDialog = new POIDialog(instance);
- favDialog.setOnItemClickListener(this);
- favDialog.setOnItemLongClickListener(this);
- favDialog.setTitle(R.string.favourites_dialog_title);
- return favDialog;
+ /*
+ * public boolean onChildClick(ExpandableListView parent, View v, int
+ * groupPosition, int childPosition, long id) {
+ *
+ * mapView.post(new Runnable() { public void run() { //
+ * updateEnabledOverlays(); TODO Fix whatever this did?
+ * mapView.invalidate(); } });
+ *
+ * return true; }
+ */
+
+ protected Dialog onCreateDialog(int id) {
+ switch (id) {
+ case VIEW_DIALOG_ID:
+ ViewDialog viewDialog = new ViewDialog(instance);
+ return viewDialog;
+ case FAVOURITE_DIALOG_ID:
+ favDialog = new POIDialog(instance);
+ favDialog.setOnItemClickListener(this);
+ favDialog.setOnItemLongClickListener(this);
+ favDialog.setTitle(R.string.favourites_dialog_title);
+ return favDialog;
+ }
+ return null;
}
- return null;
- }
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- Log.i(TAG, "OnItemClick pos " + position + " id " + id);
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ Log.i(TAG, "OnItemClick pos " + position + " id " + id);
- String poiId = favDialog.adapter.getItemStringId(position);
+ String poiId = favDialog.adapter.getItemStringId(position);
- Log.i(TAG, "POI " + poiId + " selected");
+ Log.i(TAG, "POI " + poiId + " selected");
- POI poi = null;
+ POI poi = null;
- if (poiId != null) {
- Log.i(TAG, "Got id " + poiId);
- try {
- poi = getHelper().getBuildingDao().queryForId(poiId);
- if (poi == null) {
- poi = getHelper().getBusStopDao().queryForId(poiId);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ if (poiId != null) {
+ Log.i(TAG, "Got id " + poiId);
+ try {
+ poi = getHelper().getBuildingDao().queryForId(poiId);
+ if (poi == null) {
+ poi = getHelper().getBusStopDao().queryForId(poiId);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
- if (poi == null) {
- Log.e(TAG, "Could not find poi " + poiId + " in onActivityResult");
- } else {
- if (myLocationOverlay != null) {
- myLocationOverlay.disableFollowLocation();
- }
- mapController.setZoom(20);
- mapController.setCenter(poi.point);
+ if (poi == null) {
+ Log.e(TAG, "Could not find poi " + poiId + " in onActivityResult");
+ } else {
+ if (myLocationOverlay != null) {
+ myLocationOverlay.disableFollowLocation();
+ }
+ mapController.setZoom(20);
+ mapController.setCenter(poi.point);
- favDialog.dismiss();
+ favDialog.dismiss();
+
+ }
+ } else {
+ Log.i(TAG, "Got null poi id");
- }
- } else {
- Log.i(TAG, "Got null poi id");
+ // mapController.setZoom(15);
+ // mapController.setCenter(new GeoPoint(50935551, -1393488));
+ }
- // mapController.setZoom(15);
- // mapController.setCenter(new GeoPoint(50935551, -1393488));
}
- }
+ /**
+ * Long click on a item in the favourites menu
+ */
+ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+
+ Log.i(TAG, "OnItemClick pos " + position + " id " + id);
- /**
- * Long click on a item in the favourites menu
- */
- public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+ String poiId = favDialog.adapter.getItemStringId(position);
- Log.i(TAG, "OnItemClick pos " + position + " id " + id);
+ Log.i(TAG, "POI " + poiId + " selected");
- String poiId = favDialog.adapter.getItemStringId(position);
+ POI poi = null;
- Log.i(TAG, "POI " + poiId + " selected");
+ if (poiId != null) {
+ Log.i(TAG, "Got id " + poiId);
+ try {
+ poi = getHelper().getBuildingDao().queryForId(poiId);
+ if (poi == null) {
+ poi = getHelper().getBusStopDao().queryForId(poiId);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
- POI poi = null;
+ if (poi == null) {
+ Log.e(TAG, "Could not find poi " + poiId + " in onActivityResult");
+ } else {
+ if (poi.type == POI.BUS_STOP) {
+ BusStop busStop = (BusStop) poi;
- if (poiId != null) {
- Log.i(TAG, "Got id " + poiId);
- try {
- poi = getHelper().getBuildingDao().queryForId(poiId);
- if (poi == null) {
- poi = getHelper().getBusStopDao().queryForId(poiId);
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ Log.i(TAG, "Pressed " + busStop.id);
- if (poi == null) {
- Log.e(TAG, "Could not find poi " + poiId + " in onActivityResult");
- } else {
- if (poi.type == POI.BUS_STOP) {
- BusStop busStop = (BusStop) poi;
+ Intent i = new Intent(this, BusStopActivity.class);
+ i.putExtra("busStopID", busStop.id);
+ i.putExtra("busStopName", busStop.description);
+ startActivityForResult(i, 0);
- Log.i(TAG, "Pressed " + busStop.id);
+ return true;
- Intent i = new Intent(this, BusStopActivity.class);
- i.putExtra("busStopID", busStop.id);
- i.putExtra("busStopName", busStop.description);
- startActivityForResult(i, 0);
+ } else {
- return true;
+ myLocationOverlay.disableFollowLocation();
+ mapController.setZoom(20);
+ mapController.setCenter(poi.point);
+ favDialog.dismiss();
+ favDialog = null;
+ }
+ }
} else {
+ Log.i(TAG, "Got null poi id");
- myLocationOverlay.disableFollowLocation();
- mapController.setZoom(20);
- mapController.setCenter(poi.point);
-
- favDialog.dismiss();
- favDialog = null;
+ // mapController.setZoom(15);
+ // mapController.setCenter(new GeoPoint(50935551, -1393488));
}
- }
- } else {
- Log.i(TAG, "Got null poi id");
- // mapController.setZoom(15);
- // mapController.setCenter(new GeoPoint(50935551, -1393488));
+ return true;
}
- return true;
- }
+ private class OverlayRankComparator implements Comparator<Overlay> {
+ // private final SharedPreferences prefs;
- private class OverlayRankComparator implements Comparator<Overlay> {
- // private final SharedPreferences prefs;
+ OverlayRankComparator(SharedPreferences prefs) {
+ // this.prefs = prefs;
+ }
- OverlayRankComparator(SharedPreferences prefs) {
- // this.prefs = prefs;
- }
+ public int compare(Overlay arg0, Overlay arg1) {
+ return getRank(arg1) - getRank(arg0);
+ }
- public int compare(Overlay arg0, Overlay arg1) {
- return getRank(arg1) - getRank(arg0);
+ private final int getRank(Overlay overlay) { // TODO: Dont hardcode the
+ // rank values
+ if (overlay == scaleBarOverlay) {
+ return SCALE_BAR_OVERLAY_RANK;
+ } else if (overlay == myLocationOverlay) {
+ return MY_LOCATION_OVERLAY_RANK;
+ } else if (overlay == uniLinkBusStopOverlay) {
+ return UNI_LINK_BUS_STOP_OVERLAY_RANK;
+ } else if (overlay == nonUniLinkBusStopOverlay) {
+ return NON_UNI_LINK_BUS_STOP_OVERLAY_RANK;
+ } else if (overlay.equals(residentialBuildingOverlay)) {
+ return RESIDENTIAL_BUILDING_OVERLAY_RANK;
+ } else if (overlay.equals(nonResidentialBuildingOverlay)) {
+ return NON_RESIDENTIAL_BUILDING_OVERLAY_RANK;
+ } else if (siteOverlays != null && siteOverlays.values().contains(overlay)) {
+ return SITE_OVERLAYS_RANK;
+ } else if (busRouteOverlays != null && busRouteOverlays.values().contains(overlay)) {
+ return BUS_ROUTE_OVERLAYS_RANK;
+ } else {
+ Log.e(TAG, "Trying to rank unknown overlay " + overlay);
+ return -1;
+ }
+ }
}
- private final int getRank(Overlay overlay) { // TODO: Dont hardcode the rank values
- if (overlay == scaleBarOverlay) {
- return SCALE_BAR_OVERLAY_RANK;
- } else if (overlay == myLocationOverlay) {
- return MY_LOCATION_OVERLAY_RANK;
- } else if (overlay == uniLinkBusStopOverlay) {
- return UNI_LINK_BUS_STOP_OVERLAY_RANK;
- } else if (overlay == nonUniLinkBusStopOverlay) {
- return NON_UNI_LINK_BUS_STOP_OVERLAY_RANK;
- } else if (overlay.equals(residentialBuildingOverlay)) {
- return RESIDENTIAL_BUILDING_OVERLAY_RANK;
- } else if (overlay.equals(nonResidentialBuildingOverlay)) {
- return NON_RESIDENTIAL_BUILDING_OVERLAY_RANK;
- } else if (siteOverlays != null && siteOverlays.values().contains(overlay)) {
- return SITE_OVERLAYS_RANK;
- } else if (busRouteOverlays != null && busRouteOverlays.values().contains(overlay)) {
- return BUS_ROUTE_OVERLAYS_RANK;
- } else {
- Log.e(TAG, "Trying to rank unknown overlay " + overlay);
- return -1;
- }
- }
- }
-
- /**
- * Handles all changes in preferences
- */
- public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
- Log.v(TAG, "Got shared prefs changed event for key " + key);
-
- // Shared Preferences
- if (key.equals(GPS_ENABLED)) {
- final SharedPreferences activityPrefs = getPreferences(0);
-
- if (activityPrefs.getBoolean("Other:Compass", false) && prefs.getBoolean("GPSEnabled", false)) {
- myLocationOverlay.enableMyLocation();
- } else {
- myLocationOverlay.disableMyLocation();
- }
- } else if (key.equals(NON_UNI_LINK_BUS_TIMES)) {
- // Noting to do here atm
- } else if (key.equals(UNI_LINK_BUS_TIMES)) {
- // Noting to do here atm
- } else if (key.startsWith(BUS_STOP_OVERLAYS)) {
- showUniLinkBusStopOverlay();
- } else if (key.equals(NON_UNI_LINK_BUS_STOPS_OVERLAY)) {
- showNonUniLinkBusStopOverlay();
- } else if (key.startsWith(BUS_ROUTE_OVERLAYS)) {
- try {
- String routeName = key.substring(BUS_ROUTE_OVERLAYS.length(), key.length());
- for (BusRoute route : getHelper().getBusRouteDao()) {
- Log.v(TAG, route.code + " " + routeName);
- if (route.code.equals(routeName)) {
- showRouteOverlay(route);
- }
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
- } else if (key.startsWith(BUILDING_OVERLAYS)) {
- showBuildingOverlays();
- } else if (key.startsWith(SITE_OVERLAYS)) {
- String siteName = key.substring(SITE_OVERLAYS.length(), key.length());
- try {
- for (Site site : getHelper().getSiteDao()) {
- if (site.name.equals(siteName)) {
- showSiteOverlay(site);
- }
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }
- } else if (key.startsWith(OTHER_OVERLAYS)) {
- if (key.substring(OTHER_OVERLAYS.length(), key.length()).equals(SCALE_BAR_OVERLAY)) {
- showUtilityOverlays();
- } else if (key.substring(OTHER_OVERLAYS.length(), key.length()).equals(MY_LOCATION_OVERLAY_COMPASS)) {
- if (prefs.getBoolean(key, MY_LOCATION_OVERLAY_COMPASS_ENABLED_BY_DEFAULT)) {
- myLocationOverlay.enableCompass();
- } else {
- myLocationOverlay.disableCompass();
- }
- } else if (key.substring(OTHER_OVERLAYS.length(), key.length()).equals(MY_LOCATION_OVERLAY)) {
- final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+ /**
+ * Handles all changes in preferences
+ */
+ public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+ Log.v(TAG, "Got shared prefs changed event for key " + key);
+
+ // Shared Preferences
+ if (key.equals(GPS_ENABLED)) {
+ final SharedPreferences activityPrefs = getPreferences(0);
+
+ if (activityPrefs.getBoolean("Other:Compass", false) && prefs.getBoolean("GPSEnabled", false)) {
+ myLocationOverlay.enableMyLocation();
+ } else {
+ myLocationOverlay.disableMyLocation();
+ }
+ } else if (key.equals(NON_UNI_LINK_BUS_TIMES)) {
+ // Noting to do here atm
+ } else if (key.equals(UNI_LINK_BUS_TIMES)) {
+ // Noting to do here atm
+ } else if (key.startsWith(BUS_STOP_OVERLAYS)) {
+ showUniLinkBusStopOverlay();
+ } else if (key.equals(NON_UNI_LINK_BUS_STOPS_OVERLAY)) {
+ showNonUniLinkBusStopOverlay();
+ } else if (key.startsWith(BUS_ROUTE_OVERLAYS)) {
+ try {
+ String routeName = key.substring(BUS_ROUTE_OVERLAYS.length(), key.length());
+ for (BusRoute route : getHelper().getBusRouteDao()) {
+ Log.v(TAG, route.code + " " + routeName);
+ if (route.code.equals(routeName)) {
+ showRouteOverlay(route);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ } else if (key.startsWith(BUILDING_OVERLAYS)) {
+ showBuildingOverlays();
+ } else if (key.startsWith(SITE_OVERLAYS)) {
+ String siteName = key.substring(SITE_OVERLAYS.length(), key.length());
+ try {
+ for (Site site : getHelper().getSiteDao()) {
+ if (site.name.equals(siteName)) {
+ showSiteOverlay(site);
+ }
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ } else if (key.startsWith(OTHER_OVERLAYS)) {
+ if (key.substring(OTHER_OVERLAYS.length(), key.length()).equals(SCALE_BAR_OVERLAY)) {
+ showUtilityOverlays();
+ } else if (key.substring(OTHER_OVERLAYS.length(), key.length()).equals(MY_LOCATION_OVERLAY_COMPASS)) {
+ if (prefs.getBoolean(key, MY_LOCATION_OVERLAY_COMPASS_ENABLED_BY_DEFAULT)) {
+ myLocationOverlay.enableCompass();
+ } else {
+ myLocationOverlay.disableCompass();
+ }
+ } else if (key.substring(OTHER_OVERLAYS.length(), key.length()).equals(MY_LOCATION_OVERLAY)) {
+ final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- if (prefs.getBoolean(key, MY_LOCATION_OVERLAY_ENABLED_BY_DEFAULT)
- && sharedPrefs.getBoolean(GPS_ENABLED, GPS_ENABLED_BY_DEFAULT)) {
- myLocationOverlay.enableMyLocation();
+ if (prefs.getBoolean(key, MY_LOCATION_OVERLAY_ENABLED_BY_DEFAULT)
+ && sharedPrefs.getBoolean(GPS_ENABLED, GPS_ENABLED_BY_DEFAULT)) {
+ myLocationOverlay.enableMyLocation();
+ } else {
+ myLocationOverlay.disableMyLocation();
+ }
+ } else {
+ Log.e(TAG, "Unhandled preference key " + key);
+ }
} else {
- myLocationOverlay.disableMyLocation();
+ Log.e(TAG, "Unhandled preference key " + key);
}
- } else {
- Log.e(TAG, "Unhandled preference key " + key);
- }
- } else {
- Log.e(TAG, "Unhandled preference key " + key);
}
- }
}