Changeset 7343 in osm for applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooser.java

Timestamp:

2008-04-12T15:59:42+02:00 (17 years ago)

Author:

tim

Message:

CHANGED slippy_map_chooser:

• Tried to fix ticket #629 and #599 (IllegalArgumentException when zooming on Japan)

ADDED to slippy_map_chooser:

• Patch (Ticket #678): Zooming doesn't take cursor location into consideration (now it does thanks to Johannes Rudolph)
• Patch (Ticket #678): When zooming use parent tiles while new tiles are loading (by Johannes Rudolph)

File:

• applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooser.java (modified) (7 diffs)

applications/editors/josm/plugins/slippy_map_chooser/src/SlippyMapChooser.java

@@ -185 +185 @@
                                 OsmTile t = iTileDB.get(OsmTile.key(iZoomlevel,  (-iOffsetX + x*OsmTile.WIDTH)/OsmTile.WIDTH, ((-iOffsetY+ y*OsmTile.HEIGHT)/OsmTile.HEIGHT)));
                                 if(t != null){
-                                        t.paint(g);                                             
+                                        t.paint(g,iTileDB);                                             
                                 }
                         } 
@@ -204 +204 @@
                 
                 iSizeButton.paint(g);
+                
+                
+                if(SlippyMapChooserPlugin.DEBUG_MODE){
+                        g.setColor(Color.black);
+                        g.drawString("Free Memory: " + Runtime.getRuntime().freeMemory()/1024 + "/" + Runtime.getRuntime().totalMemory()/1024 + "kB" , 5, 50);
+                        g.drawString("Tiles in DB: " + iTileDB.getCachedTilesSize(), 5, 65);
+                        g.drawString("Loading Queue Size: " + iTileDB.getLoadingQueueSize(), 5, 80);
+                        
+                }
         }
 
@@ -356 +365 @@
          * Callback for OsmMapControl. Zoom out one level                
          */
-        void zoomIn(){  
+        void zoomIn(Point curPos){      
                 
                 //cache center of screen and the selection rectangle
-                LatLon l = getLatLonOfScreenPoint(new Point(getWidth()/2, getHeight()/2));
+                LatLon l = getLatLonOfScreenPoint(curPos);
                 LatLon selStart = null;
                 LatLon selEnd   = null;
@@ -374 +383 @@
                 }
                                         
-                //center on cached location
-                centerOnLatLon(l);
+                setLatLonAtPoint(l, curPos);
                 
                 //restore selection 
@@ -394 +402 @@
          * Callback for OsmMapControl. 
          */
-        void zoomOut(){
+        void zoomOut(Point curPos){
                 //cache center of screen and the selction rect
-                LatLon l = getLatLonOfScreenPoint(new Point(getWidth()/2, getHeight()/2));
+                LatLon l = getLatLonOfScreenPoint(curPos);
                 LatLon selStart = null;
                 LatLon selEnd   = null;
@@ -411 +419 @@
                 }
                 
-                //center on cached location
-                centerOnLatLon(l);
+                setLatLonAtPoint(l, curPos);
                 
                 //restore selection 
@@ -485 +492 @@
          * @param aLatLon the location to center on
          */
-        private void centerOnLatLon(LatLon aLatLon){            
+        private void centerOnLatLon(LatLon aLatLon){
+                setLatLonAtPoint(aLatLon, new Point(getWidth()/2,getHeight()/2));
+        }
+
+        /**
+         * Moves the map that the specified latLon is shown at the point on screen
+         * given
+         * @param aLatLon a position
+         * @param p a point on the screen
+         */
+        private void setLatLonAtPoint(LatLon aLatLon, Point p){
                 int x = OsmMercator.LonToX(aLatLon.lon(), iZoomlevel);
                 int y = OsmMercator.LatToY(aLatLon.lat(), iZoomlevel);
-                iOffsetX = -x +getWidth()/2;
-                iOffsetY = -y +getHeight()/2;
+                iOffsetX = - x + p.x;
+                iOffsetY = - y + p.y;
                 repaint();
         }