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

Fix zoom magnifier

Browse source
This commit is contained in:
Alexey Pelykh 2015-02-20 16:19:50 +02:00
parent 2f91c66722
commit 834a23ad33
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/core/android/MapRendererContext.java
View file

@ -106,23 +106,18 @@ public class MapRendererContext implements RendererRegistry.IRendererLoadedEvent
recreateRasterAndSymbolsProvider(); recreateRasterAndSymbolsProvider();
} }
protected float getDisplayDensityFactor() {
return app.getSettings().MAP_DENSITY.get() * Math.max(1, density);
}
protected int getRasterTileSize() { protected int getRasterTileSize() {
return Integer.highestOneBit((int) getReferenceTileSize() - 1) * 2; return Integer.highestOneBit((int) getReferenceTileSize() - 1) * 2;
} }
private float getReferenceTileSize() { private float getReferenceTileSize() {
return 256 * getDisplayDensityFactor(); return 256 * app.getSettings().MAP_DENSITY.get() * Math.max(1, density);
} }
/** /**
* Update map presentation environment and everything that depends on it * Update map presentation environment and everything that depends on it
*/ */
private void updateMapPresentationEnvironment() { private void updateMapPresentationEnvironment() {
float displayDensityFactor = getDisplayDensityFactor();
// Create new map presentation environment // Create new map presentation environment
String langId = app.getSettings().MAP_PREFERRED_LOCALE.get(); String langId = app.getSettings().MAP_PREFERRED_LOCALE.get();
// TODO make setting // TODO make setting
@ -156,10 +151,10 @@ public class MapRendererContext implements RendererRegistry.IRendererLoadedEvent
} }
} }
ResolvedMapStyle mapStyle = mapStyles.get(rendName); ResolvedMapStyle mapStyle = mapStyles.get(rendName);
CachedMapPresentation pres = new CachedMapPresentation(langId, langPref, mapStyle, displayDensityFactor); CachedMapPresentation pres = new CachedMapPresentation(langId, langPref, mapStyle, density);
if (this.presentationObjectParams == null || !this.presentationObjectParams.equalsFields(pres)) { if (this.presentationObjectParams == null || !this.presentationObjectParams.equalsFields(pres)) {
this.presentationObjectParams = pres; this.presentationObjectParams = pres;
mapPresentationEnvironment = new MapPresentationEnvironment(mapStyle, displayDensityFactor, langId, mapPresentationEnvironment = new MapPresentationEnvironment(mapStyle, density, langId,
langPref); langPref);
} }
@ -226,7 +221,7 @@ public class MapRendererContext implements RendererRegistry.IRendererLoadedEvent
} }
// Create new OBF map symbols provider // Create new OBF map symbols provider
obfMapSymbolsProvider = new MapObjectsSymbolsProvider(mapPrimitivesProvider, getReferenceTileSize(), obfMapSymbolsProvider = new MapObjectsSymbolsProvider(mapPrimitivesProvider, getReferenceTileSize(),
app.getSettings().TEXT_SCALE.get() / app.getSettings().MAP_DENSITY.get()); app.getSettings().TEXT_SCALE.get());
// If there's bound view, add new provider // If there's bound view, add new provider
if (mapRendererView != null) { if (mapRendererView != null) {
mapRendererView.addSymbolsProvider(obfMapSymbolsProvider); mapRendererView.addSymbolsProvider(obfMapSymbolsProvider);