Changeset 9784 in osm for applications/viewer

Timestamp:

2008-08-13T16:04:30+02:00 (16 years ago)

Author:

stotz

Message:

Outer map border added

Location:

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

Files:

• JMapViewer.java (modified) (6 diffs)
• StoppableInputStream.java (deleted)
• Tile.java (modified) (4 diffs)

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

@@ -103 +103 @@
                 setLayout(null);
                 initializeZoomSlider();
-                setMinimumSize(new Dimension(Tile.WIDTH, Tile.HEIGHT));
+                setMinimumSize(new Dimension(Tile.SIZE, Tile.SIZE));
                 setPreferredSize(new Dimension(400, 400));
                 try {
@@ -302 +302 @@
                 int iMove = 0;
 
-                int tilex = center.x / Tile.WIDTH;
-                int tiley = center.y / Tile.HEIGHT;
-                int off_x = (center.x % Tile.WIDTH);
-                int off_y = (center.y % Tile.HEIGHT);
-
-                int posx = getWidth() / 2 - off_x;
-                int posy = getHeight() / 2 - off_y;
+                int tilex = center.x / Tile.SIZE;
+                int tiley = center.y / Tile.SIZE;
+                int off_x = (center.x % Tile.SIZE);
+                int off_y = (center.y % Tile.SIZE);
+
+                int w2 = getWidth() / 2;
+                int h2 = getHeight() / 2;
+                int posx = w2 - off_x;
+                int posy = h2 - off_y;
 
                 int diff_left = off_x;
-                int diff_right = Tile.WIDTH - off_x;
+                int diff_right = Tile.SIZE - off_x;
                 int diff_top = off_y;
-                int diff_bottom = Tile.HEIGHT - off_y;
+                int diff_bottom = Tile.SIZE - off_y;
 
                 boolean start_left = diff_left < diff_right;
@@ -329 +331 @@
                                 iMove = 0;
                 } // calculate the visibility borders
-                int x_min = -Tile.WIDTH;
-                int y_min = -Tile.HEIGHT;
+                int x_min = -Tile.SIZE;
+                int y_min = -Tile.SIZE;
                 int x_max = getWidth();
                 int y_max = getHeight();
@@ -350 +352 @@
                                                         tile.paint(g, posx, posy);
                                                         if (tileGridVisible)
-                                                                g.drawRect(posx, posy, Tile.WIDTH, Tile.HEIGHT);
+                                                                g.drawRect(posx, posy, Tile.SIZE, Tile.SIZE);
                                                 }
                                         }
                                         Point p = move[iMove];
-                                        posx += p.x * Tile.WIDTH;
-                                        posy += p.y * Tile.HEIGHT;
+                                        posx += p.x * Tile.SIZE;
+                                        posy += p.y * Tile.SIZE;
                                         tilex += p.x;
                                         tiley += p.y;
@@ -371 +373 @@
                                 marker.paint(g, p);
                 }
+                // outer border of the map
+                int mapSize = Tile.SIZE << zoom;
+                g.drawRect(w2 - center.x, h2 - center.y, mapSize, mapSize);
         }
 
@@ -445 +450 @@
          *         was not found in the cache.
          */
-        protected Tile getTile(final int tilex, final int tiley, final int zoom) {
+        protected Tile getTile(int tilex, int tiley, int zoom) {
                 int max = (1 << zoom);
                 if (tilex < 0 || tilex >= max || tiley < 0 || tiley >= max)

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

@@ -31 +31 @@
         protected boolean loaded = false;
         protected boolean loading = false;
-        public static final int WIDTH = 256;
-        public static final int HEIGHT = 256;
+        public static final int SIZE = 256;
 
         /**
@@ -63 +62 @@
          */
         public void loadPlaceholderFromCache(TileCache cache) {
-                BufferedImage tmpImage = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
+                BufferedImage tmpImage = new BufferedImage(SIZE, SIZE, BufferedImage.TYPE_INT_RGB);
                 Graphics2D g = (Graphics2D) tmpImage.getGraphics();
                 // g.drawImage(image, 0, 0, null);
@@ -83 +82 @@
                                                 if (tile != null && tile.isLoaded()) {
                                                         paintedTileCount++;
-                                                        tile.paint(g, x * WIDTH, y * HEIGHT);
+                                                        tile.paint(g, x * SIZE, y * SIZE);
                                                 }
                                         }
@@ -100 +99 @@
                                 double scale = (double) factor;
                                 AffineTransform at = new AffineTransform();
-                                int translate_x = (xtile % factor) * WIDTH;
-                                int translate_y = (ytile % factor) * HEIGHT;
+                                int translate_x = (xtile % factor) * SIZE;
+                                int translate_y = (ytile % factor) * SIZE;
                                 at.setTransform(scale, 0, 0, scale, -translate_x, -translate_y);
                                 g.setTransform(at);