From 0dd82cb68fd730836cab5a4bb36abdf27dc0c33f Mon Sep 17 00:00:00 2001
From: Emux <devemux86@gmail.com>
Date: Tue, 5 Nov 2019 15:03:18 +0200
Subject: [PATCH] MapScaleBar: fix scaling

---
 vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java | 6 ++----
 vtm/src/org/oscim/scalebar/MapScaleBar.java        | 8 +++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java b/vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java
index 07679f93..e13a1be4 100644
--- a/vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java
+++ b/vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2010, 2011, 2012, 2013 mapsforge.org
  * Copyright 2014 Ludwig M Brinckmann
- * Copyright 2014-2017 devemux86
+ * Copyright 2014-2019 devemux86
  * Copyright 2014 Erik Duisters
  * Copyright 2014 Christian Pesch
  *
@@ -39,7 +39,6 @@ public class DefaultMapScaleBar extends MapScaleBar {
 
     public enum ScaleBarMode {BOTH, SINGLE}
 
-    private final float scale;
     private ScaleBarMode scaleBarMode;
     private DistanceUnitAdapter secondaryDistanceUnitAdapter;
 
@@ -53,12 +52,11 @@ public class DefaultMapScaleBar extends MapScaleBar {
     }
 
     public DefaultMapScaleBar(Map map, float scale) {
-        super(map, (int) (BITMAP_WIDTH * scale), (int) (BITMAP_HEIGHT * scale));
+        super(map, (int) (BITMAP_WIDTH * scale), (int) (BITMAP_HEIGHT * scale), scale);
 
         setMarginHorizontal((int) (DEFAULT_HORIZONTAL_MARGIN * scale));
         setMarginVertical((int) (DEFAULT_VERTICAL_MARGIN * scale));
 
-        this.scale = scale;
         this.scaleBarMode = ScaleBarMode.BOTH;
         this.secondaryDistanceUnitAdapter = ImperialUnitAdapter.INSTANCE;
 
diff --git a/vtm/src/org/oscim/scalebar/MapScaleBar.java b/vtm/src/org/oscim/scalebar/MapScaleBar.java
index 28b17ce4..67ae77c6 100644
--- a/vtm/src/org/oscim/scalebar/MapScaleBar.java
+++ b/vtm/src/org/oscim/scalebar/MapScaleBar.java
@@ -44,8 +44,9 @@ public abstract class MapScaleBar {
     protected Canvas mapScaleCanvas;
     private int marginHorizontal;
     private int marginVertical;
-    private final MapPosition prevMapPosition = new MapPosition();
+    protected final MapPosition prevMapPosition = new MapPosition();
     protected boolean redrawNeeded;
+    protected final float scale;
     protected ScaleBarPosition scaleBarPosition;
     private boolean visible;
 
@@ -62,9 +63,10 @@ public abstract class MapScaleBar {
         }
     }
 
-    public MapScaleBar(Map map, int width, int height) {
+    public MapScaleBar(Map map, int width, int height, float scale) {
         this.map = map;
         this.mapScaleBitmap = CanvasAdapter.newBitmap(width, height, 0);
+        this.scale = scale;
 
         this.scaleBarPosition = DEFAULT_SCALE_BAR_POSITION;
 
@@ -206,7 +208,7 @@ public abstract class MapScaleBar {
         for (int scaleBarValue : scaleBarValues) {
             mapScaleValue = scaleBarValue;
             scaleBarLength = (int) (mapScaleValue / groundResolution);
-            if (scaleBarLength < (this.mapScaleBitmap.getWidth() - 10)) {
+            if (scaleBarLength < (this.mapScaleBitmap.getWidth() - 10 * this.scale)) {
                 break;
             }
         }