Changeset 4065 in josm

Timestamp:

2011-05-01T21:56:49+02:00 (13 years ago)

Author:

jttt

Message:

Improved wms cache

• files saved in original format (no need to recode to png)
• possibility to tile with different pos/ppd that overlaps current tile

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Bounds.java (modified) (1 diff)
• data/ProjectionBounds.java (modified) (3 diffs)
• data/imagery/GeorefImage.java (modified) (1 diff)
• data/imagery/WmsCache.java (added)
• data/imagery/types (added)
• data/imagery/types/Adapter1.java (added)
• data/imagery/types/EntryType.java (added)
• data/imagery/types/ObjectFactory.java (added)
• data/imagery/types/ProjectionType.java (added)
• data/imagery/types/WmsCacheType.java (added)
• data/imagery/types/package-info.java (added)
• data/imagery/wms-cache.xsd (added)
• data/osm/visitor/BoundingXYVisitor.java (modified) (3 diffs)
• gui/MapSlider.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (7 diffs)
• gui/layer/ImageryLayer.java (modified) (1 diff)
• gui/layer/WMSLayer.java (modified) (16 diffs)
• io/imagery/Grabber.java (modified) (2 diffs)
• io/imagery/HTMLGrabber.java (modified) (3 diffs)
• io/imagery/WMSGrabber.java (modified) (5 diffs)
• io/imagery/WMSRequest.java (modified) (4 diffs)
• tools/Utils.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -178 +178 @@
      */
     public boolean intersects(Bounds b) {
-        return b.getMax().lat() >= minLat &&
-        b.getMax().lon() >= minLon &&
-        b.getMin().lat() <= maxLat &&
-        b.getMin().lon() <= maxLon;
+        return b.maxLat >= minLat &&
+        b.maxLon >= minLon &&
+        b.minLat <= maxLat &&
+        b.minLon <= maxLon;
     }
 

trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java

@@ -6 +6 @@
 /**
  * This is a simple data class for "rectangular" areas of the world, given in
- * lat/lon min/max values.
+ * east/north min/max values.
  *
  * @author imi
@@ -14 +14 @@
      * The minimum and maximum coordinates.
      */
-    public EastNorth min, max;
+    public double minEast, minNorth, maxEast, maxNorth;
 
     /**
@@ -20 +20 @@
      */
     public ProjectionBounds(EastNorth min, EastNorth max) {
-        this.min = min;
-        this.max = max;
+        this.minEast = min.east();
+        this.minNorth = min.north();
+        this.maxEast = max.east();
+        this.maxNorth = max.north();
     }
     public ProjectionBounds(EastNorth p) {
-        this.min = p;
-        this.max = p;
+        this.minEast = this.maxEast = p.east();
+        this.minNorth = this.maxNorth = p.north();
     }
     public ProjectionBounds(EastNorth center, double east, double north) {
-        this.min = new EastNorth(center.east()-east/2.0, center.north()-north/2.0);
-        this.max = new EastNorth(center.east()+east/2.0, center.north()+north/2.0);
+        this.minEast = center.east()-east/2.0;
+        this.minNorth = center.north()-north/2.0;
+        this.maxEast = center.east()+east/2.0;
+        this.maxNorth = center.north()+north/2.0;
+    }
+    public ProjectionBounds(double minEast, double minNorth, double maxEast, double maxNorth) {
+        this.minEast = minEast;
+        this.minNorth = minNorth;
+        this.maxEast = maxEast;
+        this.maxNorth = maxNorth;
     }
     public void extend(EastNorth e)
     {
-        if (e.east() < min.east() || e.north() < min.north())
-            min = new EastNorth(Math.min(e.east(), min.east()), Math.min(e.north(), min.north()));
-        if (e.east() > max.east() || e.north() > max.north())
-            max = new EastNorth(Math.max(e.east(), max.east()), Math.max(e.north(), max.north()));
+        if (e.east() < minEast) {
+            minEast = e.east();
+        }
+        if (e.east() > maxEast) {
+            maxEast = e.east();
+        }
+        if (e.north() < minNorth) {
+            minNorth = e.north();
+        }
+        if (e.north() > maxNorth) {
+            maxNorth = e.north();
+        }
     }
     public EastNorth getCenter()
     {
-        return min.getCenter(max);
+        return new EastNorth((minEast + maxEast) / 2.0, (minNorth + maxNorth) / 2.0);
     }
 
     @Override public String toString() {
-        return "ProjectionBounds["+min.east()+","+min.north()+","+max.east()+","+max.north()+"]";
+        return "ProjectionBounds["+minEast+","+minNorth+","+maxEast+","+maxNorth+"]";
     }
