aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-02-24 22:35:05 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-02-24 22:35:05 +0000
commitb88f5cabd4cf4876c3e5ba32acb2a7e59dd03edc (patch)
tree6d990e6a31147a89464e0b35b248748f8de14976
parent6e971428e780adc781c3d8146168590dabec7ada (diff)
downloadsouthamptonuniversitymap-b88f5cabd4cf4876c3e5ba32acb2a7e59dd03edc.tar
southamptonuniversitymap-b88f5cabd4cf4876c3e5ba32acb2a7e59dd03edc.tar.gz
Fix for bug with bus stops.dev-rdf
-rw-r--r--assets/data.dbbin492544 -> 492544 bytes
-rw-r--r--src/net/cbaines/suma/DataManager.java8
-rw-r--r--src/net/cbaines/suma/MapActivity.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/assets/data.db b/assets/data.db
index a128ffd..c8bcc9e 100644
--- a/assets/data.db
+++ b/assets/data.db
Binary files differ
diff --git a/src/net/cbaines/suma/DataManager.java b/src/net/cbaines/suma/DataManager.java
index 56dac5c..b4a0e3d 100644
--- a/src/net/cbaines/suma/DataManager.java
+++ b/src/net/cbaines/suma/DataManager.java
@@ -60,9 +60,7 @@ 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;
@@ -421,8 +419,10 @@ public class DataManager {
} else if (busRoute.id == 354) { // U9
busStop.routes = (byte) (busStop.routes | (1 << 4));
busStop.uniLink = true;
- } else {
- busStop.routes = 0;
+ }
+
+ if ((busStop.routes != 0) != busStop.uniLink || busStop.id.equals("SN120553")) {
+ Log.e(TAG, busStop.id + " " + busStop.routes + " " + busStop.uniLink);
}
// Log.v(TAG, "Stop routes " + busStop.routes);
diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java
index ff61c4e..334f4d2 100644
--- a/src/net/cbaines/suma/MapActivity.java
+++ b/src/net/cbaines/suma/MapActivity.java
@@ -78,7 +78,7 @@ public class MapActivity extends OrmLiteBaseActivity<DatabaseHelper> implements
* 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 boolean useBundledDatabase = false;
private MapView mapView;
private MapController mapController;