Merge branch 'jstastny-arrays-to-objects'

Author: chrismayer

src/main/java/de/meggsimum/w3w/Coordinates.java

@@ -0,0 +1,53 @@
+package de.meggsimum.w3w;
+
+public class Coordinates {
+    private double latitude;
+    private double longitude;
+
+    public Coordinates() {
+    }
+
+    public Coordinates(double latitude, double longitude) {
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Coordinates)) return false;
+
+        Coordinates that = (Coordinates) o;
+
+        if (Double.compare(that.latitude, latitude) != 0) return false;
+        return Double.compare(that.longitude, longitude) == 0;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        temp = Double.doubleToLongBits(latitude);
+        result = (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(longitude);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Coordinates{" +
+                "latitude=" + latitude +
+                ", longitude=" + longitude +
+                '}';
+    }
+}

src/main/java/de/meggsimum/w3w/ThreeWords.java

@@ -0,0 +1,70 @@
+package de.meggsimum.w3w;
+
+public class ThreeWords {
+    private String first;
+    private String second;
+    private String third;
+
+    public ThreeWords() {
+    }
+
+    public ThreeWords(String first, String second, String third) {
+        this.first = first;
+        this.second = second;
+        this.third = third;
+    }
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getSecond() {
+        return second;
+    }
+
+    public void setSecond(String second) {
+        this.second = second;
+    }
+
+    public String getThird() {
+        return third;
+    }
+
+    public void setThird(String third) {
+        this.third = third;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof ThreeWords)) return false;
+
+        ThreeWords that = (ThreeWords) o;
+
+        if (!first.equals(that.first)) return false;
+        if (!second.equals(that.second)) return false;
+        return third.equals(that.third);
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = first.hashCode();
+        result = 31 * result + second.hashCode();
+        result = 31 * result + third.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "ThreeWords{" +
+                "first='" + first + '\'' +
+                ", second='" + second + '\'' +
+                ", third='" + third + '\'' +
+                '}';
+    }
+}

src/main/java/de/meggsimum/w3w/What3Words.java

@@ -57,6 +57,15 @@ public What3Words(String apiKey, String language) {
 		this.language = language;
 	}
 
+	public Coordinates wordsToPosition(ThreeWords threeWords, String language) throws IOException, What3WordsException {
+		double[] doubleCoordinates = wordsToPosition(new String[]{threeWords.getFirst(), threeWords.getSecond(), threeWords.getThird()});
+		return new Coordinates(doubleCoordinates[0], doubleCoordinates[1]);
+	}
+
+	public Coordinates wordsToPosition(ThreeWords threeWords) throws IOException, What3WordsException {
+		return wordsToPosition(threeWords, this.language);
+	}
+
 	/**
 	 * Converts 3 words into a position specifying default language.
 	 *
@@ -90,7 +99,7 @@ public double[] wordsToPosition(String[] words, String language) throws IOExcept
 		try {
 			// parse the coordinates out of the JSON
 			JSONObject json = new JSONObject(response);
-			if (json.has("position") == true) {
+			if (json.has("position")) {
 				JSONArray jsonCoords = (JSONArray) json.get("position");
 				double[] coords = new double[2];
 				coords[0] = jsonCoords.getDouble(0);
@@ -114,6 +123,15 @@ public double[] wordsToPosition(String[] words, String language) throws IOExcept
 
 	}
 
+	public ThreeWords positionToWords(Coordinates coordinates, String language) throws IOException, What3WordsException {
+		String[] words = positionToWords(new double[]{coordinates.getLatitude(), coordinates.getLongitude()}, language);
+		return new ThreeWords(words[0], words[1], words[2]);
+	}
+
+	public ThreeWords positionToWords(Coordinates coordinates) throws IOException, What3WordsException {
+		return positionToWords(coordinates, this.language);
+	}
+
 	/**
 	 * Converts a position into a "w3w-address" with default language.
 	 *