Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update sqltie read logic

Browse source
This commit is contained in:
Victor Shcherb 2013-08-11 20:28:37 +02:00
parent 058d353bea
commit e1111a5de5
4 changed files with 68 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values/no_translate.xml
View file

@ -8,5 +8,6 @@
<string name="ga_debug">true</string> <string name="ga_debug">true</string>
<string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string> <string name="versionFeatures">+play_market +gps_status -parking_plugin -blackberry -free_version -amazon</string>
<string name="next_tips_and_tricks_not_translate"></string> <string name="next_tips_and_tricks_not_translate"></string>
<string name="about_content">Here should be text about License, about third party GPL libraries, All rights belong to OsmAnd app.... </string> <string name="about_content"> Data is powered by @c OpenStreetMaps CC-BY-SA\n
Here should be text about License, about third party GPL libraries, All rights belong to OsmAnd app.... </string>
</resources> </resources>

72
OsmAnd/src/net/osmand/plus/SQLiteTileSource.java
View file

@ -5,6 +5,7 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.Arrays;
import java.util.List; import java.util.List;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
@ -42,6 +43,7 @@ public class SQLiteTileSource implements ITileSource {
private int minZoom = 1; private int minZoom = 1;
private int maxZoom = 17; private int maxZoom = 17;
private int baseZoom = 17; //Default base zoom private int baseZoom = 17; //Default base zoom
private boolean inversiveZoom = true; // BigPlanet
static final int margin = 1; static final int margin = 1;
static final int tileSize = 256; static final int tileSize = 256;
@ -147,25 +149,42 @@ public class SQLiteTileSource implements ITileSource {
if((db == null || db.isClosed()) && file.exists() ){ if((db == null || db.isClosed()) && file.exists() ){
db = ctx.getSQLiteAPI().openByAbsolutePath(file.getAbsolutePath(), false); db = ctx.getSQLiteAPI().openByAbsolutePath(file.getAbsolutePath(), false);
try { try {
String template = db.compileStatement("SELECT url FROM info").simpleQueryForString(); //$NON-NLS-1$ SQLiteCursor cursor = db.rawQuery("SELECT * FROM info", null);
if(cursor.moveToFirst()) {
String[] columnNames = cursor.getColumnNames();
List<String> list = Arrays.asList(columnNames);
int url = list.indexOf("url");
if(url != -1) {
String template = cursor.getString(url);
if(!Algorithms.isEmpty(template)){ if(!Algorithms.isEmpty(template)){
urlTemplate = template; urlTemplate = template;
} }
} catch (RuntimeException e) {
} }
try { int tnumbering = list.indexOf("tilenumbering");
long z; boolean inversiveInfoZoom = tnumbering != -1 && "BigPlanet".equals(list.get(tnumbering));
z = db.compileStatement("SELECT minzoom FROM info").simpleQueryForLong(); //$NON-NLS-1$ if(tnumbering != -1) {
if (z < 17 ) inversiveZoom = "BigPlanet".equals(list.get(tnumbering));
baseZoom = 17 - (int)z; // sqlite base zoom, =11 for SRTM hillshade }
int mnz = list.indexOf("minzoom");
if(mnz != -1) {
minZoom = (int) cursor.getInt(mnz);
}
int mxz = list.indexOf("maxzoom");
if(mxz != -1) {
baseZoom = (int) cursor.getInt(mxz);
}
if(inversiveInfoZoom) {
mnz = minZoom;
minZoom = 17 - baseZoom;
baseZoom = 17 - mnz;
}
}
maxZoom = 24; // Cheat to have tiles request even if zoom level not in sqlite maxZoom = 24; // Cheat to have tiles request even if zoom level not in sqlite
// decrease maxZoom if too much scaling would be required // decrease maxZoom if too much scaling would be required
while ((tileSize >> (maxZoom - baseZoom)) < minScaledSize) while ((tileSize >> (maxZoom - baseZoom)) < minScaledSize)
maxZoom--; maxZoom--;
z = db.compileStatement("SELECT maxzoom FROM info").simpleQueryForLong(); //$NON-NLS-1$
if (z < 17)
minZoom = 17 - (int)z;
} catch (RuntimeException e) { } catch (RuntimeException e) {
e.printStackTrace();
} }
} }
return db; return db;
@ -178,7 +197,8 @@ public class SQLiteTileSource implements ITileSource {
} }
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if (exact || zoom <= baseZoom) { if (exact || zoom <= baseZoom) {
SQLiteCursor cursor = db.rawQuery("SELECT 1 FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"",(17 - zoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ int z = getFileZoom(zoom);
SQLiteCursor cursor = db.rawQuery("SELECT 1 FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"",z+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
try { try {
boolean e = cursor.moveToFirst(); boolean e = cursor.moveToFirst();
cursor.close(); cursor.close();
@ -193,7 +213,8 @@ public class SQLiteTileSource implements ITileSource {
int n = zoom - baseZoom; int n = zoom - baseZoom;
int base_xtile = x >> n; int base_xtile = x >> n;
int base_ytile = y >> n; int base_ytile = y >> n;
SQLiteCursor cursor = db.rawQuery("SELECT 1 FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {base_xtile+"", base_ytile+"",(17 - baseZoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ int z = getFileZoom(baseZoom);
SQLiteCursor cursor = db.rawQuery("SELECT 1 FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {base_xtile+"", base_ytile+"",z+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
try { try {
boolean e = cursor.moveToFirst(); boolean e = cursor.moveToFirst();
cursor.close(); cursor.close();
@ -238,7 +259,7 @@ public class SQLiteTileSource implements ITileSource {
int dstx, dsty; int dstx, dsty;
SQLiteCursor cursor = db.rawQuery( SQLiteCursor cursor = db.rawQuery(
"SELECT image FROM tiles WHERE x = ? AND y = ? AND z = ?", "SELECT image FROM tiles WHERE x = ? AND y = ? AND z = ?",
new String[] {(x + dx) + "", (y + dy) + "", (17 - zoom) + ""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ new String[] {(x + dx) + "", (y + dy) + "", getFileZoom(zoom) + ""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
byte[] blob = null; byte[] blob = null;
if(cursor.moveToFirst()) { if(cursor.moveToFirst()) {
blob = cursor.getBlob(0); blob = cursor.getBlob(0);
@ -272,7 +293,8 @@ public class SQLiteTileSource implements ITileSource {
} }
if (zoom <= baseZoom) { if (zoom <= baseZoom) {
// return the normal tile if exists // return the normal tile if exists
SQLiteCursor cursor = db.rawQuery("SELECT image FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"",(17 - zoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ SQLiteCursor cursor = db.rawQuery("SELECT image FROM tiles WHERE x = ? AND y = ? AND z = ?",
new String[] {x+"", y+"", getFileZoom(zoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
byte[] blob = null; byte[] blob = null;
if(cursor.moveToFirst()) { if(cursor.moveToFirst()) {
blob = cursor.getBlob(0); blob = cursor.getBlob(0);
@ -333,18 +355,26 @@ public class SQLiteTileSource implements ITileSource {
if(db == null || coordinatesZoom > 25 ){ if(db == null || coordinatesZoom > 25 ){
return null; return null;
} }
SQLiteCursor q ;
if (inversiveZoom) {
int minZoom = (17 - minZ) + 1; int minZoom = (17 - minZ) + 1;
// 17 - z = zoom, x << (25 - zoom) = 25th x tile = 8 + z, // 17 - z = zoom, x << (25 - zoom) = 25th x tile = 8 + z,
q = db.rawQuery("SELECT max(x << (8+z)), min(x << (8+z)), max(y << (8+z)), min(y << (8+z))" +
SQLiteCursor q = db.rawQuery("SELECT max(x << (8+z)), min(x << (8+z)), max(y << (8+z)), min(y << (8+z))" + " from tiles where z < " " from tiles where z < "
+ minZoom, + minZoom, new String[0]);
} else {
q = db.rawQuery("SELECT max(x << (25-z)), min(x << (25-z)), max(y << (25-z)), min(y << (25-z))"
+ " from tiles where z > " + minZ,
new String[0]); new String[0]);
}
q.moveToFirst(); q.moveToFirst();
int right = (int) (q.getInt(0) >> (25 - coordinatesZoom)); int right = (int) (q.getInt(0) >> (25 - coordinatesZoom));
int left = (int) (q.getInt(1) >> (25 - coordinatesZoom)); int left = (int) (q.getInt(1) >> (25 - coordinatesZoom));
int top = (int) (q.getInt(3) >> (25 - coordinatesZoom)); int top = (int) (q.getInt(3) >> (25 - coordinatesZoom));
int bottom = (int) (q.getInt(2) >> (25 - coordinatesZoom)); int bottom = (int) (q.getInt(2) >> (25 - coordinatesZoom));
return new QuadRect(left, top, right, bottom); return new QuadRect(left, top, right, bottom);
} }
public void deleteImage(int x, int y, int zoom) { public void deleteImage(int x, int y, int zoom) {
@ -352,7 +382,7 @@ public class SQLiteTileSource implements ITileSource {
if(db == null || db.isReadOnly()){ if(db == null || db.isReadOnly()){
return; return;
} }
db.execSQL("DELETE FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"",(17 - zoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ db.execSQL("DELETE FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"", getFileZoom(zoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
} }
private static final int BUF_SIZE = 1024; private static final int BUF_SIZE = 1024;
@ -380,7 +410,7 @@ public class SQLiteTileSource implements ITileSource {
net.osmand.plus.api.SQLiteAPI.SQLiteStatement statement = db.compileStatement("INSERT INTO tiles VALUES(?, ?, ?, ?, ?)"); //$NON-NLS-1$ net.osmand.plus.api.SQLiteAPI.SQLiteStatement statement = db.compileStatement("INSERT INTO tiles VALUES(?, ?, ?, ?, ?)"); //$NON-NLS-1$
statement.bindLong(1, x); statement.bindLong(1, x);
statement.bindLong(2, y); statement.bindLong(2, y);
statement.bindLong(3, 17 - zoom); statement.bindLong(3, getFileZoom(zoom));
statement.bindLong(4, 0); statement.bindLong(4, 0);
statement.bindBlob(5, buf.array()); statement.bindBlob(5, buf.array());
statement.execute(); statement.execute();
@ -389,6 +419,10 @@ public class SQLiteTileSource implements ITileSource {
} }
private int getFileZoom(int zoom) {
return inversiveZoom ? 17 - zoom : zoom;
}
public void closeDB(){ public void closeDB(){
if(db != null){ if(db != null){
db.close(); db.close();

2
OsmAnd/src/net/osmand/plus/api/SQLiteAPI.java
View file

@ -30,6 +30,8 @@ public interface SQLiteAPI {
public interface SQLiteCursor { public interface SQLiteCursor {
String[] getColumnNames();
boolean moveToFirst(); boolean moveToFirst();
boolean moveToNext(); boolean moveToNext();

5
OsmAnd/src/net/osmand/plus/api/SQLiteAPIImpl.java
View file

@ -56,6 +56,11 @@ public class SQLiteAPIImpl implements SQLiteAPI {
return c.moveToNext(); return c.moveToNext();
} }
@Override
public String[] getColumnNames() {
return c.getColumnNames();
}
@Override @Override
public boolean moveToFirst() { public boolean moveToFirst() {
return c.moveToFirst(); return c.moveToFirst();