Changeset 4065 in josm for trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

Timestamp:

2011-05-01T21:56:49+02:00 (15 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

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java (modified) (5 diffs)

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;
     }