+
+    /**
+     * The two bounds intersect? Compared to java Shape.intersects, if does not use
+     * the interior but the closure. (">=" instead of ">")
+     */
+    public boolean intersects(ProjectionBounds b) {
+        return b.maxEast >= minEast &&
+        b.maxNorth >= minNorth &&
+        b.minEast <= maxEast &&
+        b.minNorth <= maxNorth;
+    }
+
+    public EastNorth getMin() {
+        return new EastNorth(minEast, minNorth);
+    }
+
+    public EastNorth getMax() {
+        return new EastNorth(maxEast, maxNorth);
+    }
+
 }

trunk/src/org/openstreetmap/josm/data/imagery/GeorefImage.java

@@ -26 +26 @@
     private static final long serialVersionUID = 1L;
 
-    public enum State { IMAGE, NOT_IN_CACHE, FAILED}
+    public enum State { IMAGE, NOT_IN_CACHE, FAILED, PARTLY_IN_CACHE}
 
     private WMSLayer layer;

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -56 +56 @@
         if(b != null)
         {
-            visit(b.min);
-            visit(b.max);
+            visit(b.getMin());
+            visit(b.getMax());
         }
     }
@@ -84 +84 @@
     public boolean hasExtend()
     {
-        return bounds != null && !bounds.min.equals(bounds.max);
+        return bounds != null && !bounds.getMin().equals(bounds.getMax());
     }
 
@@ -113 +113 @@
         if (bounds == null)
             return;
-        LatLon minLatlon = Main.proj.eastNorth2latlon(bounds.min);
-        LatLon maxLatlon = Main.proj.eastNorth2latlon(bounds.max);
+        LatLon minLatlon = Main.proj.eastNorth2latlon(bounds.getMin());
+        LatLon maxLatlon = Main.proj.eastNorth2latlon(bounds.getMax());
         bounds = new ProjectionBounds(
                 Main.proj.latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),

trunk/src/org/openstreetmap/josm/gui/MapSlider.java

@@ -35 +35 @@
         ProjectionBounds current = this.mv.getProjectionBounds();
 
-        double cur_e = current.max.east()-current.min.east();
-        double cur_n = current.max.north()-current.min.north();
-        double e = world.max.east()-world.min.east();
-        double n = world.max.north()-world.min.north();
+        double cur_e = current.maxEast-current.minEast;
+        double cur_n = current.maxNorth-current.minNorth;
+        double e = world.maxEast-world.minEast;
+        double n = world.maxNorth-world.minNorth;
         int zoom = 0;
 
@@ -59 +59 @@
         ProjectionBounds world = this.mv.getMaxProjectionBounds();
         double fact = Math.pow(1.1, getValue());
-        double es = world.max.east()-world.min.east();
-        double n = world.max.north()-world.min.north();
+        double es = world.maxEast-world.minEast;
+        double n = world.maxNorth-world.minNorth;
 
         this.mv.zoomTo(new ProjectionBounds(this.mv.getCenter(), es/fact, n/fact));

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -24 +24 @@
 
 import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -367 +366 @@
 
     /**
-     * Create a thread that moves the viewport to the given center in an 
+     * Create a thread that moves the viewport to the given center in an
      * animated fashion.
      */
