Changeset 4065 in josm for trunk/src/org/openstreetmap/josm/gui

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/gui

Files:

• MapSlider.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (7 diffs)
• layer/ImageryLayer.java (modified) (1 diff)
• layer/WMSLayer.java (modified) (16 diffs)

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