Changeset 9619 in osm for applications/viewer/jmapviewer/src/org/openstreetmap

Timestamp:

2008-08-10T18:06:29+02:00 (16 years ago)

Author:

stotz

Message:

Usage of TileLoader completely changed

Location:

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

Files:

• JMapViewer.java (modified) (9 diffs)
• OsmFileCacheTileLoader.java (modified) (3 diffs)
• OsmTileLoader.java (modified) (2 diffs)
• interfaces/TileLoader.java (modified) (2 diffs)

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

@@ -43 +43 @@
          * Vectors for clock-wise tile painting
          */
-        protected static final Point[] move =
-                        { new Point(1, 0), new Point(0, 1), new Point(-1, 0), new Point(0, -1) };
+        protected static final Point[] move = { new Point(1, 0), new Point(0, 1),
+                        new Point(-1, 0), new Point(0, -1) };
 
         public static final int MAX_ZOOM = 18;
@@ -102 +102 @@
                 setPreferredSize(new Dimension(400, 400));
                 try {
-                        loadingImage =
-                                        ImageIO.read(JMapViewer.class.getResourceAsStream("images/hourglass.png"));
+                        loadingImage = ImageIO.read(JMapViewer.class
+                                        .getResourceAsStream("images/hourglass.png"));
                 } catch (Exception e1) {
                         loadingImage = null;
@@ -123 +123 @@
                 int size = 18;
                 try {
-                        ImageIcon icon = new ImageIcon(getClass().getResource("images/plus.png"));
+                        ImageIcon icon = new ImageIcon(getClass().getResource(
+                                        "images/plus.png"));
                         zoomInButton = new JButton(icon);
                 } catch (Exception e) {
@@ -139 +140 @@
                 add(zoomInButton);
                 try {
-                        ImageIcon icon = new ImageIcon(getClass().getResource("images/minus.png"));
+                        ImageIcon icon = new ImageIcon(getClass().getResource(
+                                        "images/minus.png"));
                         zoomOutButton = new JButton(icon);
                 } catch (Exception e) {
@@ -168 +170 @@
          */
         public void setDisplayPositionByLatLon(double lat, double lon, int zoom) {
-                setDisplayPositionByLatLon(new Point(getWidth() / 2, getHeight() / 2), lat, lon, zoom);
+                setDisplayPositionByLatLon(new Point(getWidth() / 2, getHeight() / 2),
+                                lat, lon, zoom);
         }
 
@@ -186 +189 @@
          *            {@link #MIN_ZOOM} <= zoom level <= {@link #MAX_ZOOM}
          */
-        public void setDisplayPositionByLatLon(Point mapPoint, double lat, double lon, int zoom) {
+        public void setDisplayPositionByLatLon(Point mapPoint, double lat,
+                        double lon, int zoom) {
                 int x = OsmMercator.LonToX(lon, zoom);
                 int y = OsmMercator.LatToY(lat, zoom);
@@ -193 +197 @@
 
         public void setDisplayPosition(int x, int y, int zoom) {
-                setDisplayPosition(new Point(getWidth() / 2, getHeight() / 2), x, y, zoom);
+                setDisplayPosition(new Point(getWidth() / 2, getHeight() / 2), x, y,
+                                zoom);
         }
 
@@ -329 +334 @@
                                         x++;
                                 for (int z = 0; z < x; z++) {
-                                        if (x_min <= posx && posx <= x_max && y_min <= posy && posy <= y_max) { // tile
+                                        if (x_min <= posx && posx <= x_max && y_min <= posy
+                                                        && posy <= y_max) { // tile
                                                 // is
                                                 // visible
@@ -444 +450 @@
                 }
                 if (!tile.isLoaded()) {
-                        tileLoader.addLoadRequest(tilex, tiley, zoom);
+                        jobDispatcher.addJob(tileLoader.createTileLoaderJob(tilex, tiley,
+                                        zoom));
                 }
                 return tile;

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

@@ -14 +14 @@
 import java.net.URLConnection;
 
+import org.openstreetmap.gui.jmapviewer.interfaces.Job;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -56 +57 @@
         }
 
-        public void addLoadRequest(final int tilex, final int tiley, final int zoom) {
-                map.jobDispatcher.addJob(new FileLoadJob(tilex, tiley, zoom));
-        }
-
-        protected class FileLoadJob implements Runnable {
+        public Job createTileLoaderJob(final int tilex, final int tiley, final int zoom) {
+                return new FileLoadJob(tilex, tiley, zoom);
+        }
+
+        protected class FileLoadJob implements Job {
                 InputStream input = null;
 
@@ -210 +211 @@
                         }
                 }
+
+                public void stop() {
+                }
         }
 

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

@@ -35 +35 @@
         }
 
-        public void addLoadRequest(final int tilex, final int tiley, final int zoom) {
-                map.jobDispatcher.addJob(new Job() {
+        public Job createTileLoaderJob(final int tilex, final int tiley,
+                        final int zoom) {
+                return new Job() {
 
                         InputStream input = null;
@@ -77 +78 @@
                                 }
                         }
-                });
+                };
         }
 

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

@@ -5 +5 @@
 /**
  * Interface for implementing a tile loader. Tiles are usually loaded via HTTP
- * or from a file. The {@link TileLoader} implementation is responsible for
- * performing the loading action asynchronously by creating a new
- * {@link Runnable} or {@link Job}.
+ * or from a file.
  * 
  * @author Jan Peter Stotz
@@ -14 +12 @@
 
         /**
-         * A typical {@link #addLoadRequest(int, int, int)} implementation should
-         * create a new {@link Job} instance that performs the load action. This
-         * {@link Job} instance is then handed over to
-         * <code>map.jobDispatcher</code>.
+         * A typical {@link #createTileLoaderJob(int, int, int)} implementation
+         * should create and return a new {@link Job} instance that performs the
+         * load action.
          * 
          * @param tilex
          * @param tiley
          * @param zoom
+         * @returns {@link Job} implementation that performs the desired load
+         *          action.
          */
-        public void addLoadRequest(int tilex, int tiley, int zoom);
+        public Job createTileLoaderJob(int tilex, int tiley, int zoom);
 }