Some cleaning and fixing of district functionalities

[simantics/district.git] / org.simantics.district.maps / src / org / simantics / maps / sg / MapScaleNode.java

diff --git a/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java b/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java
index a0242c11d502781fac0a69e7b3511b6178e09a3c..793550b6087b05b92694b36e0291ab85ae6ce30c 100644 (file)
--- a/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java
+++ b/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java
@@ -28,13 +28,14 @@ public class MapScaleNode extends G2DNode {
 
     protected double           gridSize          = 1.0;
 
-    private double scale;
-
     @Override
     public void render(Graphics2D g) {
         if (!enabled)
             return;
 
+        AffineTransform ot = g.getTransform();
+        g.transform(transform);
+        
         AffineTransform tr = g.getTransform();
         double scaleX = Math.abs(tr.getScaleX());
         double scaleY = Math.abs(tr.getScaleY());
@@ -129,7 +130,7 @@ public class MapScaleNode extends G2DNode {
             label += stepX;
         }
 
-        g.setTransform(tr);
+        g.setTransform(ot);
     }
 
     @Override
@@ -199,10 +200,6 @@ public class MapScaleNode extends G2DNode {
         this.enabled = enabled;
     }
 
-    public void setScale(double scale) {
-        this.scale = scale;
-    }
-    
     @Override
     public void init() {
         try {
@@ -225,11 +222,11 @@ public class MapScaleNode extends G2DNode {
     }
     
     public double getMeterPerPixel(double screenX, double screenY, double scaleX, double scaleY) {
-        double startLon = (screenX / scaleX) / scale;
-        double val = (screenY / scaleY) / scale;
+        double startLon = (screenX / scaleX);
+        double val = (screenY / scaleY);
         val = Math.toDegrees(Math.atan(Math.sinh(Math.toRadians(val))));
         double startLat = val;
-        double endLon = ((screenX + 1) / scaleX) / scale;
+        double endLon = ((screenX + 1) / scaleX);
         double endLat = val;
         
         calculator.setStartingGeographicPoint(startLon, startLat);