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

add theme debugging switch

Browse Source
This commit is contained in:
Hannes Janetzek 2013-10-06 21:09:49 +02:00
parent 6bc24595da
commit 19ee048582
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@ -23,6 +23,7 @@ import org.oscim.core.Tag;
import org.oscim.core.TagSet; import org.oscim.core.TagSet;
import org.oscim.core.Tile; import org.oscim.core.Tile;
import org.oscim.layers.tile.vector.labeling.WayDecorator; import org.oscim.layers.tile.vector.labeling.WayDecorator;
import org.oscim.map.Map;
import org.oscim.renderer.elements.ElementLayers; import org.oscim.renderer.elements.ElementLayers;
import org.oscim.renderer.elements.ExtrusionLayer; import org.oscim.renderer.elements.ExtrusionLayer;
import org.oscim.renderer.elements.LineLayer; import org.oscim.renderer.elements.LineLayer;
@ -102,8 +103,18 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
@Override @Override
public boolean executeJob(MapTile tile) { public boolean executeJob(MapTile tile) {
if (mTileDataSource == null) if (mTileDataSource == null) {
Log.d(TAG, "no tile source is set");
return false; return false;
}
if (renderTheme == null) {
Log.d(TAG, "no theme is set");
return false;
}
if (Map.debugTheme)
Log.d(TAG, tile.toString());
// account for area changes with latitude // account for area changes with latitude
double lat = MercatorProjection.toLatitude(tile.y); double lat = MercatorProjection.toLatitude(tile.y);
@ -213,8 +224,6 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
renderWay(renderTheme.matchElement(element.type, mFilteredTags, mTile.zoomLevel)); renderWay(renderTheme.matchElement(element.type, mFilteredTags, mTile.zoomLevel));
//boolean closed = element.type == GeometryType.POLY; //boolean closed = element.type == GeometryType.POLY;
//if (debug.debugTheme && ri == null)
// debugUnmatched(closed, element.tags);
mCurLineLayer = null; mCurLineLayer = null;
} }
@ -235,16 +244,21 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
//} //}
private void renderWay(RenderInstruction[] ri) { private void renderWay(RenderInstruction[] ri) {
if (ri == null) if (ri == null) {
if (Map.debugTheme)
Log.d(TAG, "no rule for way: " + mElement.tags);
return; return;
}
for (int i = 0, n = ri.length; i < n; i++) for (int i = 0, n = ri.length; i < n; i++)
ri[i].renderWay(this); ri[i].renderWay(this);
} }
private void renderNode(RenderInstruction[] ri) { private void renderNode(RenderInstruction[] ri) {
if (ri == null) if (ri == null) {
if (Map.debugTheme)
Log.d(TAG, "no rule for node: " + mElement.tags);
return; return;
}
for (int i = 0, n = ri.length; i < n; i++) for (int i = 0, n = ri.length; i < n; i++)
ri[i].renderNode(this); ri[i].renderNode(this);
@ -261,7 +275,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
if (line.stipple == 0) { if (line.stipple == 0) {
if (line.outline && mCurLineLayer == null) { if (line.outline && mCurLineLayer == null) {
Log.e(TAG, "BUG in theme: line must come before outline!"); Log.d(TAG, "missing line for outline! " + mElement.tags
+ " lvl:" + level + " layer:" + mElement.layer);
return; return;
} }
@ -347,7 +362,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
@Override @Override
public void renderPointText(Text text) { public void renderPointText(Text text) {
String value = mElement.tags.getValue(text.textKey); String value = mElement.tags.getValue(text.textKey);
if (value == null) if (value == null || value.length() == 0)
return; return;
for (int i = 0, n = mElement.getNumPoints(); i < n; i++) { for (int i = 0, n = mElement.getNumPoints(); i < n; i++) {
@ -359,7 +374,7 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
@Override @Override
public void renderWayText(Text text) { public void renderWayText(Text text) {
String value = mElement.tags.getValue(text.textKey); String value = mElement.tags.getValue(text.textKey);
if (value == null) if (value == null || value.length() == 0)
return; return;
int offset = 0; int offset = 0;
@ -381,7 +396,8 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
@Override @Override
public void renderPointSymbol(Symbol symbol) { public void renderPointSymbol(Symbol symbol) {
if (symbol.texture == null) { if (symbol.texture == null) {
Log.d(TAG, "missing symbol for " + mElement.tags.toString()); if (Map.debugTheme)
Log.d(TAG, "missing symbol for " + mElement.tags.toString());
return; return;
} }
for (int i = 0, n = mElement.getNumPoints(); i < n; i++) { for (int i = 0, n = mElement.getNumPoints(); i < n; i++) {

2
vtm/src/org/oscim/map/Map.java
View File

@ -42,6 +42,8 @@ public abstract class Map implements EventDispatcher {
private static final String TAG = Map.class.getName(); private static final String TAG = Map.class.getName();
public static final boolean debugTheme = false;
private final Layers mLayers; private final Layers mLayers;
private final Viewport mViewport; private final Viewport mViewport;
private final MapAnimator mAnimator; private final MapAnimator mAnimator;