Changeset 9618 in osm for applications

Timestamp:

2008-08-10T17:53:22+02:00 (16 years ago)

Author:

stotz

Message:

Small changes to the way tiles are loaded

Location:

applications/viewer/jmapviewer

Files:

• . (modified) (1 prop)
• .classpath (added)
• .project (added)
• .settings (added)
• .settings/org.eclipse.core.resources.prefs (added)
• bin (added)
• src/org/openstreetmap/gui/jmapviewer/Demo.java (modified) (5 diffs)
• src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (modified) (8 diffs)
• src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (modified) (3 diffs)
• src/org/openstreetmap/gui/jmapviewer/Tile.java (modified) (5 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java

@@ -13 +13 @@
 import javax.swing.JPanel;
 
-
 /**
  * 
@@ -23 +22 @@
 public class Demo extends JFrame {
 
+        private static final long serialVersionUID = 1L;
+
         public Demo() {
                 super("JMapViewer Demo");
                 setSize(400, 400);
                 final JMapViewer map = new JMapViewer();
-//              final JMapViewer map = new JMapViewer(new MemoryTileCache(),4);
-//              map.setTileLoader(new OsmFileCacheTileLoader(map,OsmTileLoader.MAP_MAPNIK));
+                // final JMapViewer map = new JMapViewer(new MemoryTileCache(),4);
+                // map.setTileLoader(new
+                // OsmFileCacheTileLoader(map,OsmTileLoader.MAP_MAPNIK));
                 new DefaultMapController(map);
                 setLayout(new BorderLayout());
@@ -35 +37 @@
                 JPanel panel = new JPanel();
                 add(panel, BorderLayout.NORTH);
-                JLabel label =
-                                new JLabel(
-                                                "Use right mouse button to move,\n left double click or mouse wheel to zoom.");
+                JLabel label = new JLabel(
+                                "Use right mouse button to move,\n left double click or mouse wheel to zoom.");
                 panel.add(label);
                 JButton button = new JButton("setDisplayToFitMapMarkers");
@@ -83 +84 @@
                 map.addMapMarker(new MapMarkerDot(49.807, 8.644));
 
-                //map.setDisplayPositionByLatLon(49.807, 8.6, 11);
-                //map.setTileGridVisible(true);
+                // map.setDisplayPositionByLatLon(49.807, 8.6, 11);
+                // map.setTileGridVisible(true);
         }
 
@@ -91 +92 @@
          */
         public static void main(String[] args) {
-//              Properties systemProperties = System.getProperties();
-//              systemProperties.setProperty("http.proxyHost","localhost");
-//              systemProperties.setProperty("http.proxyPort","8008");
+                // Properties systemProperties = System.getProperties();
+                // systemProperties.setProperty("http.proxyHost","localhost");
+                // systemProperties.setProperty("http.proxyPort","8008");
                 new Demo().setVisible(true);
         }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -13 +13 @@
 import java.net.URL;
 import java.net.URLConnection;
-
-import javax.imageio.ImageIO;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
@@ -90 +88 @@
                                         f = getTileFile(tile);
                                         fin = new FileInputStream(f);
-                                        tile.setImage(ImageIO.read(fin));
+                                        tile.loadImage(fin);
                                         fin.close();
                                         fileAge = f.lastModified();
@@ -129 +127 @@
                                 // }
                                 byte[] buffer = loadTileInBuffer(urlConn);
-                                tile.setImage(ImageIO.read(new ByteArrayInputStream(buffer)));
+                                tile.loadImage(new ByteArrayInputStream(buffer));
                                 tile.setLoaded(true);
                                 map.repaint();
@@ -136 +134 @@
                         } catch (Exception e) {
                                 if (input == null /* || !input.isStopped() */)
-                                        System.err.println("failed loading " + zoom + "/" + tilex + "/" + tiley + " "
-                                                        + e.getMessage());
+                                        System.err.println("failed loading " + zoom + "/" + tilex
+                                                        + "/" + tiley + " " + e.getMessage());
                         } finally {
                                 tile.loading = false;
@@ -143 +141 @@
                 }
 
