From e7a015a1d7f3a31493fae2e4716e7ad140337a91 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Fri, 2 May 2014 00:40:22 +0200
Subject: [PATCH] no need to pre-calc BoundingBox hashcode

---
 vtm/src/org/oscim/core/BoundingBox.java | 27 +++++++------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/vtm/src/org/oscim/core/BoundingBox.java b/vtm/src/org/oscim/core/BoundingBox.java
index d9050739..a33b8cdf 100644
--- a/vtm/src/org/oscim/core/BoundingBox.java
+++ b/vtm/src/org/oscim/core/BoundingBox.java
@@ -1,5 +1,6 @@
 /*
  * Copyright 2010, 2011, 2012 mapsforge.org
+ * Copyright 2014 Hannes Janetzek
  *
  * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
  *
@@ -52,11 +53,6 @@ public class BoundingBox {
 	 */
 	public final int minLongitudeE6;
 
-	/**
-	 * The hash code of this object.
-	 */
-	private final int hashCodeValue;
-
 	/**
 	 * @param minLatitudeE6
 	 *            the minimum latitude in microdegrees (degrees * 10^6).
@@ -72,7 +68,6 @@ public class BoundingBox {
 		this.minLongitudeE6 = minLongitudeE6;
 		this.maxLatitudeE6 = maxLatitudeE6;
 		this.maxLongitudeE6 = maxLongitudeE6;
-		this.hashCodeValue = calculateHashCode();
 	}
 
 	public BoundingBox(double minLatitude, double minLongitude, double maxLatitude,
@@ -81,7 +76,6 @@ public class BoundingBox {
 		this.minLongitudeE6 = (int) (minLongitude * 1E6);
 		this.maxLatitudeE6 = (int) (maxLatitude * 1E6);
 		this.maxLongitudeE6 = (int) (maxLongitude * 1E6);
-		this.hashCodeValue = calculateHashCode();
 	}
 
 	/**
@@ -158,7 +152,12 @@ public class BoundingBox {
 
 	@Override
 	public int hashCode() {
-		return hashCodeValue;
+		int result = 7;
+		result = 31 * result + maxLatitudeE6;
+		result = 31 * result + maxLongitudeE6;
+		result = 31 * result + minLatitudeE6;
+		result = 31 * result + minLongitudeE6;
+		return result;
 	}
 
 	@Override
@@ -188,18 +187,6 @@ public class BoundingBox {
 		    .toString();
 	}
 
-	/**
-	 * @return the hash code of this object.
-	 */
-	private int calculateHashCode() {
-		int result = 7;
-		result = 31 * result + maxLatitudeE6;
-		result = 31 * result + maxLongitudeE6;
-		result = 31 * result + minLatitudeE6;
-		result = 31 * result + minLongitudeE6;
-		return result;
-	}
-
 	/* code below is from osdmroid, @author Nicolas Gramlich */
 	public static BoundingBox fromGeoPoints(final List<? extends GeoPoint> partialPolyLine) {
 		int minLat = Integer.MAX_VALUE;