From 29189c77ffcb2742642d733725bac82d61427348 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Tue, 21 Jan 2014 05:42:03 +0100 Subject: [PATCH] dbg-- --- .../layers/tile/vector/VectorTileLoader.java | 21 +++++-------------- vtm/src/org/oscim/map/Map.java | 2 -- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java index dacffc37..2fed90ca 100644 --- a/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java +++ b/vtm/src/org/oscim/layers/tile/vector/VectorTileLoader.java @@ -27,7 +27,6 @@ import org.oscim.core.Tag; import org.oscim.core.TagSet; import org.oscim.core.Tile; import org.oscim.layers.tile.vector.labeling.WayDecorator; -import org.oscim.map.Map; import org.oscim.renderer.elements.ElementLayers; import org.oscim.renderer.elements.ExtrusionLayer; import org.oscim.renderer.elements.LineLayer; @@ -119,9 +118,6 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac return false; } - if (Map.debugTheme) - log.debug(tile.toString()); - // account for area changes with latitude double lat = MercatorProjection.toLatitude(tile.y); @@ -258,21 +254,16 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac //} private void renderWay(RenderInstruction[] ri) { - if (ri == null) { - if (Map.debugTheme) - log.debug("no rule for way: " + mElement.tags); + if (ri == null) return; - } + for (int i = 0, n = ri.length; i < n; i++) ri[i].renderWay(this); } private void renderNode(RenderInstruction[] ri) { - if (ri == null) { - if (Map.debugTheme) - log.debug("no rule for node: " + mElement.tags); + if (ri == null) return; - } for (int i = 0, n = ri.length; i < n; i++) ri[i].renderNode(this); @@ -409,11 +400,9 @@ public class VectorTileLoader extends TileLoader implements IRenderTheme.Callbac @Override public void renderPointSymbol(Symbol symbol) { - if (symbol.texture == null) { - if (Map.debugTheme) - log.debug("missing symbol for " + mElement.tags.toString()); + if (symbol.texture == null) return; - } + for (int i = 0, n = mElement.getNumPoints(); i < n; i++) { PointF p = mElement.getPoint(i); diff --git a/vtm/src/org/oscim/map/Map.java b/vtm/src/org/oscim/map/Map.java index 9ee8f2b1..3295258b 100644 --- a/vtm/src/org/oscim/map/Map.java +++ b/vtm/src/org/oscim/map/Map.java @@ -59,8 +59,6 @@ public abstract class Map { void onMotionEvent(MotionEvent e); } - public static final boolean debugTheme = false; - private final Layers mLayers; private final Viewport mViewport; private final MapAnimator mAnimator;