boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

- concurrent loading of OSM tiles

Browse Source 
- added  a 4-time re-try in case that tile server does not respond

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7025 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 15 years ago
parent 670c746dc5
commit 388aa021c2
2 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File

6
htroot/osm.java
Unescape View File

@ -17,15 +17,19 @@ public class osm {
int zoom = 10; int zoom = 10;
double lat = 50.11670d; double lat = 50.11670d;
double lon = 8.68333d; double lon = 8.68333d;
int width = 3;
int height = 3;
if (post != null) { if (post != null) {
zoom = post.getInt("zoom", zoom); zoom = post.getInt("zoom", zoom);
lat = post.getDouble("lat", lat); lat = post.getDouble("lat", lat);
lon = post.getDouble("lon", lon); lon = post.getDouble("lon", lon);
width = post.getInt("width", width);
height = post.getInt("height", height);
} }
final OSMTile.tileCoordinates coord = new OSMTile.tileCoordinates(lat, lon, zoom); final OSMTile.tileCoordinates coord = new OSMTile.tileCoordinates(lat, lon, zoom);
return OSMTile.getCombinedTiles(coord); return OSMTile.getCombinedTiles(coord, width, height);
} }
} }

121
source/de/anomic/yacy/graphics/OSMTile.java
Unescape View File

@ -1,28 +1,26 @@
// ymageOSM.java /**
// (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany * OSMTile
// first published 12.02.2008 on http://yacy.net * Copyright 2008 by Michael Peter Christen
// * First released 12.02.2008 at http://yacy.net
// This is a part of YaCy, a peer-to-peer based web search engine *
// * $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ * $LastChangedRevision: 1986 $
// $LastChangedRevision: 1986 $ * $LastChangedBy: orbiter $
// $LastChangedBy: orbiter $ *
// * This library is free software; you can redistribute it and/or
// LICENSE * modify it under the terms of the GNU Lesser General Public
// * License as published by the Free Software Foundation; either
// This program is free software; you can redistribute it and/or modify * version 2.1 of the License, or (at your option) any later version.
// it under the terms of the GNU General Public License as published by *
// the Free Software Foundation; either version 2 of the License, or * This library is distributed in the hope that it will be useful,
// (at your option) any later version. * but WITHOUT ANY WARRANTY; without even the implied warranty of
// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// This program is distributed in the hope that it will be useful, * Lesser General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of *
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * You should have received a copy of the GNU Lesser General Public License
// GNU General Public License for more details. * along with this program in the file lgpl21.txt
// * If not, see <http://www.gnu.org/licenses/>.
// You should have received a copy of the GNU General Public License */
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package de.anomic.yacy.graphics; package de.anomic.yacy.graphics;
@ -31,6 +29,8 @@ import java.io.ByteArrayInputStream;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Random; import java.util.Random;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@ -48,30 +48,57 @@ public class OSMTile {
// helper methods to load map images from openstreetmap.org // helper methods to load map images from openstreetmap.org
public static RasterPlotter getCombinedTiles(final tileCoordinates t11) { /**
tileCoordinates t00, t10, t20, t01, t21, t02, t12, t22; * generate a image according to a given coordinate of a middle tile
t00 = new tileCoordinates(t11.xtile - 1, t11.ytile - 1, t11.zoom); * and a width and height of tile numbers. The tile number width and height must
t10 = new tileCoordinates(t11.xtile , t11.ytile - 1, t11.zoom); * always be impair since the given tile must be always in the middle
t20 = new tileCoordinates(t11.xtile + 1, t11.ytile - 1, t11.zoom); * @param t the middle tile
t01 = new tileCoordinates(t11.xtile - 1, t11.ytile , t11.zoom); * @param width number of tiles
t21 = new tileCoordinates(t11.xtile + 1, t11.ytile , t11.zoom); * @param height number of tiles
t02 = new tileCoordinates(t11.xtile - 1, t11.ytile + 1, t11.zoom); * @return the image
t12 = new tileCoordinates(t11.xtile , t11.ytile + 1, t11.zoom); */
t22 = new tileCoordinates(t11.xtile + 1, t11.ytile + 1, t11.zoom); public static RasterPlotter getCombinedTiles(final tileCoordinates t, int width, int height) {
final RasterPlotter m = new RasterPlotter(768, 768, RasterPlotter.MODE_REPLACE, "FFFFFF"); final int w = (width - 1) / 2;
BufferedImage bi; width = w * 2 + 1;
bi = getSingleTile(t00); if (bi != null) m.insertBitmap(getSingleTile(t00), 0, 0); final int h = (height - 1) / 2;
bi = getSingleTile(t10); if (bi != null) m.insertBitmap(getSingleTile(t10), 256, 0); height = h * 2 + 1;
bi = getSingleTile(t20); if (bi != null) m.insertBitmap(getSingleTile(t20), 512, 0); final RasterPlotter m = new RasterPlotter(256 * width, 256 * height, RasterPlotter.MODE_REPLACE, "FFFFFF");
bi = getSingleTile(t01); if (bi != null) m.insertBitmap(getSingleTile(t01), 0, 256); List<Place> tileLoader = new ArrayList<Place>();
bi = getSingleTile(t11); if (bi != null) m.insertBitmap(getSingleTile(t11), 256, 256); Place place;
bi = getSingleTile(t21); if (bi != null) m.insertBitmap(getSingleTile(t21), 512, 256); // start tile loading concurrently
bi = getSingleTile(t02); if (bi != null) m.insertBitmap(getSingleTile(t02), 0, 512); for (int i = 0; i < width; i++) {
bi = getSingleTile(t12); if (bi != null) m.insertBitmap(getSingleTile(t12), 256, 512); for (int j = 0; j < height; j++) {
bi = getSingleTile(t22); if (bi != null) m.insertBitmap(getSingleTile(t22), 512, 512); place = new Place(m, t.xtile - w + i, t.ytile - h + j, 256 * i, 256 * j, t.zoom);
place.start();
tileLoader.add(place);
}
}
// wait until all tiles are loaded
for (Place p: tileLoader) try { p.join(); } catch (InterruptedException e) {}
return m; return m;
} }
static class Place extends Thread {
RasterPlotter m;
int xt, yt, xc, yc, z;
public Place(RasterPlotter m, int xt, int yt, int xc, int yc, int z) {
this.m = m; this.xt = xt; this.yt = yt; this.xc = xc; this.yc = yc; this.z = z;
}
public void run() {
tileCoordinates t = new tileCoordinates(xt, yt, z);
BufferedImage bi = null;
for (int i = 0; i < 5; i++) {
bi = getSingleTile(t);
if (bi != null) {
m.insertBitmap(bi, xc, yc);
return;
}
// don't DoS OSM when trying again
try {Thread.sleep(300 + 100 * i);} catch (InterruptedException e) {}
}
}
}
public static BufferedImage getSingleTile(final tileCoordinates tile) { public static BufferedImage getSingleTile(final tileCoordinates tile) {
DigestURI tileURL; DigestURI tileURL;
try { try {
@ -102,7 +129,7 @@ public class OSMTile {
} }
} }
public static final Random r = new Random(System.currentTimeMillis()); // to selet tile server public static final Random r = new Random(System.currentTimeMillis()); // to select tile server
public static class tileCoordinates { public static class tileCoordinates {
int xtile, ytile, zoom; int xtile, ytile, zoom;

Write Preview
Loading…
Cancel
Save