Changeset 16153 in osm for applications/editors/josm/plugins/slippymap

Timestamp:

2009-06-26T20:27:43+02:00 (15 years ago)

Author:

lvarga

Message:

Commited first 3 of 14 patches from Dave Hansen <dave@…>. His info to patches from mailinglist "josm-dev" <josm-dev@…> posted at 2009-06-13 23:04.

This makes the scaling calculator work even if the image passed in
to it is not currently loaded. It will try to use the last image
passed in as an approximation. If *that* doesn't work, it assumes
sane values until an image loads.
image-scaling

This lets SlippyMapTiles keep track of whether they have
an image in the process of being downloaded. This is
because we sometimes want to abort a download in progress
but we don't want to clear the image if it has already
been fully downloaded. Also let the zoom level be
queried.

I introduced a couple of bugs because of this and it was
my fault anyway from an earlier patch.
This makes the argument order consistent.

Location:

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap

Files:

• SlippyMapKey.java (modified) (2 diffs)
• SlippyMapLayer.java (modified) (6 diffs)
• SlippyMapTile.java (modified) (4 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapKey.java

@@ -12 +12 @@
  * @author LuVar <lubomir.varga@freemap.sk>
  * @author Dave Hansen <dave@sr71.net>
+ * @author Dave Hansen <dave@linux.vnet.ibm.com>
  *
  */
@@ -29 +30 @@
          */
         public final boolean valid;
-        public SlippyMapKey(int level, int x, int y) {
+        public SlippyMapKey(int x, int y, int level) {
                 this.x = x;
                 this.y = y;

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -40 +40 @@
  * @author LuVar <lubomir.varga@freemap.sk>
  * @author Dave Hansen <dave@sr71.net>
- *
+ * @author Dave Hansen <dave@linux.vnet.ibm.com>
+ * 
  */
 public class SlippyMapLayer extends Layer implements ImageObserver,
@@ -279 +280 @@
         for (int x = z12x0 - 1; x <= z12x1; x++) {
             for (int y = z12y0 - 1; y <= z12y1; y++) {
-                SlippyMapKey key = new SlippyMapKey(currentZoomLevel, x, y);
+                SlippyMapKey key = new SlippyMapKey(x, y, currentZoomLevel);
                 SlippyMapTile tile = tileStorage.get(key);
                 if (!key.valid) {
@@ -295 +296 @@
     }
 
-    /*
-     * Attempt to approximate how much the image is
-     * being scaled.  For instance, a 100x100 image
-     * being scaled to 50x50 would return 0.25.
-     */
-    double getImageScaling(Image img, Point p0, Point p1)
-    {
-        int realWidth = img.getWidth(this);
-        int realHeight = img.getHeight(this);
-        if (realWidth == -1 || realHeight == -1)
-                return 1.0;
-        int drawWidth = p1.x - p0.x;
-        int drawHeight = p1.x - p0.x;
-
-        double drawArea = drawWidth * drawHeight;
+        /*
+         * Attempt to approximate how much the image is being scaled. For instance,
+         * a 100x100 image being scaled to 50x50 would return 0.25.
+         */
+        Image lastScaledImage = null;
+
+        double getImageScaling(Image img, Point p0, Point p1) {
+                int realWidth = img.getWidth(this);
+                int realHeight = img.getHeight(this);
+                if (realWidth == -1 || realHeight == -1) {
+                        /*
+                         * We need a good image against which to work. If
+                         * the current one isn't loaded, then try the last one.
+                         * Should be good enough. If we've never seen one, then
+                         * guess.        
+                         */
+                        if (lastScaledImage != null) {
+                                return getImageScaling(lastScaledImage, p0, p1);
+                        }
+                        realWidth = 256;
+                        realHeight = 256;
+                } else {
+                        lastScaledImage = img;
+                }
+                /*
+                 * If the zoom scale gets really, really off, these can get into
+                 * the millions, so make this a double to prevent integer
+                 * overflows.        
+                 */
+                double drawWidth = p1.x - p0.x;
+                double drawHeight = p1.x - p0.x;
+                // stem.out.println("drawWidth: " + drawWidth + " drawHeight: " +
+                // drawHeight);
+
+                double drawArea = drawWidth * drawHeight;
         double realArea = realWidth * realHeight;
 
@@ -384 +405 @@
         for (int x = z12x0 - 1; x <= z12x1; x++) {
             for (int y = z12y0 - 1; y <= z12y1; y++) {
-                SlippyMapKey key = new SlippyMapKey(currentZoomLevel, x, y);
+                SlippyMapKey key = new SlippyMapKey(x, y, currentZoomLevel);
                 SlippyMapTile tile;
                 tile = tileStorage.get(key);
@@ -532 +553 @@
         }
 
-        SlippyMapKey key = new SlippyMapKey(currentZoomLevel, tilex, tiley);
+        SlippyMapKey key = new SlippyMapKey(tilex, tiley, currentZoomLevel);
         if (!key.valid) {
             System.err.println("getTileForPixelpos("+px+","+py+") made invalid key");
@@ -561 +582 @@
                 new JSeparator(),
                 // color,
-                new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
+                new JMenuItem(new RenameLayerAction(this.getAssociatedFile(), this)),
                 new JSeparator(),
                 new JMenuItem(new LayerListPopup.InfoAction(this)) };

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java

@@ -17 +17 @@
  * @author LuVar <lubomir.varga@freemap.sk>
  * @author Dave Hansen <dave@sr71.net>
+ * @author Dave Hansen <dave@linux.vnet.ibm.com>
  * 
  */
@@ -22 +23 @@
 {
     private Image  tileImage;
-        long timestamp;
+        private long timestamp;
 
-    int x;
-    int y;
-    int z;
+        private int x;
+        private int y;
+        private int z;
+    
+    private boolean imageDownloaded = false;
 
     private String metadata;
@@ -65 +68 @@
     }
 
+    public Image getImageNoTimestamp() {
+        return tileImage;
+    }
+    
     public Image getImage()
     {
@@ -71 +78 @@
     }
 
+    public int getZoom() {
+        return z;
+    }
+    
     public void dropImage()
     {
+                if(tileImage != null) {
+                        tileImage.flush();
+                }
                 tileImage = null;
                 //  This should work in theory but doesn't seem to actually
                 //  reduce the X server memory usage
                 //tileImage.flush();
+    }
+    
+    public void markAsDownloaded() {
+        imageDownloaded = true;
+    }
+    
+    public boolean isDownloaded() {
+        return imageDownloaded;
+    }
+    
+    public void abortDownload() {
+        if (imageDownloaded) {
+                return;
+        }
+        dropImage();
     }