@@ -382 +381 @@
 
             new Thread(
-                new Runnable() {
-                    public void run() {
-                        for (int i=0; i<frames; i++)
-                        {
-                            // fixme - not use zoom history here
-                            zoomTo(oldCenter.interpolate(finalNewCenter, (double) (i+1) / (double) frames));
-                            try { Thread.sleep(1000 / fps); } catch (InterruptedException ex) { };
+                    new Runnable() {
+                        public void run() {
+                            for (int i=0; i<frames; i++)
+                            {
+                                // fixme - not use zoom history here
+                                zoomTo(oldCenter.interpolate(finalNewCenter, (i+1) / frames));
+                                try { Thread.sleep(1000 / fps); } catch (InterruptedException ex) { };
+                            }
                         }
                     }
-                }
             ).start();
         }
@@ -425 +424 @@
         }
 
-        double scaleX = (box.max.east()-box.min.east())/w;
-        double scaleY = (box.max.north()-box.min.north())/h;
+        double scaleX = (box.maxEast-box.minEast)/w;
+        double scaleY = (box.maxNorth-box.minNorth)/h;
         double newScale = Math.max(scaleX, scaleY);
 
@@ -1231 +1230 @@
         if(Cursors.size() > 0) {
             CursorInfo l = Cursors.getLast();
-            if(l != null && l.cursor == cursor && l.object == reference) {
+            if(l != null && l.cursor == cursor && l.object == reference)
                 return;
-            }
             stripCursors(reference);
         }
@@ -1253 +1251 @@
         stripCursors(reference);
         if(l != null && l.object == reference) {
-            if(Cursors.size() == 0)
+            if(Cursors.size() == 0) {
                 setCursor(null);
-            else
+            } else {
                 setCursor(Cursors.getLast().cursor);
+            }
         }
     }
@@ -1263 +1262 @@
         LinkedList<CursorInfo> c = new LinkedList<CursorInfo>();
         for(CursorInfo i : Cursors) {
-            if(i.object != reference)
+            if(i.object != reference) {
                 c.add(i);
+            }
         }
         Cursors = c;

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -85 +85 @@
         if (Main.map == null || Main.map.mapView == null) return Main.proj.getDefaultZoomInPPD();
         ProjectionBounds bounds = Main.map.mapView.getProjectionBounds();
-        return Main.map.mapView.getWidth() / (bounds.max.east() - bounds.min.east());
+        return Main.map.mapView.getWidth() / (bounds.maxEast - bounds.minEast);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -16 +16 @@
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
@@ -41 +43 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
+import org.openstreetmap.josm.data.imagery.WmsCache;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -47 +50 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.io.CacheFiles;
 import org.openstreetmap.josm.io.imagery.Grabber;
 import org.openstreetmap.josm.io.imagery.HTMLGrabber;
@@ -79 +81 @@
     protected ImageryInfo info;
     protected final MapView mv;
+    public WmsCache cache;
+
 
     // Image index boundary for current view
@@ -118 +122 @@
         setBackgroundLayer(true); /* set global background variable */
         initializeImages();
+        if (info.getUrl() != null) {
+            for (WMSLayer layer: Main.map.mapView.getLayersOfType(WMSLayer.class)) {
+                if (layer.getInfo().getUrl().equals(info.getUrl())) {
+                    cache = layer.cache;
+                    break;
+                }
+            }
+            if (cache == null) {
+                cache = new WmsCache(info.getUrl(), imageSize);
+                cache.loadIndex();
+            }
+        }
         this.info = new ImageryInfo(info);
         if(this.info.getPixelPerDegree() == 0.0) {
@@ -157 +173 @@
         cancelGrabberThreads(false);
         Main.pref.removePreferenceChangeListener(this);
+        if (cache != null) {
+            cache.saveIndex();
+        }
     }
 
@@ -205 +224 @@
 
         ProjectionBounds bounds = mv.getProjectionBounds();
