xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge JobTile into MapTile

Browse Source
This commit is contained in:
Hannes Janetzek
2013-04-22 11:35:05 +02:00
parent 55fc510d51
commit fbb4d1d2ae
17 changed files with 117 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/oscim/renderer/overlays/ExtrusionOverlay.java
View File

@@ -20,7 +20,7 @@ import java.nio.ShortBuffer;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.layers.tile.JobTile;
import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileRenderLayer;
import org.oscim.layers.tile.TileSet;
@@ -165,7 +165,7 @@ public class ExtrusionOverlay extends RenderOverlay {
private static ExtrusionLayer getLayer(MapTile t) {
if (t.layers != null && t.layers.extrusionLayers != null
&& t.state == JobTile.STATE_READY)
&& t.state == MapTile.STATE_READY)
return (ExtrusionLayer) t.layers.extrusionLayers;
return null;
}

6
src/org/oscim/renderer/overlays/TextOverlay.java
View File

@@ -32,7 +32,7 @@ import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.graphics.Color;
import org.oscim.graphics.Paint.Cap;
import org.oscim.layers.tile.JobTile;
import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.TileRenderLayer;
import org.oscim.layers.tile.TileSet;
@@ -462,7 +462,7 @@ public class TextOverlay extends BasicOverlay {
/* add way labels */
for (int i = 0, n = mTileSet.cnt; i < n; i++) {
MapTile t = tiles[i];
if (t.state != JobTile.STATE_READY)
if (t.state != MapTile.STATE_READY)
continue;
float dx = (float) (t.tileX * Tile.SIZE - tileX);
@@ -528,7 +528,7 @@ public class TextOverlay extends BasicOverlay {
/* add caption */
for (int i = 0, n = mTileSet.cnt; i < n; i++) {
MapTile t = tiles[i];
if (t.state != JobTile.STATE_READY)
if (t.state != MapTile.STATE_READY)
continue;
float dx = (float) (t.tileX * Tile.SIZE - tileX);