Index: applications/viewer/jmapviewer/Readme.txt
===================================================================
--- applications/viewer/jmapviewer/Readme.txt (revision 9263)
+++ applications/viewer/jmapviewer/Readme.txt (revision 9263)
@@ -0,0 +1,24 @@
+JMapViewer
+
+(c) 2008 Jan Peter Stotz
+
+License: GPL
+
+FAQ:
+
+1. What is JMapViewer?
+
+JMapViewer is a Java Swing component for integrating OSM maps in to your Java
+application. JMapViewer allows you to set markers on the map or zoom to a specific
+location on the map.
+
+2. How does JMapViewer work?
+
+JMapViewer loads bitmap tiles from the OpenStreetmap tile server (Mapnik renderer).
+Therefore any application using JMapViewer requires a working internet connection.
+
+3. How do I use JMapViewer in my application?
+
+You can just create an instance of the class org.openstreetmap.gui.jmapviewer.JMapViewer
+using the default constructor and add it to your panel/frame/windows.
+For more details please see the Demo class in the same package.
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 9245)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 9263)
@@ -79,5 +79,6 @@
map.addMapMarker(new MapMarkerDot(49.807, 8.644));
- // map.setDisplayPositionByLatLon(49.807, 8.644, 11);
+ map.setDisplayPositionByLatLon(49.807, 8.6, 11);
+ //map.setTileGridVisible(true);
}
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 9245)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 9263)
@@ -304,23 +304,14 @@
Tile tile = getTile(tilex, tiley_tmp, zoom);
if (tile != null) {
- if (!tile.isLoaded()) {
- // Paint stretched preview from the next lower zoom
- // level (if already loaded)
- Tile parent = tile.getParentTile(tileCache);
- if (parent != null && parent.isLoaded()) {
- int parentx = tile.getXtile() % 2;
- int parenty = tile.getYtile() % 2;
- parent.parentPaint(g, x, y, parentx, parenty);
- } else
- tile.paint(g, x, y);
- } else
- tile.paint(g, x, y);
+ tile.paint(g, x, y);
+ if (tileGridVisible)
+ g.drawRect(x, y, Tile.WIDTH, Tile.HEIGHT);
}
- if (tileGridVisible)
- g.drawRect(x, y, Tile.WIDTH, Tile.HEIGHT);
tiley_tmp++;
}
tilex++;
}
+ g.fillOval(getWidth()/2 - 5, getHeight()/2 - 5, 10, 10);
+ g.drawString("Test", 50, 10);
if (!mapMarkersVisible || mapMarkerList == null)
return;
@@ -400,4 +391,5 @@
tile = new Tile(tilex, tiley, zoom, loadingImage);
tileCache.addTile(tile);
+ tile.loadPlaceholderFromCache(tileCache);
}
if (!tile.isLoaded()) {
@@ -409,5 +401,5 @@
return;
try {
- // Thread.sleep(500);
+ Thread.sleep(500);
tile.loadTileImage();
repaint();
@@ -470,3 +462,7 @@
}
+ public TileCache getTileCache() {
+ return tileCache;
+ }
+
}
Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java
===================================================================
--- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java (revision 9245)
+++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java (revision 9263)
@@ -4,4 +4,6 @@
import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.io.DataInputStream;
@@ -53,4 +55,60 @@
/**
+ * Tries to get tiles of a lower or higher zoom level (one or two level
+ * difference) from cache and use it as a placeholder until the tile has
+ * been loaded.
+ */
+ public void loadPlaceholderFromCache(TileCache cache) {
+ BufferedImage tmpImage = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
+ Graphics2D g = (Graphics2D) tmpImage.getGraphics();
+ // g.drawImage(image, 0, 0, null);
+ for (int zoomDiff = 1; zoomDiff < 3; zoomDiff++) {
+ // first we check if there are already the 2^x tiles
+ // of a higher detail level
+ int zoom_high = zoom + zoomDiff;
+ if (zoom_high <= JMapViewer.MAX_ZOOM) {
+ int factor = 1 << zoomDiff;
+ int xtile_high = xtile << zoomDiff;
+ int ytile_high = ytile << zoomDiff;
+ double scale = 1.0 / factor;
+ g.setTransform(AffineTransform.getScaleInstance(scale, scale));
+ int paintedTileCount = 0;
+ 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);
+ if (tile != null && tile.isLoaded()) {
+ paintedTileCount++;
+ tile.paint(g, x * WIDTH, y * HEIGHT);
+ }
+ }
+ }
+ if (paintedTileCount == factor * factor) {
+ image = tmpImage;
+ return;
+ }
+ }
+
+ int zoom_low = zoom - zoomDiff;
+ if (zoom_low >= JMapViewer.MIN_ZOOM) {
+ int xtile_low = xtile >> zoomDiff;
+ int ytile_low = ytile >> zoomDiff;
+ int factor = (1 << zoomDiff);
+ double scale = (double) factor;
+ AffineTransform at = new AffineTransform();
+ int translate_x = (xtile % factor) * WIDTH;
+ int translate_y = (ytile % factor) * HEIGHT;
+ at.setTransform(scale, 0, 0, scale, -translate_x, -translate_y);
+ g.setTransform(at);
+ Tile tile = cache.getTile(xtile_low, ytile_low, zoom_low);
+ if (tile != null && tile.isLoaded()) {
+ tile.paint(g, 0, 0);
+ image = tmpImage;
+ return;
+ }
+ }
+ }
+ }
+
+ /**
* @return tile number on the x axis of this tile
*/
@@ -88,19 +146,4 @@
}
- /**
- * Retrieves the "parent tile" from the specified tile cache. A parent tile
- * is the tile of a lower zoom level (coarser resolution) at the same
- * position of the map. Parent tiles are used for a preview until the tile
- * has been loaded.
- *
- * @param tileCache
- * @return
- */
- public Tile getParentTile(TileCache tileCache) {
- if (zoom < 1)
- return null;
- return tileCache.getTile(xtile / 2, ytile / 2, zoom - 1);
- }
-
public synchronized void loadTileImage() throws IOException {
if (loaded)
@@ -132,43 +175,5 @@
if (image == null)
return;
- /*
- * if (image.getHeight() < OSMMap.TILE_HEIGHT || image.getWidth() <
- * OSMMap.TILE_WIDTH) { x += (OSMMap.TILE_WIDTH - image.getWidth()) / 2;
- * y += (OSMMap.TILE_HEIGHT - image.getHeight()) / 2; }
- */
g.drawImage(image, x, y, null);
- }
-
- public void paint(Graphics g, int x, int y, int stretch) {
- if (image == null)
- return;
- int tx = x * stretch;
- int ty = y = stretch;
- g.drawImage(image, x, y, tx, ty, 0, 0, image.getWidth(), image.getHeight(), null);
- }
-
- /**
- * Paints one-fourth of the tile image {@link Graphics} g at
- * the position x/y.
- *
- * @param g
- * @param x
- * @param y
- * @param partx
- * (0 or 1) selects if the left or right part of tile should be
- * painted
- * @param party
- * (0 or 1) selects if the upper or lower part of tile should be
- * painted
- */
- public void parentPaint(Graphics g, int x, int y, int partx, int party) {
- int sx = 0;
- int sy = 0;
- if (partx == 1)
- sx = WIDTH_HALF;
- if (party == 1)
- sy = HEIGHT_HALF;
- g.drawImage(image, x, y, x + WIDTH, y + HEIGHT, sx, sy, sx + WIDTH_HALF, sy + HEIGHT_HALF,
- null);
}