-        bminx= getImageXIndex(bounds.min.east());
-        bminy= getImageYIndex(bounds.min.north());
-        bmaxx= getImageXIndex(bounds.max.east());
-        bmaxy= getImageYIndex(bounds.max.north());
-
-        leftEdge = (int)(bounds.min.east() * getPPD());
-        bottomEdge = (int)(bounds.min.north() * getPPD());
+        bminx= getImageXIndex(bounds.minEast);
+        bminy= getImageYIndex(bounds.minNorth);
+        bmaxx= getImageXIndex(bounds.maxEast);
+        bmaxy= getImageYIndex(bounds.maxNorth);
+
+        leftEdge = (int)(bounds.minEast * getPPD());
+        bottomEdge = (int)(bounds.minNorth * getPPD());
 
         if (zoomIsTooBig()) {
-            for(int x = bminx; x<=bmaxx; ++x) {
-                for(int y = bminy; y<=bmaxy; ++y) {
-                    images[modulo(x,dax)][modulo(y,day)].paint(g, mv, x, y, leftEdge, bottomEdge);
+            for(int x = 0; x<images.length; ++x) {
+                for(int y = 0; y<images[0].length; ++y) {
+                    GeorefImage image = images[x][y];
+                    image.paint(g, mv, image.getXIndex(), image.getYIndex(), leftEdge, bottomEdge);
                 }
             }
@@ -305 +325 @@
     }
 
+    public boolean isOverlapEnabled() {
+        return WMSLayer.PROP_OVERLAP.get() && (WMSLayer.PROP_OVERLAP_EAST.get() > 0 || WMSLayer.PROP_OVERLAP_NORTH.get() > 0);
+    }
+
     /**
      * 
@@ -310 +334 @@
      */
     public BufferedImage normalizeImage(BufferedImage img) {
-        if (WMSLayer.PROP_OVERLAP.get() && (WMSLayer.PROP_OVERLAP_EAST.get() > 0 || WMSLayer.PROP_OVERLAP_NORTH.get() > 0)) {
+        if (isOverlapEnabled()) {
             BufferedImage copy = img;
             img = new BufferedImage(imageSize, imageSize, copy.getType());
@@ -357 +381 @@
 
         gatherFinishedRequests();
+        Set<ProjectionBounds> areaToCache = new HashSet<ProjectionBounds>();
 
         for(int x = bminx; x<=bmaxx; ++x) {
@@ -362 +387 @@
                 GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
                 if (!img.paint(g, mv, x, y, leftEdge, bottomEdge)) {
-                    WMSRequest request = new WMSRequest(x, y, info.getPixelPerDegree(), real);
+                    WMSRequest request = new WMSRequest(x, y, info.getPixelPerDegree(), real, true);
                     addRequest(request);
-                }
-            }
-        }
+                    areaToCache.add(new ProjectionBounds(getEastNorth(x, y), getEastNorth(x + 1, y + 1)));
+                } else if (img.getState() == State.PARTLY_IN_CACHE && autoDownloadEnabled) {
+                    WMSRequest request = new WMSRequest(x, y, info.getPixelPerDegree(), real, false);
+                    addRequest(request);
+                    areaToCache.add(new ProjectionBounds(getEastNorth(x, y), getEastNorth(x + 1, y + 1)));
+                }
+            }
+        }
+        cache.setAreaToCache(areaToCache);
     }
 
@@ -548 +579 @@
         @Override
         public void actionPerformed(ActionEvent ev) {
-            initializeImages();
             resolution = mv.getDist100PixelText();
             info.setPixelPerDegree(getPPD());
             settingsChanged = true;
+            for(int x = 0; x<dax; ++x) {
+                for(int y = 0; y<day; ++y) {
+                    images[x][y].changePosition(-1, -1);
+                }
+            }
             mv.repaint();
         }
@@ -564 +599 @@
             // Delete small files, because they're probably blank tiles.
             // See https://josm.openstreetmap.de/ticket/2307
-            Grabber.cache.customCleanUp(CacheFiles.CLEAN_SMALL_FILES, 4096);
+            cache.cleanSmallFiles(4096);
 
             for (int x = 0; x < dax; ++x) {
@@ -570 +605 @@
                     GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
                     if(img.getState() == State.FAILED){
-                        addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), true));
-                        mv.repaint();
+                        addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), true, false));
                     }
                 }
@@ -680 +714 @@
                 settingsChanged = true;
                 mv.repaint();
+                if (cache != null) {
+                    cache.saveIndex();
+                    cache = null;
+                }
                 if(info.getUrl() != null)
                 {
+                    cache = new WmsCache(info.getUrl(), imageSize);
                     startGrabberThreads();
                 }
