fix geohash's comparison according to base32 encoded comparison

0mok · Apr 22, 2015 · 12550a3 · 12550a3 · kungfoo · Apr 22, 2015
1 parent cdf0b9b
commit 12550a3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/main/java/ch/hsr/geohash/GeoHash.java b/src/main/java/ch/hsr/geohash/GeoHash.java
@@ -514,6 +514,11 @@ private long maskLastNBits(long value, long n) {
 
 	@Override
 	public int compareTo(GeoHash o) {
-		return new Long(bits).compareTo(o.bits);
+		int bitsCmp = Long.compare(bits ^ FIRST_BIT_FLAGGED, o.bits ^ FIRST_BIT_FLAGGED);
+		if (bitsCmp != 0){
+			return bitsCmp;
+		} else {
+			return Integer.compare(significantBits, o.significantBits);
+		}
 	}
 }
diff --git a/src/test/java/ch/hsr/geohash/GeoHashTest.java b/src/test/java/ch/hsr/geohash/GeoHashTest.java
@@ -536,4 +536,28 @@ public void testStepsBetween() {
 		assertEquals(steps, lonLess + latLess + latMore + lonMore + inBbox - latLessLonMore - latMoreLonLess - 1);
 
 	}
+
+	@Test
+	public void testCompareTo() {
+		GeoHash prevHash = null;
+		for (int i = 0; i < 1000000; i++) {
+			double latitude = rand.nextDouble() * 180 - 90;
+			double longitude = rand.nextDouble() * 360 - 180;
+			int numberOfBits = rand.nextInt(6) * 10 + 10;
+			GeoHash hash = GeoHash.withBitPrecision(latitude, longitude, numberOfBits);
+			if (i >= 1) {
+				String prevHashBase32 = prevHash.toBase32();
+				String hashBase32 = hash.toBase32();
+				String errorMessage = String.format("prev: %s, cur: %s", prevHashBase32, hashBase32);
+				if (prevHashBase32.compareTo(hashBase32) < 0) {
+					assertTrue(errorMessage, prevHash.compareTo(hash) < 0);
+				} else if (prevHashBase32.compareTo(hashBase32) > 0) {
+					assertTrue(errorMessage, prevHash.compareTo(hash) > 0);
+				} else {
+					assertTrue(errorMessage, prevHash.compareTo(hash) == 0);
+				}
+			}
+			prevHash = hash;
+		}
+	}
 }