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

Remove high-density setting & introduce map magnifier

Browse source
This commit is contained in:
vshcherb 2013-10-06 13:49:41 +03:00
parent 2d6ce8c5ca
commit c06a2de63a
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/data/RotatedTileBox.java
View file

@ -406,8 +406,9 @@ public class RotatedTileBox {
public boolean containsTileBox(RotatedTileBox box) { public boolean containsTileBox(RotatedTileBox box) {
checkTileRectangleCalculated(); checkTileRectangleCalculated();
// thread safe
box = box.copy();
box.checkTileRectangleCalculated(); box.checkTileRectangleCalculated();
QuadPoint temp = new QuadPoint();
if(box.zoom != zoom){ if(box.zoom != zoom){
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

11
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -615,8 +615,7 @@ public class OsmandSettings {
public final OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS = new BooleanPreference("use_magnetic_field_sensor_compass", true).makeGlobal().cache(); public final OsmandPreference<Boolean> USE_MAGNETIC_FIELD_SENSOR_COMPASS = new BooleanPreference("use_magnetic_field_sensor_compass", true).makeGlobal().cache();
public final OsmandPreference<Boolean> USE_KALMAN_FILTER_FOR_COMPASS = new BooleanPreference("use_kalman_filter_compass", true).makeGlobal().cache(); public final OsmandPreference<Boolean> USE_KALMAN_FILTER_FOR_COMPASS = new BooleanPreference("use_kalman_filter_compass", true).makeGlobal().cache();
// public final OsmandPreference<Float> MAP_TEXT_SIZE = new FloatPreference("map_text_size", 1.0f).makeProfile().cache(); public final OsmandPreference<Float> MAP_ZOOM_SCALE_BY_DENSITY = new FloatPreference("map_zoom_scale_wo_density", 0f).makeProfile().cache();
public final OsmandPreference<Float> MAP_ZOOM_SCALE_BY_DENSITY = new FloatPreference("map_zoom_scale_by_density", 1.0f).makeProfile().cache();
// this value string is synchronized with settings_pref.xml preference name // this value string is synchronized with settings_pref.xml preference name
@ -877,13 +876,7 @@ public class OsmandSettings {
File tPath = ctx.getAppPath(IndexConstants.TILES_INDEX_DIR); File tPath = ctx.getAppPath(IndexConstants.TILES_INDEX_DIR);
File dir = new File(tPath, tileName); File dir = new File(tPath, tileName);
if (!dir.exists()) { if (!dir.exists()) {
TileSourceTemplate ret = checkAmongAvailableTileSources(dir, knownTemplates); return checkAmongAvailableTileSources(dir, knownTemplates);
if (ret != null) {
return ret;
}
if (ret != null) {
return ret;
}
} else if (tileName.endsWith(IndexConstants.SQLITE_EXT)) { } else if (tileName.endsWith(IndexConstants.SQLITE_EXT)) {
return ctx.getTodoAPI().newSqliteTileSource(dir, knownTemplates); return ctx.getTodoAPI().newSqliteTileSource(dir, knownTemplates);
} else if (dir.isDirectory() && !dir.getName().startsWith(".")) { } else if (dir.isDirectory() && !dir.getName().startsWith(".")) {