@@ -737 +776 @@
                         GeorefImage img = images[modulo(x,dax)][modulo(y,day)];
                         if(img.getState() == State.NOT_IN_CACHE){
-                            addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), false));
+                            addRequest(new WMSRequest(img.getXIndex(), img.getYIndex(), info.getPixelPerDegree(), false, true));
                         }
                     }

trunk/src/org/openstreetmap/josm/io/imagery/Grabber.java

@@ -9 +9 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
-import org.openstreetmap.josm.io.CacheFiles;
 
 abstract public class Grabber implements Runnable {
-    public final static CacheFiles cache = new CacheFiles("imagery", false);
-
     protected final MapView mv;
     protected final WMSLayer layer;
@@ -32 +29 @@
                 layer.getEastNorth(request.getXIndex(), request.getYIndex()),
                 layer.getEastNorth(request.getXIndex() + 1, request.getYIndex() + 1));
-        if (b.min != null && b.max != null && WMSLayer.PROP_OVERLAP.get()) {
-            double eastSize =  b.max.east() - b.min.east();
-            double northSize =  b.max.north() - b.min.north();
+        if (WMSLayer.PROP_OVERLAP.get()) {
+            double eastSize =  b.maxEast - b.minEast;
+            double northSize =  b.maxNorth - b.minNorth;
 
             double eastCoef = WMSLayer.PROP_OVERLAP_EAST.get() / 100.0;
             double northCoef = WMSLayer.PROP_OVERLAP_NORTH.get() / 100.0;
 
-            this.b = new ProjectionBounds( new EastNorth(b.min.east(),
-                    b.min.north()),
-                    new EastNorth(b.max.east() + eastCoef * eastSize,
-                            b.max.north() + northCoef * northSize));
+            this.b = new ProjectionBounds(b.getMin(),
+                    new EastNorth(b.maxEast + eastCoef * eastSize,
+                            b.maxNorth + northCoef * northSize));
         }
 

trunk/src/org/openstreetmap/josm/io/imagery/HTMLGrabber.java

@@ -3 +3 @@
 
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
@@ -11 +13 @@
 import javax.imageio.ImageIO;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.tools.Utils;
 
 public class HTMLGrabber extends WMSGrabber {
@@ -43 +47 @@
         }
 
-        BufferedImage img = layer.normalizeImage(ImageIO.read(browser.getInputStream()));
-        cache.saveImg(urlstring, img);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        Utils.copyStream(browser.getInputStream(), baos);
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        BufferedImage img = layer.normalizeImage(ImageIO.read(bais));
+        bais.reset();
+        layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+
         return img;
     }

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -6 +6 @@
 import java.awt.image.BufferedImage;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -34 +36 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.ProgressInputStream;
