Changeset 9494 in osm

Timestamp:

2008-08-06T14:04:13+02:00 (16 years ago)

Author:

stotz

Message:

Separate package for all interfaces; First draft of a file caching loader implementation

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• DefaultMapController.java (modified) (1 diff)
• Demo.java (modified) (3 diffs)
• JMapController.java (modified) (1 diff)
• JMapViewer.java (modified) (6 diffs)
• JobDispatcher.java (modified) (2 diffs)
• MapMarkerDot.java (modified) (1 diff)
• MemoryTileCache.java (modified) (6 diffs)
• OsmFileCacheTileLoader.java (added)
• OsmTileLoader.java (added)
• Tile.java (modified) (2 diffs)
• interfaces (added)
• interfaces/Job.java (moved) (moved from applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Job.java ) (1 diff)
• interfaces/MapMarker.java (moved) (moved from applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarker.java ) (2 diffs)
• interfaces/TileCache.java (moved) (moved from applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileCache.java ) (1 diff)
• interfaces/TileLoader.java (added)

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

@@ -47 +47 @@
         }
 
-        public void mouseMoved(MouseEvent e) {
-        }
-
         public void mouseClicked(MouseEvent e) {
                 if (doubleClickZoomEnabled && e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1)
                         map.zoomIn(e.getPoint());
-        }
-
-        public void mouseEntered(MouseEvent e) {
-        }
-
-        public void mouseExited(MouseEvent e) {
         }
 

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

@@ -13 +13 @@
 import javax.swing.JPanel;
 
+
 /**
  * 
@@ -26 +27 @@
                 setSize(400, 400);
                 final JMapViewer map = new JMapViewer();
+//              final JMapViewer map = new JMapViewer(new MemoryTileCache(),4);
+//              map.setTileLoader(new OsmFileCacheTileLoader(map,OsmTileLoader.MAP_MAPNIK));
+                new DefaultMapController(map);
                 setLayout(new BorderLayout());
                 setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -87 +91 @@
          */
         public static void main(String[] args) {
+//              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/JMapController.java

@@ -26 +26 @@
         public JMapController(JMapViewer map) {
                 this.map = map;
-                map.addMouseListener((MouseListener) this);
-                map.addMouseWheelListener((MouseWheelListener) this);
-                map.addMouseMotionListener((MouseMotionListener) this);
+                map.addMouseListener(this);
+                map.addMouseWheelListener(this);
+                map.addMouseMotionListener(this);
         }
 

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

@@ -12 +12 @@
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.util.LinkedList;
 import java.util.List;
@@ -27 +24 @@
 
 import org.openstreetmap.gui.jmapviewer.JobDispatcher.JobThread;
+import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 
 /**
@@ -49 +49 @@
         public static final int MIN_ZOOM = 0;
 
+        protected TileLoader tileLoader;
         protected TileCache tileCache;
         protected List<MapMarker> mapMarkerList;
@@ -90 +91 @@
         public JMapViewer(TileCache tileCache, int downloadThreadCount) {
                 super();
+                tileLoader = new OsmTileLoader(this);
                 this.tileCache = tileCache;
                 jobDispatcher = new JobDispatcher(downloadThreadCount);
@@ -442 +444 @@
                 }
                 if (!tile.isLoaded()) {
-                        jobDispatcher.addJob(new Job() {
-
-                                InputStream input = null;
-
-                                public void run() {
-                                        Tile tile = tileCache.getTile(tilex, tiley, zoom);
-                                        if (tile == null || tile.isLoaded())
-                                                return;
-                                        try {
-                                                // Thread.sleep(500);
-                                                URL url;
-                                                url = new URL("http://tile.openstreetmap.org/" + tile.getKey() + ".png");
-                                                HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
-                                                urlConn.setReadTimeout(30000); // 30 seconds read
-                                                // timeout
-                                                input = urlConn.getInputStream();
-                                                tile.setImage(ImageIO.read(input));
-                                                tile.setLoaded(true);
-                                                repaint();
-                                                input.close();
-                                                input = null;
-                                        } catch (Exception e) {
-                                                if (input == null /* || !input.isStopped() */)
-                                                        System.err.println("failed loading " + zoom + "/" + tilex + "/" + tiley
-                                                                        + " " + e.getMessage());
-                                        }
-                                }
-
-                                /**
-                                 * Terminating all transfers that are currently in progress
-                                 */
-                                public void stop() {
-
-                                        try {
-                                                // if (input != null)
-                                                // input.stop();
-                                        } catch (Exception e) {
-                                        }
-                                }
-                        });
+                        tileLoader.addLoadRequest(tilex, tiley, zoom);
                 }
                 return tile;
