diff --git a/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java index 42921d2c45..9eee1198af 100644 --- a/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java +++ b/DataExtractionOSM/src/net/osmand/map/TileSourceManager.java @@ -198,7 +198,6 @@ public class TileSourceManager { Map properties = new LinkedHashMap(); if(tm instanceof BeanShellTileSourceTemplate){ properties.put("rule", RULE_BEANSHELL); - properties.put("init_script", ((BeanShellTileSourceTemplate) tm).getInitScript()); } if(tm.getUrlTemplate() == null){ return; @@ -382,7 +381,6 @@ public class TileSourceManager { private static TileSourceTemplate createBeanshellTileSourceTemplate(Map attributes) { String name = attributes.get("name"); String urlTemplate = attributes.get("url_template"); - String initScript = attributes.get("init_script"); if (name == null || urlTemplate == null) { return null; } @@ -397,7 +395,7 @@ public class TileSourceManager { ellipsoid = true; } TileSourceTemplate templ; - templ = new BeanShellTileSourceTemplate(name, initScript, urlTemplate, ext, maxZoom, minZoom, tileSize, bitDensity, avgTileSize); + templ = new BeanShellTileSourceTemplate(name, urlTemplate, ext, maxZoom, minZoom, tileSize, bitDensity, avgTileSize); templ.setEllipticYTile(ellipsoid); return templ; } @@ -407,23 +405,15 @@ public class TileSourceManager { public static class BeanShellTileSourceTemplate extends TileSourceTemplate { Interpreter bshInterpreter; - protected String initScript; - public String getInitScript() { - return initScript; - } - - public BeanShellTileSourceTemplate(String name, String initScript, String urlToLoad, String ext, + public BeanShellTileSourceTemplate(String name, String urlToLoad, String ext, int maxZoom, int minZoom, int tileSize, int bitDensity, int avgSize) { super(name, urlToLoad, ext, maxZoom, minZoom, tileSize, bitDensity, avgSize); bshInterpreter = new Interpreter(); - this.initScript = initScript; - if (initScript != null) { - try { - bshInterpreter.eval(initScript); - } catch (bsh.EvalError e) { - log.error("Error executing the map init script " + initScript, e); - } + try { + bshInterpreter.eval(urlToLoad); + } catch (bsh.EvalError e) { + log.error("Error executing the map init script " + urlToLoad, e); } } @@ -433,7 +423,7 @@ public class TileSourceManager { bshInterpreter.set("x", x); bshInterpreter.set("y", y); bshInterpreter.set("z", zoom); - bshInterpreter.eval(urlToLoad); + bshInterpreter.eval("url = getTileUrl(z, x, y);"); return (String) bshInterpreter.get("url"); } catch (bsh.EvalError e) { return null; diff --git a/config/site/tile_sources.xml b/config/site/tile_sources.xml index 000173d1df..7514ca348f 100644 --- a/config/site/tile_sources.xml +++ b/config/site/tile_sources.xml @@ -8,15 +8,12 @@ + url_template="public static String eqt(int z, int x, int y) {static final char[] NUM_CHAR = { '0', '1', '2', '3' };char[] tn = new char[z];for (int i = z - 1; i >= 0; i--) {int num = (x % 2) | ((y % 2) << 1);tn[i] = NUM_CHAR[num];x >>= 1;y >>= 1;}return new String(tn);} String getTileUrl(int z, int x, int y) { return "http://" + "r" + "0" + ".ortho.tiles.virtualearth.net/tiles/" + "r" + eqt(z,x,y) + ".png" + "?g=45";}"/> + url_template="public static String eqt(int z, int x, int y) {static final char[] NUM_CHAR = { '0', '1', '2', '3' };char[] tn = new char[z];for (int i = z - 1; i >= 0; i--) {int num = (x % 2) | ((y % 2) << 1);tn[i] = NUM_CHAR[num];x >>= 1;y >>= 1;}return new String(tn);} String getTileUrl(int z, int x, int y) { return "http://" + "h" + "0" + ".ortho.tiles.virtualearth.net/tiles/" + "h" + eqt(z,x,y) + ".jpg" + "?g=45";}"/> - + url_template="public static String eqt(int z, int x, int y) {static final char[] NUM_CHAR = { '0', '1', '2', '3' };char[] tn = new char[z];for (int i = z - 1; i >= 0; i--) {int num = (x % 2) | ((y % 2) << 1);tn[i] = NUM_CHAR[num];x >>= 1;y >>= 1;}return new String(tn);} String getTileUrl(int z, int x, int y) { return "http://" + "a" + "0" + ".ortho.tiles.virtualearth.net/tiles/" + "a" + eqt(z,x,y) + ".jpg" + "?g=45";}"/> + @@ -25,7 +22,7 @@ - +