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

Merge pull request #7675 from osmandapp/Fix_7354

Browse source 
Fix #7354
This commit is contained in:
max-klaus 2019-10-16 18:50:33 +03:00 committed by GitHub
commit d62b274800
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/views/RulerControlLayer.java
View file

@ -64,6 +64,7 @@ public class RulerControlLayer extends OsmandMapLayer {
private QuadPoint cacheCenter;
private float cacheMapDensity;
private OsmandSettings.OsmandPreference<Float> mapDensity;
private OsmandSettings.MetricsConstants cacheMetricSystem;
private int cacheIntZoom;
private double cacheTileX;
private double cacheTileY;
@ -127,7 +128,8 @@ public class RulerControlLayer extends OsmandMapLayer {
public void initLayer(final OsmandMapTileView view) {
app = mapActivity.getMyApplication();
this.view = view;
mapDensity = mapActivity.getMyApplication().getSettings().MAP_DENSITY;
mapDensity = app.getSettings().MAP_DENSITY;
cacheMetricSystem = app.getSettings().METRIC_SYSTEM.get();
cacheMapDensity = mapDensity.get();
cacheDistances = new ArrayList<>();
cacheCenter = new QuadPoint();
@ -443,10 +445,13 @@ public class RulerControlLayer extends OsmandMapLayer {
updateCenter(tb, center);
}
boolean move = tb.getZoom() != cacheIntZoom || Math.abs(tb.getCenterTileX() - cacheTileX) > 1 ||
Math.abs(tb.getCenterTileY() - cacheTileY) > 1 || mapDensity.get() != cacheMapDensity;
OsmandSettings.MetricsConstants currentMetricSystem = app.getSettings().METRIC_SYSTEM.get();
boolean updateCache = tb.getZoom() != cacheIntZoom || Math.abs(tb.getCenterTileX() - cacheTileX) > 1
|| Math.abs(tb.getCenterTileY() - cacheTileY) > 1 || mapDensity.get() != cacheMapDensity
|| cacheMetricSystem != currentMetricSystem;
if (!tb.isZoomAnimated() && move) {
if (!tb.isZoomAnimated() && updateCache) {
cacheMetricSystem = currentMetricSystem;
cacheIntZoom = tb.getZoom();
cacheTileX = tb.getCenterTileX();
cacheTileY = tb.getCenterTileY();