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

Fix exceptions

Browse source
This commit is contained in:
vshcherb 2013-10-22 00:52:05 +02:00
parent e11318ddfb
commit 99ba127f50
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -12,11 +12,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import net.osmand.AndroidUtils;
import net.osmand.GeoidAltitudeCorrection;
@ -26,10 +25,15 @@ import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.CachedOsmandIndexes;
import net.osmand.data.*;
import net.osmand.data.Amenity;
import net.osmand.data.AmenityType;
import net.osmand.data.LatLon;
import net.osmand.data.RotatedTileBox;
import net.osmand.data.TransportStop;
import net.osmand.map.ITileSource;
import net.osmand.map.MapTileDownloader;
import net.osmand.map.MapTileDownloader.DownloadRequest;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.BusyIndicator;
import net.osmand.plus.NameFinderPoiFilter;
import net.osmand.plus.OsmandApplication;
@ -64,7 +68,6 @@ import android.graphics.BitmapFactory;
import android.os.HandlerThread;
import android.util.DisplayMetrics;
import android.view.WindowManager;
import net.osmand.map.OsmandRegions;
/**
* Resource manager is responsible to work with all resources
@ -114,11 +117,11 @@ public class ResourceManager {
protected final List<TransportIndexRepository> transportRepositories = new ArrayList<TransportIndexRepository>();
protected final Map<String, String> indexFileNames = Collections.synchronizedMap(new LinkedHashMap<String, String>());
protected final Map<String, String> indexFileNames = new ConcurrentHashMap<String, String>();
protected final Set<String> basemapFileNames = Collections.synchronizedSet(new LinkedHashSet<String>());
protected final Map<String, String> basemapFileNames = new ConcurrentHashMap<String, String>();
protected final Map<String, BinaryMapIndexReader> routingMapFiles = Collections.synchronizedMap(new LinkedHashMap<String, BinaryMapIndexReader>());
protected final Map<String, BinaryMapIndexReader> routingMapFiles = new ConcurrentHashMap<String, BinaryMapIndexReader>();
protected final MapRenderRepositories renderer;
@ -647,7 +650,7 @@ public class ResourceManager {
warnings.add(MessageFormat.format(context.getString(R.string.version_index_is_not_supported), f.getName())); //$NON-NLS-1$
} else {
if (index.isBasemap()) {
basemapFileNames.add(f.getName());
basemapFileNames.put(f.getName(), f.getName());
}
long dateCreated = index.getDateCreated();
if (dateCreated == 0) {

10
OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java
View file

@ -157,7 +157,7 @@ public class HillshadeLayer extends MapTileLayer {
List<String> ts = getTileSource(x, y, zoom);
for (String t : ts) {
SQLiteTileSource sqLiteTileSource = resources.get(t);
if(sqLiteTileSource.exists(x, y, zoom)) {
if(sqLiteTileSource != null && sqLiteTileSource.exists(x, y, zoom)) {
return true;
}
}
@ -169,9 +169,11 @@ public class HillshadeLayer extends MapTileLayer {
List<String> ts = getTileSource(x, y, zoom);
for (String t : ts) {
SQLiteTileSource sqLiteTileSource = resources.get(t);
Bitmap bmp = sqLiteTileSource.getImage(x, y, zoom, timeHolder);
if(bmp != null) {
return sqLiteTileSource.getImage(x, y, zoom, timeHolder);
if (sqLiteTileSource != null) {
Bitmap bmp = sqLiteTileSource.getImage(x, y, zoom, timeHolder);
if (bmp != null) {
return sqLiteTileSource.getImage(x, y, zoom, timeHolder);
}
}
}
return null;