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

dbg--

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-21 05:42:03 +01:00
parent 8890875a7f
commit 29189c77ff
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ 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;
@ -119,9 +118,6 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac
return false; return false;
} }
if (Map.debugTheme)
log.debug(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);
@ -258,21 +254,16 @@ 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.debug("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.debug("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);
@ -409,11 +400,9 @@ 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)
if (Map.debugTheme)
log.debug("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++) {
PointF p = mElement.getPoint(i); PointF p = mElement.getPoint(i);

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

@ -59,8 +59,6 @@ public abstract class Map {
void onMotionEvent(MotionEvent e); void onMotionEvent(MotionEvent e);
} }
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;