-                protected byte[] loadTileInBuffer(URLConnection urlConn) throws IOException {
+                protected byte[] loadTileInBuffer(URLConnection urlConn)
+                                throws IOException {
                         input = urlConn.getInputStream();
-                        ByteArrayOutputStream bout = new ByteArrayOutputStream(input.available());
+                        ByteArrayOutputStream bout = new ByteArrayOutputStream(input
+                                        .available());
                         byte[] buffer = new byte[2048];
                         boolean finished = false;
@@ -175 +175 @@
                  * @throws IOException
                  */
-                protected boolean isOsmTileNewer(Tile tile, long fileAge) throws IOException {
+                protected boolean isOsmTileNewer(Tile tile, long fileAge)
+                                throws IOException {
                         URL url;
                         url = new URL(baseUrl + "/" + tile.getKey() + ".png");
-                        HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
+                        HttpURLConnection urlConn = (HttpURLConnection) url
+                                        .openConnection();
                         urlConn.setRequestMethod("HEAD");
                         urlConn.setReadTimeout(30000); // 30 seconds read
@@ -191 +193 @@
 
                 protected File getTileFile(Tile tile) throws IOException {
-                        return new File(tileCacheDir + "/" + tile.getZoom() + "_" + tile.getXtile() + "_"
-                                        + tile.getYtile() + FILE_EXT);
+                        return new File(tileCacheDir + "/" + tile.getZoom() + "_"
+                                        + tile.getXtile() + "_" + tile.getYtile() + FILE_EXT);
                 }
 
                 protected void saveTileToFile(Tile tile, byte[] rawData) {
                         try {
-                                FileOutputStream f =
-                                                new FileOutputStream(tileCacheDir + "/" + tile.getZoom() + "_"
-                                                                + tile.getXtile() + "_" + tile.getYtile() + FILE_EXT);
+                                FileOutputStream f = new FileOutputStream(tileCacheDir + "/"
+                                                + tile.getZoom() + "_" + tile.getXtile() + "_"
+                                                + tile.getYtile() + FILE_EXT);
                                 f.write(rawData);
                                 f.close();
                                 // System.out.println("Saved tile to file: " + tile);
                         } catch (Exception e) {
-                                System.err.println("Failed to save tile content: " + e.getLocalizedMessage());
+                                System.err.println("Failed to save tile content: "
+                                                + e.getLocalizedMessage());
                         }
                 }
@@ -230 +233 @@
 
         public void setTileCacheDir(String tileCacheDir) {
-                this.tileCacheDir = tileCacheDir;
-        }
-
-        
+                File dir = new File(tileCacheDir);
+                dir.mkdirs();
+                this.tileCacheDir = dir.getAbsolutePath();
+        }
+
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -7 +7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
-
-import javax.imageio.ImageIO;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.Job;
@@ -54 +52 @@
                                         // Thread.sleep(500);
                                         input = loadTileFromOsm(tile).getInputStream();
-                                        tile.setImage(ImageIO.read(input));
+                                        tile.loadImage(input);
                                         tile.setLoaded(true);
                                         map.repaint();
@@ -61 +59 @@
                                 } catch (Exception e) {
                                         if (input == null /* || !input.isStopped() */)
-                                                System.err.println("failed loading " + zoom + "/" + tilex + "/" + tiley
-                                                                + " " + e.getMessage());
+                                                System.err.println("failed loading " + zoom + "/"
+                                                                + tilex + "/" + tiley + " " + e.getMessage());
                                 } finally {
                                         tile.loading = false;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -7 +7 @@
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.imageio.ImageIO;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
@@ -55 +59 @@
          */
         public void loadPlaceholderFromCache(TileCache cache) {
-                BufferedImage tmpImage = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
+                BufferedImage tmpImage = new BufferedImage(WIDTH, HEIGHT,
+                                BufferedImage.TYPE_INT_RGB);
                 Graphics2D g = (Graphics2D) tmpImage.getGraphics();
                 // g.drawImage(image, 0, 0, null);
@@ -71 +76 @@
                                 for (int x = 0; x < factor; x++) {
                                         for (int y = 0; y < factor; y++) {
-                                                Tile tile = cache.getTile(xtile_high + x, ytile_high + y, zoom_high);
+                                                Tile tile = cache.getTile(xtile_high + x, ytile_high
+                                                                + y, zoom_high);
                                                 if (tile != null && tile.isLoaded()) {
                                                         paintedTileCount++;
@@ -134 +140 @@
         }
 
+        public void loadImage(InputStream input) throws IOException {
+                image = ImageIO.read(input);
+        }
+
         /**
          * @return key that identifies a tile
@@ -175 +185 @@
                         return false;
                 Tile tile = (Tile) obj;
-                return (xtile == tile.xtile) && (ytile == tile.ytile) && (zoom == tile.zoom);
+                return (xtile == tile.xtile) && (ytile == tile.ytile)
+                                && (zoom == tile.zoom);
         }