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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-12-17 15:58:45 +01:00
commit 7e410748d8
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -72,6 +72,7 @@ public class MapRenderRepositories {
private final static Log log = PlatformUtil.getLog(MapRenderRepositories.class); private final static Log log = PlatformUtil.getLog(MapRenderRepositories.class);
private final OsmandApplication context; private final OsmandApplication context;
private final static int zoomOnlyForBasemaps = 11; private final static int zoomOnlyForBasemaps = 11;
static int zoomForBaseRouteRendering = 14; static int zoomForBaseRouteRendering = 14;
private Handler handler; private Handler handler;
private Map<String, BinaryMapIndexReader> files = new LinkedHashMap<String, BinaryMapIndexReader>(); private Map<String, BinaryMapIndexReader> files = new LinkedHashMap<String, BinaryMapIndexReader>();
@ -710,7 +711,12 @@ public class MapRenderRepositories {
currentRenderingContext.width = requestedBox.getPixWidth(); currentRenderingContext.width = requestedBox.getPixWidth();
currentRenderingContext.height = requestedBox.getPixHeight(); currentRenderingContext.height = requestedBox.getPixHeight();
currentRenderingContext.nightMode = nightMode; currentRenderingContext.nightMode = nightMode;
currentRenderingContext.preferredLocale = prefs.MAP_PREFERRED_LOCALE.get(); if(requestedBox.getZoom() <= zoomOnlyForBasemaps &&
"".equals(prefs.MAP_PREFERRED_LOCALE.get())) {
currentRenderingContext.preferredLocale = app.getLanguage();
} else {
currentRenderingContext.preferredLocale = prefs.MAP_PREFERRED_LOCALE.get();
}
final float mapDensity = (float) requestedBox.getMapDensity(); final float mapDensity = (float) requestedBox.getMapDensity();
currentRenderingContext.setDensityValue(mapDensity); currentRenderingContext.setDensityValue(mapDensity);
//Text/icon scales according to mapDensity (so text is size of road) //Text/icon scales according to mapDensity (so text is size of road)