Code cleanup pass.

Organized and removed unused imports.
Re-formatted all java files.
Format tooling from the VS Code Language Support for Java(TM) by Red Hat
extension. Will consider Maven-based options in future.

Author: Tyler Coles

.gitignore

@@ -1,2 +1,4 @@
-.vscode/
+.vscode/*
+!.vscode/java-formatter.xml
+
 target/

.vscode/java-formatter.xml

@@ -21,7 +21,8 @@
 	</licenses>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+  	<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<!-- <buildNumber>is generated automatically (below)</buildNumber> -->
 	</properties>
@@ -34,8 +35,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.10.1</version>
 				<configuration>
-					<source>${java.version}</source>
-					<target>${java.version}</target>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
 

pom.xml

@@ -22,34 +22,41 @@
 import java.util.Map;
 
 /**
- * Implements the <a href="http://en.wikipedia.org/wiki/Geohash">Geohash</a> 
- * algorithm for hashing latitude and longitude points. Note: this implementation
- * is only "stable" with 12-character hashes. Decoding "s" and re-hashing the 
- * result yields "t40000000000". Decoding and re-hashing "t40000000000" yields 
- * the same. 12 characters was chosen because this gives us precision up to
- * one-millionth of a degree, like the rest of this library.
- * 
- * @author Tyler Coles
+ * Implements the <a href="http://en.wikipedia.org/wiki/Geohash">Geohash</a>
+ * algorithm for hashing latitude and longitude points. Note: this
+ * implementation is only "stable" with 12-character hashes. Decoding "s" and
+ * re-hashing the result yields "t40000000000". Decoding and re-hashing
+ * "t40000000000" yields the same. 12 characters was chosen because this gives
+ * us precision up to one-millionth of a degree, like the rest of this library.
  */
 public class Geohasher {
 
 	/**
-	 * <p>Number of hash characters supported.</p> 
-	 * <p>Translates to binary bits per value by the formula:</p>
-	 * <pre>BITS = ((PRECISION * 5) / 2) + PRECISION % 2.</pre>
-	 * <p>BITS in turn translates to numerical precision
-	 * by the formula:</p>
-	 * <pre>LATITUDE_ERROR = 90.0 / (2 ^ (BITS + 1))
-	 *LONGITUDE_ERROR = 180.0 / (2 ^ (BITS + 1))</pre>
+	 * <p>
+	 * Number of hash characters supported.
+	 * </p>
+	 * <p>
+	 * Translates to binary bits per value by the formula:
+	 * </p>
+	 * 
+	 * <pre>
+	 * BITS = ((PRECISION * 5) / 2) + PRECISION % 2.
+	 * </pre>
+	 * <p>
+	 * BITS in turn translates to numerical precision by the formula:
+	 * </p>
+	 * 
+	 * <pre>
+	 * LATITUDE_ERROR = 90.0 / (2 ^ (BITS + 1))
+	 *LONGITUDE_ERROR = 180.0 / (2 ^ (BITS + 1))
+	 * </pre>
 	 */
 	public static final int PRECISION = 12;
 	private static final int BITS = ((PRECISION * 5) / 2) + PRECISION % 2;
 	private static final double MAX_LAT = 90.0;
 	private static final double MAX_LNG = 180.0;
-	private static final char[] HASH_CHARS_ARRAY = new char[]{'0', '1', '2',
-			'3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-			'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
-			'z'};
+	private static final char[] HASH_CHARS_ARRAY = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b',
+			'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
 	private static final Map<Character, Integer> HASH_CHARS_MAP;
 	protected static final BigDecimal[] LAT_BIT_VALUES;
 	protected static final BigDecimal[] LNG_BIT_VALUES;
@@ -58,7 +65,7 @@ public class Geohasher {
 		BigDecimal lngValue = new BigDecimal(MAX_LNG);
 		LAT_BIT_VALUES = new BigDecimal[BITS];
 		LNG_BIT_VALUES = new BigDecimal[BITS];
-		
+
 		BigDecimal TWO = new BigDecimal("2");
 		for (int i = 0; i < BITS; i++) {
 			latValue = latValue.divide(TWO);
@@ -76,8 +83,8 @@ public class Geohasher {
 	/**
 	 * Decodes a geohash string to its LatLng equivalent.
 	 * 
-	 * @param hash the geohash string of any precision, although LatLng will 
-	 * still not become <em>more</em> precise than its settings.
+	 * @param hash the geohash string of any precision, although LatLng will still
+	 *             not become <em>more</em> precise than its settings.
 	 * @return the decoded point.
 	 */
 	public static LatLng decode(String hash) {
@@ -110,8 +117,7 @@ protected static BitSet hashToBits(String hash) {
 
 			return bits;
 		} catch (NullPointerException e) {
-			throw new IllegalArgumentException(
-					"Geohash string contains invalid characters.");
+			throw new IllegalArgumentException("Geohash string contains invalid characters.");
 		}
 	}
 
@@ -122,7 +128,7 @@ protected static BitSet hashToBits(String hash) {
 	 * @return two bit sets: [0] = even bits, [1] = odd bits
 	 */
 	protected static BitSet[] deInterleave(BitSet bits) {
-		BitSet[] sets = new BitSet[]{new BitStore(), new BitStore()};
+		BitSet[] sets = new BitSet[] { new BitStore(), new BitStore() };
 
 		int n = bits.size();
 		for (int i = 0; i < n; i++) {
@@ -133,12 +139,12 @@ protected static BitSet[] deInterleave(BitSet bits) {
 	}
 
 	/**
-	 * Converts the set of bits representing a single value to double.
-	 * The bit set passed into this function should already be de-interleaved.
+	 * Converts the set of bits representing a single value to double. The bit set
+	 * passed into this function should already be de-interleaved.
 	 * 
-	 * @param bits the bits for this value.
-	 * @param bitValues the correct set of pre-computed bit-values to use
-	 * for the particular value we are decoding: latitude or longitude. 
+	 * @param bits      the bits for this value.
+	 * @param bitValues the correct set of pre-computed bit-values to use for the
+	 *                  particular value we are decoding: latitude or longitude.
 	 * @return the value.
 	 */
 	protected static double bitsToDouble(BitSet bits, BigDecimal[] bitValues) {
@@ -153,11 +159,11 @@ protected static double bitsToDouble(BitSet bits, BigDecimal[] bitValues) {
 				value = value.subtract(bitValues[n - i - 1]);
 			}
 		}
-		
+
 		BigDecimal lastDelta2x = bitValues[n - 1].multiply(new BigDecimal(2));
 		BigDecimal roundingMin = lastValue.subtract(lastDelta2x);
 		BigDecimal roundingMax = lastValue.add(lastDelta2x);
-		
+
 		BigDecimal rounded = value.setScale(6, RoundingMode.HALF_UP);
 		if (rounded.compareTo(roundingMin) < 0 || rounded.compareTo(roundingMax) > 0) {
 			rounded = value.setScale(6, RoundingMode.HALF_DOWN);
@@ -201,7 +207,7 @@ protected static String bitsToHash(BitSet bits) {
 	 * Interleaves two sets of bits.
 	 * 
 	 * @param evenBits the bits to use for even bits. (0, 2, 4,...)
-	 * @param oddBits the bits to use for odd bits. (1, 3, 5,...)
+	 * @param oddBits  the bits to use for odd bits. (1, 3, 5,...)
 	 * @return the interleaved bits.
 	 */
 	protected static BitSet interleave(BitSet evenBits, BitSet oddBits) {
@@ -218,12 +224,12 @@ protected static BitSet interleave(BitSet evenBits, BitSet oddBits) {
 	}
 
 	/**
-	 * Converts a double value to its bit representation in the geohash 
+	 * Converts a double value to its bit representation in the geohash
 	 * specification.
 	 * 
-	 * @param value the value to encode.
-	 * @param maxRange the max range for the particular value we are
-	 * encoding: latitude = 90.0, longitude = 180.0.
+	 * @param value    the value to encode.
+	 * @param maxRange the max range for the particular value we are encoding:
+	 *                 latitude = 90.0, longitude = 180.0.
 	 * @return the bit set for this value.
 	 */
 	protected static BitSet doubleToBits(double value, double maxRange) {
@@ -247,13 +253,11 @@ protected static BitSet doubleToBits(double value, double maxRange) {
 	}
 
 	/**
-	 * Specialization of BitSet to <em>actually</em> keep track of
-	 * the number of bits that are being usefully employed, regardless
-	 * of whether or not they are 1 or 0. This requires that you call set
-	 * for 0's <em>and</em> 1's. Not all features are implemented, but setting, 
-	 * getting, and size work fine, which is all I need for this class.
-	 * 
-	 * @author Tyler Coles
+	 * Specialization of BitSet to <em>actually</em> keep track of the number of
+	 * bits that are being usefully employed, regardless of whether or not they are
+	 * 1 or 0. This requires that you call set for 0's <em>and</em> 1's. Not all
+	 * features are implemented, but setting, getting, and size work fine, which is
+	 * all I need for this class.
 	 */
 	protected static class BitStore extends BitSet {
 
@@ -271,7 +275,7 @@ public String toString() {
 				s = (get(i) ? "1" : "0") + s;
 			return s;
 		}
-		
+
 		@Override
 		public void set(int bitIndex) {
 			super.set(bitIndex);

src/main/java/com/javadocmd/simplelatlng/Geohasher.java

@@ -21,15 +21,15 @@
 import com.javadocmd.simplelatlng.util.LatLngConfig;
 
 /**
- * <p>A representation of a single point in latitude and longitude.
- * All data is handled in degrees and will be normalized if possible 
- * to the +/- 90 latitude, +/- 180 longitude region.</p>
- * 
- * <p>Note that attempting to create a LatLng with invalid values 
- * (NaN, negative infinity, positive infinity) will throw
- * IllegalArgumentExceptions.</p>
- * 
- * @author Tyler Coles
+ * <p>
+ * A representation of a single point in latitude and longitude. All data is
+ * handled in degrees and will be normalized if possible to the +/- 90 latitude,
+ * +/- 180 longitude region.
+ * </p>
+ * <p>
+ * Note that attempting to create a LatLng with invalid values (NaN, negative
+ * infinity, positive infinity) will throw IllegalArgumentExceptions.
+ * </p>
  */
 public class LatLng implements Serializable {
 
@@ -47,19 +47,18 @@ public static LatLng random() {
 	/**
 	 * Creates a random latitude and longitude. (Not inclusive of (-90, 0))
 	 * 
-	 * @param r the random number generator to use, if you want to be 
-	 * specific or are creating many LatLngs at once.
+	 * @param r the random number generator to use, if you want to be specific or
+	 *          are creating many LatLngs at once.
 	 * @return the random LatLng.
 	 */
 	public static LatLng random(Random r) {
-		return new LatLng((r.nextDouble() * -180.0) + 90.0,
-				(r.nextDouble() * -360.0) + 180.0);
+		return new LatLng((r.nextDouble() * -180.0) + 90.0, (r.nextDouble() * -360.0) + 180.0);
 	}
 
 	/**
-	 * Tests whether two angles fall within the tolerance
-	 * allowed in {@link com.javadocmd.simplelatlng.util.LatLngConfig}. Ignores
-	 * NaN and infinite values, returning false in either case.
+	 * Tests whether two angles fall within the tolerance allowed in
+	 * {@link com.javadocmd.simplelatlng.util.LatLngConfig}. Ignores NaN and
+	 * infinite values, returning false in either case.
 	 * 
 	 * @param degree1 one degree angle.
 	 * @param degree2 another degree angle.
@@ -70,8 +69,7 @@ public static boolean degreesEqual(double degree1, double degree2) {
 			return false;
 		if (Double.isInfinite(degree1) || Double.isInfinite(degree2))
 			return false;
-		return LatLngConfig.doubleToLong(degree1) == LatLngConfig
-				.doubleToLong(degree2);
+		return LatLngConfig.doubleToLong(degree1) == LatLngConfig.doubleToLong(degree2);
 	}
 
 	private long latitude;
@@ -80,7 +78,7 @@ public static boolean degreesEqual(double degree1, double degree2) {
 	/**
 	 * Creates a LatLng point.
 	 * 
-	 * @param latitude the latitude in degrees.
+	 * @param latitude  the latitude in degrees.
 	 * @param longitude the longitude in degrees.
 	 */
 	public LatLng(double latitude, double longitude) {
@@ -97,8 +95,8 @@ public double getLatitude() {
 	}
 
 	/**
-	 * Get the internal long representation of this point's latitude
-	 * in degrees. Intended for library use only.
+	 * Get the internal long representation of this point's latitude in degrees.
+	 * Intended for library use only.
 	 * 
 	 * @return the internal representation of latitude in degrees.
 	 */
@@ -116,8 +114,8 @@ public double getLongitude() {
 	}
 
 	/**
-	 * Get the internal long representation of this point's longitude
-	 * in degrees. Intended for library use only.
+	 * Get the internal long representation of this point's longitude in degrees.
+	 * Intended for library use only.
 	 * 
 	 * @return the internal representation of longitude in degrees.
 	 */
@@ -128,7 +126,7 @@ public long getLongitudeInternal() {
 	/**
 	 * Sets the latitude and longitude for this point.
 	 * 
-	 * @param latitude the latitude in degrees.
+	 * @param latitude  the latitude in degrees.
 	 * @param longitude the longitude in degrees.
 	 */
 	public void setLatitudeLongitude(double latitude, double longitude) {
@@ -162,12 +160,13 @@ private void setLongitude(double longitude) {
 	}
 
 	/**
-	 * @return true if this LatLng represents a polar coordinate (+/- 90 degrees latitude).
+	 * @return true if this LatLng represents a polar coordinate (+/- 90 degrees
+	 *         latitude).
 	 */
 	public boolean isPolar() {
 		return this.latitude == 90000000L || this.latitude == -90000000L;
 	}
-	
+
 	@Override
 	public boolean equals(Object obj) {
 		if (obj == this)
@@ -193,8 +192,7 @@ public int hashCode() {
 
 	@Override
 	public String toString() {
-		return String.format("(%s,%s)",
-				LatLngConfig.getDegreeFormat().format(LatLngConfig.longToDouble(this.latitude)),
+		return String.format("(%s,%s)", LatLngConfig.getDegreeFormat().format(LatLngConfig.longToDouble(this.latitude)),
 				LatLngConfig.getDegreeFormat().format(LatLngConfig.longToDouble(this.longitude)));
 	}
 }