- * The maximum possible zoom level of the MapView depends also on the current {@link MapGenerator}. For example, + * The maximum possible zoom level of the MapView depends also on the current {@link TileGenerator}. For example, * downloading map tiles may only be possible up to a certain zoom level. Setting a higher maximum zoom level has no * effect in this case. * diff --git a/src/org/oscim/view/generator/MapWorker.java b/src/org/oscim/view/generator/MapWorker.java index 5b0f7d90..1fdbb1d3 100644 --- a/src/org/oscim/view/generator/MapWorker.java +++ b/src/org/oscim/view/generator/MapWorker.java @@ -15,7 +15,7 @@ package org.oscim.view.generator; import org.oscim.utils.PausableThread; -import org.oscim.view.renderer.MapGenerator; +import org.oscim.view.renderer.TileGenerator; import org.oscim.view.renderer.MapRenderer; /** @@ -25,7 +25,7 @@ import org.oscim.view.renderer.MapRenderer; public class MapWorker extends PausableThread { private final String THREAD_NAME; private final JobQueue mJobQueue; - private final MapGenerator mMapGenerator; + private final TileGenerator mMapGenerator; private final MapRenderer mMapRenderer; // private final int mPrio; @@ -33,23 +33,23 @@ public class MapWorker extends PausableThread { /** * @param id * thread id - * @param mapGenerator + * @param tileGenerator * ... * @param mapRenderer * ... */ - public MapWorker(int id, JobQueue jobQueue, MapGenerator mapGenerator, + public MapWorker(int id, JobQueue jobQueue, TileGenerator tileGenerator, MapRenderer mapRenderer) { super(); mJobQueue = jobQueue; - mMapGenerator = mapGenerator; + mMapGenerator = tileGenerator; mMapRenderer = mapRenderer; THREAD_NAME = "MapWorker" + id; // mPrio = Math.max(Thread.MIN_PRIORITY + id, Thread.NORM_PRIORITY - 1); } - public MapGenerator getMapGenerator() { + public TileGenerator getMapGenerator() { return mMapGenerator; } diff --git a/src/org/oscim/view/renderer/MapTile.java b/src/org/oscim/view/renderer/MapTile.java index 63c00a1a..faee74e6 100644 --- a/src/org/oscim/view/renderer/MapTile.java +++ b/src/org/oscim/view/renderer/MapTile.java @@ -31,7 +31,7 @@ class MapTile extends JobTile { TextTexture texture; /** - * Tile data set by MapGenerator: + * Tile data set by TileGenerator: */ LineLayer lineLayers; PolygonLayer polygonLayers; diff --git a/src/org/oscim/view/renderer/MapGenerator.java b/src/org/oscim/view/renderer/TileGenerator.java similarity index 94% rename from src/org/oscim/view/renderer/MapGenerator.java rename to src/org/oscim/view/renderer/TileGenerator.java index 5c30c133..11b1753b 100644 --- a/src/org/oscim/view/renderer/MapGenerator.java +++ b/src/org/oscim/view/renderer/TileGenerator.java @@ -39,9 +39,9 @@ import android.util.Log; /** * */ -public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { +public class TileGenerator implements IRenderCallback, IMapDatabaseCallback { - private static String TAG = MapGenerator.class.getName(); + private static String TAG = TileGenerator.class.getName(); private static final double PI180 = (Math.PI / 180) / 1000000.0; private static final double PIx4 = Math.PI * 4; @@ -88,8 +88,8 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { private final Tag[] debugTagWay = { new Tag("debug", "way") }; private final Tag[] debugTagArea = { new Tag("debug", "area") }; private final float[] debugBoxCoords = { 0, 0, 0, Tile.TILE_SIZE, - Tile.TILE_SIZE, Tile.TILE_SIZE, Tile.TILE_SIZE, 0 }; - private final short[] debugBoxIndex = { 8 }; + Tile.TILE_SIZE, Tile.TILE_SIZE, Tile.TILE_SIZE, 0, 0, 0 }; + private final short[] debugBoxIndex = { 10 }; private float mProjectionScaleFactor; @@ -97,7 +97,7 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { * @param mapView * the MapView */ - public MapGenerator(MapView mapView) { + public TileGenerator(MapView mapView) { Log.d(TAG, "init DatabaseRenderer"); mMapView = mapView; } @@ -161,7 +161,7 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { // Log.d(TAG, "renderPointOfInterest: " + mTagName); // mNodeRenderInstructions = - MapGenerator.renderTheme.matchNode(this, tags, mCurrentTile.zoomLevel); + TileGenerator.renderTheme.matchNode(this, tags, mCurrentTile.zoomLevel); } @Override @@ -205,7 +205,7 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { // mRenderInstructions[i].renderWay(this, tags); // } - mRenderInstructions = MapGenerator.renderTheme.matchWay(this, tags, + mRenderInstructions = TileGenerator.renderTheme.matchWay(this, tags, (byte) (mCurrentTile.zoomLevel + 0), closed, true); @@ -221,10 +221,10 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { mTagName = new Tag("name", tags[0].key + ":" + tags[0].value, false); if (closed) { - mRenderInstructions = MapGenerator.renderTheme.matchWay(this, debugTagArea, + mRenderInstructions = TileGenerator.renderTheme.matchWay(this, debugTagArea, (byte) 0, true, true); } else { - mRenderInstructions = MapGenerator.renderTheme.matchWay(this, debugTagWay, + mRenderInstructions = TileGenerator.renderTheme.matchWay(this, debugTagWay, (byte) 0, true, true); } } @@ -438,7 +438,7 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { return false; } - mLevels = MapGenerator.renderTheme.getLevels(); + mLevels = TileGenerator.renderTheme.getLevels(); // limit stroke scale at z=17 if (tile.zoomLevel < STROKE_MAX_ZOOM_LEVEL) @@ -471,12 +471,12 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { + tile.toString(), false); mPoiX = Tile.TILE_SIZE >> 1; mPoiY = 10; - MapGenerator.renderTheme.matchNode(this, debugTagWay, (byte) 0); + TileGenerator.renderTheme.matchNode(this, debugTagWay, (byte) 0); mIndices = debugBoxIndex; mCoords = debugBoxCoords; mDrawingLayer = 10 * mLevels; - MapGenerator.renderTheme.matchWay(this, debugTagBox, (byte) 0, false, true); + TileGenerator.renderTheme.matchWay(this, debugTagBox, (byte) 0, false, true); } tile.lineLayers = mLineLayers; @@ -530,13 +530,13 @@ public class MapGenerator implements IRenderCallback, IMapDatabaseCallback { } public void setRenderTheme(RenderTheme theme) { - MapGenerator.renderTheme = theme; + TileGenerator.renderTheme = theme; } @Override public boolean checkWay(Tag[] tags, boolean closed) { - mRenderInstructions = MapGenerator.renderTheme.matchWay(this, tags, + mRenderInstructions = TileGenerator.renderTheme.matchWay(this, tags, (byte) (mCurrentTile.zoomLevel + 0), closed, false); return mRenderInstructions != null;