X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.maps%2Fsrc%2Forg%2Fsimantics%2Fmaps%2Fsg%2FMapNode.java;fp=org.simantics.district.maps%2Fsrc%2Forg%2Fsimantics%2Fmaps%2Fsg%2FMapNode.java;h=7ca092cf74b711939b460ab3b9e2b24edbe4a296;hb=835710a4f22ec2d91c287295fb176a0af62d1186;hp=f9c6abf9af2fee69d4871965ac006cec329c9d51;hpb=6efcc2873091c30cbc6dbc47f5601bd62813b99f;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java b/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java
index f9c6abf9..7ca092cf 100644
--- a/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java
+++ b/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java
@@ -36,6 +36,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
+import org.simantics.maps.MapScalingTransform;
 import org.simantics.maps.WebService;
 import org.simantics.maps.osm.OSMTileProvider;
 import org.simantics.maps.pojo.TileJobQueue;
@@ -233,14 +234,16 @@ public class MapNode extends G2DNode implements ITileListener  {
 
         
         AffineTransform ot = g2d.getTransform();
+        //System.err.println("ot " + ot);
         g2d.transform(transform);
         
         AffineTransform tr = g2d.getTransform();
-        
+        //System.err.println("tr " + tr);
 //        Graphics2D g = (Graphics2D)g2d.create();
 //        AffineTransform tr = (AffineTransform)g.getTransform().clone();
         
         double scaleX = Math.abs(tr.getScaleX());
+        //System.err.println("scaleX : " + scaleX);
         double scaleY = Math.abs(tr.getScaleY());
         if (scaleX <= 0 || scaleY <= 0) {
             // Make sure that we don't end up in an eternal loop below.
@@ -255,20 +258,21 @@ public class MapNode extends G2DNode implements ITileListener  {
         Rectangle2D b = (Rectangle2D)((Rectangle)g2d.getRenderingHint(G2DRenderingHints.KEY_CONTROL_BOUNDS)).getBounds2D(); // getClipBounds is not accurate enough, use original clipbounds and scale here
 
         Rectangle2D viewbox = new Rectangle2D.Double(offsetX/scaleX, offsetY/scaleY, b.getWidth()/sp.getWidth(), b.getHeight()/sp.getHeight()); //g.getClipBounds();
-
         if (enabled) {
-        
-            double smallerViewboxDimension = viewbox.getWidth() < viewbox.getHeight() ? viewbox.getWidth() * MAP_SCALE : viewbox.getHeight() * MAP_SCALE;
-            int level = 0;
-            double tileSize = 360 * MAP_SCALE*2;
-            while (level < MAX_TILE_LEVEL) {
-                double ratio = smallerViewboxDimension / tileSize;
-                if (ratio >= 0.85) {
-                    break;
-                }
-                tileSize *= 0.5;
-                level++;
-            }
+            
+            int level = MapScalingTransform.zoomLevel(ot);
+            
+//            double smallerViewboxDimension = viewbox.getWidth() < viewbox.getHeight() ? viewbox.getWidth() * MAP_SCALE : viewbox.getHeight() * MAP_SCALE;
+//            int level = 0;
+//            double tileSize = 360 * MAP_SCALE*2.5;
+//            while (level < MAX_TILE_LEVEL) {
+//                double ratio = smallerViewboxDimension / tileSize;
+//                if (ratio >= 0.85) {
+//                    break;
+//                }
+//                tileSize *= 0.5;
+//                level++;
+//            }
             /*
              *  To convert y-coordinates to map coordinates in ruler, use:
              *    double val = (y-offsetY)/scaleY;
@@ -281,26 +285,31 @@ public class MapNode extends G2DNode implements ITileListener  {
     
             double miny = Math.min(360, Math.max(viewbox.getMinY()+180, 0));
             double maxy = Math.min(360, Math.max(viewbox.getMaxY()+180, 0));
-    
+            //System.err.println("minx " + minx + " maxx " + maxx + " miny " + miny + " maxy " + maxy);
             g2d.setTransform(new AffineTransform());
             g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
     
             int levels = (1 << level);
-    
+            //System.err.println("level " + level);
+            //System.err.println("levels " + levels);
             // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames
             int left = (int)Math.floor( (minx + 180) / 360 * (1<<level) );
             int right = (int)Math.floor( (maxx + 180) / 360 * (1<<level) );
             int top = (int)Math.floor(miny / 360 * (1<<level));//  (int)Math.floor( (1 - Math.log(Math.tan(Math.toRadians(miny)) + 1 / Math.cos(Math.toRadians(miny))) / Math.PI) / 2 * (1<<level) );
             int bottom = (int)Math.floor(maxy / 360 * (1<<level));//  (int)Math.floor( (1 - Math.log(Math.tan(Math.toRadians(maxy)) + 1 / Math.cos(Math.toRadians(maxy))) / Math.PI) / 2 * (1<<level) );
-    
+            //System.err.println("left " + left + " right " + right + " bottom " + bottom + " top " + top);
             double tsx = 360 / (double)levels; // Size of tile on zoom level
-            for(int tx = left; tx <= right; tx++) {
-                if(tx < 0 || tx >= levels) continue;
-                for(int ty = top; ty <= bottom; ty++) {
-                    if(ty < 0 || ty >= levels) continue;
+            //System.err.println("tileSize " + tsx);
+            for (int tx = left; tx <= right; tx++) {
+                if (tx < 0 || tx >= levels)
+                    continue;
+                for (int ty = top; ty <= bottom; ty++) {
+                    if (ty < 0 || ty >= levels)
+                        continue;
                     TileKey tile = new TileKey(level, tx, ty);
-                    double y = (double)ty - (double)levels/2; // In level 0 we have only one tile
-                    paintTile(tileCache, g2d, tr, tile, tx*tsx-180, y*tsx, tsx);
+                    double y = (double) ty - (double) levels / 2; // In level 0 we have only one tile
+                    
+                    paintTile(tileCache, g2d, tr, tile, tx * tsx - 180, y * tsx, tsx);
                 }
             }
     //        g.dispose();