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

Tile source proxy should not return without resource by design, it's being run inside a worker already

Browse source
This commit is contained in:
Alexey Pelykh 2015-02-20 15:54:39 +02:00
parent dcb552edcd
commit 2f91c66722
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/src/net/osmand/core/android/TileSourceProxyProvider.java
View file

@ -1,5 +1,7 @@
package net.osmand.core.android; package net.osmand.core.android;
import android.graphics.Bitmap;
import java.io.IOException; import java.io.IOException;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
@ -12,6 +14,7 @@ import net.osmand.core.jni.ZoomLevel;
import net.osmand.core.jni.interface_ImageMapLayerProvider; import net.osmand.core.jni.interface_ImageMapLayerProvider;
import net.osmand.map.ITileSource; import net.osmand.map.ITileSource;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.resources.ResourceManager;
public class TileSourceProxyProvider extends interface_ImageMapLayerProvider { public class TileSourceProxyProvider extends interface_ImageMapLayerProvider {
@ -42,6 +45,19 @@ public class TileSourceProxyProvider extends interface_ImageMapLayerProvider {
public SWIGTYPE_p_QByteArray obtainImage(TileId tileId, ZoomLevel zoom) { public SWIGTYPE_p_QByteArray obtainImage(TileId tileId, ZoomLevel zoom) {
byte[] image; byte[] image;
try { try {
ResourceManager rm = app.getResourceManager();
String tileFilename = rm.calculateTileId(tileSource, tileId.getX(), tileId.getY(),
zoom.swigValue());
if (!rm.tileExistOnFileSystem(tileFilename, tileSource, tileId.getX(), tileId.getY(),
zoom.swigValue())) {
Bitmap loadedBitmap = null;
while (loadedBitmap == null) {
loadedBitmap = rm.getTileImageForMapSync(tileFilename, tileSource,
tileId.getX(), tileId.getY(), zoom.swigValue(), true);
}
}
image = tileSource.getBytes(tileId.getX(), tileId.getY(), zoom.swigValue(), image = tileSource.getBytes(tileId.getX(), tileId.getY(), zoom.swigValue(),
app.getAppPath(IndexConstants.TILES_INDEX_DIR).getAbsolutePath()); app.getAppPath(IndexConstants.TILES_INDEX_DIR).getAbsolutePath());
} catch(IOException e) { } catch(IOException e) {