xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TileCache: use dbName to acutally create multiple databases..

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-25 23:19:27 +01:00
parent 1bda9aff3f
commit a82da20981
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
vtm-android/src/org/oscim/android/cache/TileCache.java vendored
View File

@ -40,7 +40,7 @@ import android.os.ParcelFileDescriptor;
public class TileCache implements ITileCache { public class TileCache implements ITileCache {
final static org.slf4j.Logger log = LoggerFactory.getLogger(TileCache.class); final static org.slf4j.Logger log = LoggerFactory.getLogger(TileCache.class);
final static boolean debug = false; final static boolean dbg = false;
class CacheTileReader implements TileReader { class CacheTileReader implements TileReader {
final InputStream mInputStream; final InputStream mInputStream;
@ -95,13 +95,12 @@ public class TileCache implements ITileCache {
} }
private final ArrayList<ByteArrayOutputStream> mCacheBuffers; private final ArrayList<ByteArrayOutputStream> mCacheBuffers;
private final SQLiteHelper dbHelper; private final SQLiteHelper dbHelper;
private final SQLiteDatabase mDatabase; private final SQLiteDatabase mDatabase;
private final SQLiteStatement mStmtGetTile; private final SQLiteStatement mStmtGetTile;
private final SQLiteStatement mStmtPutTile; private final SQLiteStatement mStmtPutTile;
private final SQLiteStatement mStmtUpdateTile;
//private final SQLiteStatement mStmtUpdateTile;
public void dispose() { public void dispose() {
if (mDatabase.isOpen()) if (mDatabase.isOpen())
@ -110,8 +109,10 @@ public class TileCache implements ITileCache {
@TargetApi(Build.VERSION_CODES.JELLY_BEAN) @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public TileCache(Context context, String cacheDirectory, String dbName) { public TileCache(Context context, String cacheDirectory, String dbName) {
if (dbg)
log.debug("open cache {}, {}", cacheDirectory, dbName);
dbHelper = new SQLiteHelper(context); dbHelper = new SQLiteHelper(context, dbName);
if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
dbHelper.setWriteAheadLoggingEnabled(true); dbHelper.setWriteAheadLoggingEnabled(true);
@ -128,10 +129,10 @@ public class TileCache implements ITileCache {
" (x, y, z, time, last_access, data)" + " (x, y, z, time, last_access, data)" +
" VALUES(?,?,?,?,?,?)"); " VALUES(?,?,?,?,?,?)");
mStmtUpdateTile = mDatabase.compileStatement("" + //mStmtUpdateTile = mDatabase.compileStatement("" +
"UPDATE " + TABLE_NAME + // "UPDATE " + TABLE_NAME +
" SET last_access=?" + // " SET last_access=?" +
" WHERE x=? AND y=? AND z=?"); // " WHERE x=? AND y=? AND z=?");
mCacheBuffers = new ArrayList<ByteArrayOutputStream>(); mCacheBuffers = new ArrayList<ByteArrayOutputStream>();
} }
@ -158,10 +159,10 @@ public class TileCache implements ITileCache {
class SQLiteHelper extends SQLiteOpenHelper { class SQLiteHelper extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "tile.db"; //private static final String DATABASE_NAME = "tile.db";
private static final int DATABASE_VERSION = 8; private static final int DATABASE_VERSION = 1;
private static final String DATABASE_CREATE = private static final String TILE_SCHEMA =
"CREATE TABLE " "CREATE TABLE "
+ TABLE_NAME + "(" + TABLE_NAME + "("
+ "x INTEGER NOT NULL," + "x INTEGER NOT NULL,"
@ -173,20 +174,26 @@ public class TileCache implements ITileCache {
+ COLUMN_DATA + " BLOB," + COLUMN_DATA + " BLOB,"
+ "PRIMARY KEY(x,y,z));"; + "PRIMARY KEY(x,y,z));";
public SQLiteHelper(Context context) { public SQLiteHelper(Context context, String dbName) {
super(context, DATABASE_NAME, null, DATABASE_VERSION); super(context, dbName, null, DATABASE_VERSION);
} }
@Override @Override
public void onCreate(SQLiteDatabase db) { public void onCreate(SQLiteDatabase db) {
db.execSQL(DATABASE_CREATE); log.debug("create table");
db.execSQL(TILE_SCHEMA);
} }
@Override @Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
log.debug("drop table");
db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME); db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
onCreate(db); onCreate(db);
} }
@Override
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
onUpgrade(db, oldVersion, newVersion);
}
} }
public void saveTile(Tile tile, ByteArrayOutputStream data, boolean success) { public void saveTile(Tile tile, ByteArrayOutputStream data, boolean success) {
@ -200,7 +207,7 @@ public class TileCache implements ITileCache {
mCacheBuffers.add(data); mCacheBuffers.add(data);
} }
if (debug) if (dbg)
log.debug("store tile {} {}", tile, Boolean.valueOf(success)); log.debug("store tile {} {}", tile, Boolean.valueOf(success));
if (!success) if (!success)
@ -237,7 +244,7 @@ public class TileCache implements ITileCache {
mStmtGetTile.clearBindings(); mStmtGetTile.clearBindings();
} }
if (debug) if (dbg)
log.debug("load tile {}", tile); log.debug("load tile {}", tile);
return new CacheTileReader(tile, in, Integer.MAX_VALUE); return new CacheTileReader(tile, in, Integer.MAX_VALUE);
@ -260,7 +267,7 @@ public class TileCache implements ITileCache {
" WHERE z=? AND x=? AND y=?", mQueryVals); " WHERE z=? AND x=? AND y=?", mQueryVals);
if (!cursor.moveToFirst()) { if (!cursor.moveToFirst()) {
if (debug) if (dbg)
log.debug("not in cache {}", tile); log.debug("not in cache {}", tile);
return null; return null;
} }
@ -270,7 +277,7 @@ public class TileCache implements ITileCache {
if (!cursor.isClosed()) if (!cursor.isClosed())
cursor.close(); cursor.close();
if (debug) if (dbg)
log.debug("load tile {}", tile); log.debug("load tile {}", tile);
return new CacheTileReader(tile, in, Integer.MAX_VALUE); return new CacheTileReader(tile, in, Integer.MAX_VALUE);

3
vtm/src/org/oscim/tiling/source/TileSource.java
View File

@ -30,6 +30,9 @@ public abstract class TileSource {
public ITileCache tileCache; public ITileCache tileCache;
/**
* Cache MUST be set before TileSource is added to a TileLayer!
*/
public void setCache(ITileCache cache) { public void setCache(ITileCache cache) {
tileCache = cache; tileCache = cache;
} }