From 246d692dd7d5114ed65679afdd55d47ce99749c2 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Wed, 29 Jan 2014 00:59:24 +0100
Subject: [PATCH] cleanup: marker layer

---
 vtm/src/org/oscim/layers/marker/ItemizedIconLayer.java |  2 +-
 vtm/src/org/oscim/layers/marker/ItemizedLayer.java     | 10 +++++-----
 vtm/src/org/oscim/layers/marker/MarkerItem.java        |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/vtm/src/org/oscim/layers/marker/ItemizedIconLayer.java b/vtm/src/org/oscim/layers/marker/ItemizedIconLayer.java
index 0b97a4d2..24b1641c 100644
--- a/vtm/src/org/oscim/layers/marker/ItemizedIconLayer.java
+++ b/vtm/src/org/oscim/layers/marker/ItemizedIconLayer.java
@@ -192,8 +192,8 @@ public class ItemizedIconLayer<Item extends MarkerItem> extends ItemizedLayer<It
 			float dx = (float) (mTmpPoint.x - eventX);
 			float dy = (float) (mTmpPoint.y - eventY);
 
-			double d = dx * dx + dy * dy;
 			// squared dist: 50*50 pixel
+			double d = dx * dx + dy * dy;
 			if (d < 2500) {
 				if (d < dist) {
 					dist = d;
diff --git a/vtm/src/org/oscim/layers/marker/ItemizedLayer.java b/vtm/src/org/oscim/layers/marker/ItemizedLayer.java
index 105450a5..c0cf4af7 100644
--- a/vtm/src/org/oscim/layers/marker/ItemizedLayer.java
+++ b/vtm/src/org/oscim/layers/marker/ItemizedLayer.java
@@ -102,12 +102,12 @@ public abstract class ItemizedLayer<Item extends MarkerItem> extends MarkerLayer
 
 			mMap.getViewport().getMapViewProjection(mBox);
 
-			float flipMax = (float) (Tile.SIZE * pos.scale) / 2;
 			/** increase view to show items that are partially visible */
 			for (int i = 0; i < 8; i++)
 				// should suffice for reasonable large items
 				mBox[i] += mBox[i] > 0 ? 100 : -100;
 
+			long flip = (long) (Tile.SIZE * pos.scale) >> 1;
 
 			synchronized (lock) {
 				if (mItems == null) {
@@ -124,10 +124,10 @@ public abstract class ItemizedLayer<Item extends MarkerItem> extends MarkerLayer
 					it.x = (float) ((it.px - mx) * scale);
 					it.y = (float) ((it.py - my) * scale);
 
-					if (it.x > flipMax)
-						it.x -= (flipMax * 2);
-					else if (it.x < -flipMax)
-						it.x += (flipMax * 2);
+					if (it.x > flip)
+						it.x -= (flip << 1);
+					else if (it.x < -flip)
+						it.x += (flip << 1);
 
 					if (!GeometryUtils.pointInPoly(it.x, it.y, mBox, 8, 0)) {
 						if (it.visible) {
diff --git a/vtm/src/org/oscim/layers/marker/MarkerItem.java b/vtm/src/org/oscim/layers/marker/MarkerItem.java
index dfd1f537..d755d424 100644
--- a/vtm/src/org/oscim/layers/marker/MarkerItem.java
+++ b/vtm/src/org/oscim/layers/marker/MarkerItem.java
@@ -65,8 +65,7 @@ public class MarkerItem {
 		this(null, title, description, geoPoint);
 	}
 
-	public MarkerItem(String uid, String title, String description,
-	        GeoPoint geoPoint) {
+	public MarkerItem(String uid, String title, String description, GeoPoint geoPoint) {
 		mTitle = title;
 		mDescription = description;
 		mGeoPoint = geoPoint;