+import org.openstreetmap.josm.tools.Utils;
 
 
@@ -53 +56 @@
         try {
             url = getURL(
-                    b.min.east(), b.min.north(),
-                    b.max.east(), b.max.north(),
+                    b.minEast, b.minNorth,
+                    b.maxEast, b.maxNorth,
                     width(), height());
             request.finish(State.IMAGE, grab(url, attempt));
@@ -143 +146 @@
     @Override
     public boolean loadFromCache(WMSRequest request) {
-        URL url = null;
-        try{
-            url = getURL(
-                    b.min.east(), b.min.north(),
-                    b.max.east(), b.max.north(),
-                    width(), height());
-        } catch(Exception e) {
-            return false;
-        }
-        BufferedImage cached = cache.getImg(url.toString());
-        if((!request.isReal() && !layer.hasAutoDownload()) || cached != null){
-            if(cached == null){
-                request.finish(State.NOT_IN_CACHE, null);
-                return true;
-            }
+        BufferedImage cached = layer.cache.getExactMatch(Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+
+        if (cached != null) {
             request.finish(State.IMAGE, cached);
             return true;
-        }
+        } else if (request.isAllowPartialCacheMatch()) {
+            BufferedImage partialMatch = layer.cache.getPartialMatch(Main.proj, pixelPerDegree, b.minEast, b.minNorth);
+            if (partialMatch != null) {
+                request.finish(State.PARTLY_IN_CACHE, partialMatch);
+                return true;
+            }
+        }
+
+        if((!request.isReal() && !layer.hasAutoDownload())){
+            request.finish(State.NOT_IN_CACHE, null);
+            return true;
+        }
+
         return false;
     }
@@ -180 +183 @@
             throw new IOException(readException(conn));
 
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
         InputStream is = new ProgressInputStream(conn, null);
-        BufferedImage img = layer.normalizeImage(ImageIO.read(is));
-        is.close();
-
-        cache.saveImg(url.toString(), img);
+        try {
+            Utils.copyStream(is, baos);
+        } finally {
+            is.close();
+        }
+
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        BufferedImage img = layer.normalizeImage(ImageIO.read(bais));
+        bais.reset();
+        layer.cache.saveToCache(layer.isOverlapEnabled()?img:null, bais, Main.proj, pixelPerDegree, b.minEast, b.minNorth);
         return img;
     }

trunk/src/org/openstreetmap/josm/io/imagery/WMSRequest.java

@@ -11 +11 @@
     private final double pixelPerDegree;
     private final boolean real; // Download even if autodownloading is disabled
+    private final boolean allowPartialCacheMatch;
     private int priority;
     // Result
@@ -16 +17 @@
     private BufferedImage image;
 
-    public WMSRequest(int xIndex, int yIndex, double pixelPerDegree, boolean real) {
+    public WMSRequest(int xIndex, int yIndex, double pixelPerDegree, boolean real, boolean allowPartialCacheMatch) {
         this.xIndex = xIndex;
         this.yIndex = yIndex;
         this.pixelPerDegree = pixelPerDegree;
         this.real = real;
+        this.allowPartialCacheMatch = allowPartialCacheMatch;
     }
 
@@ -68 +70 @@
         if (yIndex != other.yIndex)
             return false;
+        if (allowPartialCacheMatch != other.allowPartialCacheMatch)
+            return false;
         return true;
     }
@@ -101 +105 @@
         return real;
     }
+
+    public boolean isAllowPartialCacheMatch() {
+        return allowPartialCacheMatch;
+    }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collection;
 
@@ -15 +19 @@
     }
 
-    public static <T> boolean exists(Iterable collection, Class<? extends T> klass) {
+    public static <T> boolean exists(Iterable<T> collection, Class<? extends T> klass) {
         for (Object item : collection) {
             if (klass.isInstance(item))
@@ -31 +35 @@
     }
 
-    public static <T> T find(Iterable collection, Class<? extends T> klass) {
+    @SuppressWarnings("unchecked")
+    public static <T> T find(Iterable<? super T> collection, Class<? extends T> klass) {
         for (Object item : collection) {
-            if (klass.isInstance(item)) {
-                @SuppressWarnings("unchecked") T res = (T) item;
-                return res;
-            }
+            if (klass.isInstance(item))
+                return (T) item;
         }
         return null;
@@ -60 +63 @@
             return b;
         } else {
-            if (a < c) {
+            if (a < c)
                 return a;
-            }
             return c;
         }
@@ -160 +162 @@
     }
 
+
+    public static int copyStream(InputStream source, OutputStream destination) throws IOException {
+        int count = 0;
+        byte[] b = new byte[512];
+        int read;
+        while ((read = source.read(b)) != -1) {
+            count += read;
+            destination.write(b, 0, read);
+        }
+        return count;
+    }
+
+
+
     public static Color complement(Color clr) {
         return new Color(255 - clr.getRed(), 255 - clr.getGreen(), 255 - clr.getBlue(), clr.getAlpha());
     }
+
+    public static boolean deleteDirectory(File path) {
+        if( path.exists() ) {
+            File[] files = path.listFiles();
+            for(int i=0; i<files.length; i++) {
+                if(files[i].isDirectory()) {
+                    deleteDirectory(files[i]);
+                }
+                else {
+                    files[i].delete();
+                }
+            }
+        }
+        return( path.delete() );
+    }
 }