From 0cf7364c7808098c1a37f990c6fd3efa5283b7bc Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Sat, 28 Sep 2013 22:34:14 +0200
Subject: [PATCH] TextRenderer: cleanup, use label in loop

---
 .../tile/vector/labeling/TextRenderer.java    | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java b/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
index 5477abfb..61f1b71e 100644
--- a/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
+++ b/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
@@ -35,10 +35,10 @@ import org.oscim.map.Viewport;
 import org.oscim.renderer.ElementRenderer;
 import org.oscim.renderer.GLState;
 import org.oscim.renderer.MapRenderer.Matrices;
-import org.oscim.renderer.elements.RenderElement;
 import org.oscim.renderer.elements.ElementLayers;
 import org.oscim.renderer.elements.LineLayer;
 import org.oscim.renderer.elements.PolygonLayer;
+import org.oscim.renderer.elements.RenderElement;
 import org.oscim.renderer.elements.SymbolItem;
 import org.oscim.renderer.elements.SymbolLayer;
 import org.oscim.renderer.elements.TextItem;
@@ -49,7 +49,6 @@ import org.oscim.tiling.TileRenderer;
 import org.oscim.tiling.TileSet;
 import org.oscim.utils.FastMath;
 import org.oscim.utils.OBB2D;
-import org.oscim.utils.pool.LList;
 import org.oscim.utils.pool.Pool;
 
 class TextRenderer extends ElementRenderer {
@@ -122,11 +121,6 @@ class TextRenderer extends ElementRenderer {
 
 	//private final HashMap<MapTile, LabelTile> mActiveTiles;
 
-	class LabelTile {
-		Tile tile;
-		LList<Label> labels;
-	}
-
 	private float mSquareRadius;
 	private int mRelabelCnt;
 	private final TileRenderer mTileLayer;
@@ -476,7 +470,7 @@ class TextRenderer extends ElementRenderer {
 			float dy = (float) (t.tileY * Tile.SIZE - tileY);
 			dx = flipLongitude(dx, maxx);
 
-			for (TextItem ti = t.labels; ti != null; ti = ti.next) {
+			O: for (TextItem ti = t.labels; ti != null; ti = ti.next) {
 				if (!ti.text.caption)
 					continue;
 
@@ -499,28 +493,22 @@ class TextRenderer extends ElementRenderer {
 				                     l.text.fontHeight + MIN_CAPTION_DIST,
 				                     l.text.dy);
 
-				boolean overlaps = false;
-
 				for (Label lp = mLabels; lp != null;) {
 					if (l.bbox.overlaps(lp.bbox)) {
 						if (l.text.priority < lp.text.priority) {
 							lp = removeLabel(lp);
 							continue;
 						}
-
-						overlaps = true;
-						break;
+						continue O;
 					}
 					lp = (Label) lp.next;
 				}
 
-				if (!overlaps) {
-					addLabel(l);
-					l.item = TextItem.copy(ti);
-					l.tile = t;
-					l.active = mRelabelCnt;
-					l = null;
-				}
+				addLabel(l);
+				l.item = TextItem.copy(ti);
+				l.tile = t;
+				l.active = mRelabelCnt;
+				l = null;
 			}
 		}