@@ -538 +501 @@
         }
 
+        public TileLoader getTileLoader() {
+                return tileLoader;
+        }
+
+        public void setTileLoader(TileLoader tileLoader) {
+                this.tileLoader = tileLoader;
+        }
+
 }

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

@@ -5 +5 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.Job;
 
 /**
@@ -55 +57 @@
                 public JobThread(int threadId) {
                         super("OSMJobThread " + threadId);
+                        setDaemon(true);
                         job = null;
                         start();

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

@@ -6 +6 @@
 import java.awt.Graphics;
 import java.awt.Point;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
 
 /**

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

@@ -5 +5 @@
 import java.util.Hashtable;
 import java.util.logging.Logger;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 
 /**
@@ -15 +17 @@
 public class MemoryTileCache implements TileCache {
 
-        private static final Logger log = Logger.getLogger(MemoryTileCache.class.getName());
+        protected static final Logger log = Logger.getLogger(MemoryTileCache.class.getName());
 
         /**
@@ -35 +37 @@
 
         public void addTile(Tile tile) {
-                CacheEntry entry = new CacheEntry(tile);
+                CacheEntry entry = createCacheEntry(tile);
                 hashtable.put(tile.getKey(), entry);
                 lruTiles.addFirst(entry);
                 if (hashtable.size() > cacheSize)
-                        removeOldTiles();
+                        removeOldEntries();
         }
 
@@ -56 +58 @@
          * Removes the least recently used tiles
          */
-        protected void removeOldTiles() {
+        protected void removeOldEntries() {
                 synchronized (lruTiles) {
                         try {
                                 while (lruTiles.getElementCount() > cacheSize) {
-                                        CacheEntry entry = lruTiles.getLastElement();
-                                        hashtable.remove(entry.tile.getKey());
-                                        lruTiles.removeEntry(entry);
+                                        removeEntry(lruTiles.getLastElement());
                                 }
                         } catch (Exception e) {
@@ -68 +68 @@
                         }
                 }
+        }
+
+        protected void removeEntry(CacheEntry entry) {
+                hashtable.remove(entry.tile.getKey());
+                lruTiles.removeEntry(entry);
+        }
+
+        protected CacheEntry createCacheEntry(Tile tile) {
+                return new CacheEntry(tile);
         }
 
@@ -87 +96 @@
                 this.cacheSize = cacheSize;
                 if (hashtable.size() > cacheSize)
-                        removeOldTiles();
+                        removeOldEntries();
         }
 

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

@@ -7 +7 @@
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 
 /**
@@ -22 +24 @@
         protected String key;
         protected boolean loaded = false;
+        protected boolean loading = false;
         public static final int WIDTH = 256;
         public static final int HEIGHT = 256;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/Job.java

@@ -1 @@
-package org.openstreetmap.gui.jmapviewer;
+package org.openstreetmap.gui.jmapviewer.interfaces;
 
 //License: GPL. Copyright 2008 by Jan Peter Stotz

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java

@@ -1 @@
-package org.openstreetmap.gui.jmapviewer;
+package org.openstreetmap.gui.jmapviewer.interfaces;
 
 //License: GPL. Copyright 2008 by Jan Peter Stotz
@@ -5 +5 @@
 import java.awt.Graphics;
 import java.awt.Point;
+
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
 
 /**

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileCache.java

@@ -1 @@
-package org.openstreetmap.gui.jmapviewer;
+package org.openstreetmap.gui.jmapviewer.interfaces;
+
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
+import org.openstreetmap.gui.jmapviewer.Tile;
 
 //License: GPL. Copyright 2008 by Jan Peter Stotz