Merge pull request #104 from Wikidata/issue_#103

Fixed #issue103
Wikidata · Nov 23, 2014 · 68277ef · 68277ef
2 parents 2eee12c + b1bfb59
commit 68277ef
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/...atamodel/src/main/java/org/wikidata/wdtk/datamodel/json/jackson/JacksonObjectFactory.java b/...atamodel/src/main/java/org/wikidata/wdtk/datamodel/json/jackson/JacksonObjectFactory.java
@@ -121,7 +121,9 @@ public TimeValue getTimeValue(long year, byte month, byte day, byte hour,
 	public GlobeCoordinatesValue getGlobeCoordinatesValue(long latitude,
 			long longitude, long precision, String globeIri) {
 		JacksonInnerGlobeCoordinates innerCoordinates = new JacksonInnerGlobeCoordinates(
-				latitude, longitude, precision, globeIri);
+				((double)latitude / GlobeCoordinatesValue.PREC_DEGREE), 
+				((double)longitude / GlobeCoordinatesValue.PREC_DEGREE), 
+				((double)precision / GlobeCoordinatesValue.PREC_DEGREE), globeIri);
 		JacksonValueGlobeCoordinates result = new JacksonValueGlobeCoordinates();
 		result.setValue(innerCoordinates);
 		return result;

diff --git a/...ava/org/wikidata/wdtk/datamodel/json/jackson/datavalues/JacksonInnerGlobeCoordinates.java b/...ava/org/wikidata/wdtk/datamodel/json/jackson/datavalues/JacksonInnerGlobeCoordinates.java
@@ -35,9 +35,9 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class JacksonInnerGlobeCoordinates {
 
-	private long latitude = 0;
-	private long longitude = 0;
-	private long precision = 0;
+	private double latitude = 0;
+	private double longitude = 0;
+	private double precision = 0;
 	private String globe = GlobeCoordinatesValue.GLOBE_EARTH;
 
 	/**
@@ -55,8 +55,8 @@ public JacksonInnerGlobeCoordinates() {
 	 * @param precision
 	 * @param globe
 	 */
-	public JacksonInnerGlobeCoordinates(long latitude, long longitude,
-			long precision, String globe) {
+	public JacksonInnerGlobeCoordinates(double latitude, double longitude,
+			double precision, String globe) {
 		this.latitude = latitude;
 		this.longitude = longitude;
 		this.precision = precision;
@@ -69,8 +69,8 @@ public JacksonInnerGlobeCoordinates(long latitude, long longitude,
 	 * @see GlobeCoordinatesValue#getLatitude()
 	 * @return latitude
 	 */
-	public long getLatitude() {
-		return latitude;
+	public double getLatitude() {
+		return this.latitude;
 	}
 
 	/**
@@ -80,18 +80,18 @@ public long getLatitude() {
 	 * @param latitude
 	 *            new value
 	 */
-	public void setLatitude(long latitude) {
+	public void setLatitude(double latitude) {
 		this.latitude = latitude;
 	}
 
 	/**
 	 * Returns the longitude.
 	 *
 	 * @see GlobeCoordinatesValue#getLongitude()
-	 * @return lngitude
+	 * @return longitude
 	 */
-	public long getLongitude() {
-		return longitude;
+	public double getLongitude() {
+		return this.longitude;
 	}
 
 	/**
@@ -101,7 +101,7 @@ public long getLongitude() {
 	 * @param longitude
 	 *            new value
 	 */
-	public void setLongitude(long longitude) {
+	public void setLongitude(double longitude) {
 		this.longitude = longitude;
 	}
 
@@ -111,8 +111,8 @@ public void setLongitude(long longitude) {
 	 * @see GlobeCoordinatesValue#getPrecision()
 	 * @return precision
 	 */
-	public long getPrecision() {
-		return precision;
+	public double getPrecision() {
+		return this.precision;
 	}
 
 	/**
@@ -122,7 +122,7 @@ public long getPrecision() {
 	 * @param precision
 	 *            new value
 	 */
-	public void setPrecision(long precision) {
+	public void setPrecision(double precision) {
 		this.precision = precision;
 	}
 

diff --git a/...ava/org/wikidata/wdtk/datamodel/json/jackson/datavalues/JacksonValueGlobeCoordinates.java b/...ava/org/wikidata/wdtk/datamodel/json/jackson/datavalues/JacksonValueGlobeCoordinates.java
@@ -77,19 +77,19 @@ public void setValue(JacksonInnerGlobeCoordinates value) {
 	@JsonIgnore
 	@Override
 	public long getLatitude() {
-		return this.value.getLatitude();
+		return (long)(this.value.getLatitude() * GlobeCoordinatesValue.PREC_DEGREE);
 	}
 
 	@JsonIgnore
 	@Override
 	public long getLongitude() {
-		return this.value.getLongitude();
+		return (long)(this.value.getLongitude() * GlobeCoordinatesValue.PREC_DEGREE);
 	}
 
 	@JsonIgnore
 	@Override
 	public long getPrecision() {
-		return this.value.getPrecision();
+		return (long)(this.value.getPrecision() * GlobeCoordinatesValue.PREC_DEGREE);
 	}
 
 	@JsonIgnore

diff --git a/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/json/jackson/JsonTestData.java b/wdtk-datamodel/src/test/java/org/wikidata/wdtk/datamodel/json/jackson/JsonTestData.java
@@ -80,7 +80,7 @@ public class JsonTestData {
 			+ "\", \"value\":{\"time\":\"+00000002013-10-28T00:00:00Z\",\"timezone\":0,\"before\":0,\"after\":0,\"precision\":11,\"calendarmodel\":\"http://www.wikidata.org/entity/Q1985727\"}}";
 	public static final String JSON_GLOBE_COORDINATES_VALUE = "{\"type\":\""
 			+ JacksonValue.JSON_VALUE_TYPE_GLOBE_COORDINATES
-			+ "\", \"value\":{\"latitude\":-90,\"longitude\":0,\"precision\":10,\"globe\":\"http://www.wikidata.org/entity/Q2\"}}";
+			+ "\", \"value\":{\"latitude\":-90.0,\"longitude\":0.0,\"precision\":10.0,\"globe\":\"http://www.wikidata.org/entity/Q2\"}}";
 	public static final String JSON_QUANTITY_VALUE = "{\"type\":\""
 			+ JacksonValue.JSON_VALUE_TYPE_QUANTITY
 			+ "\",\"value\":{\"amount\":\"+1\",\"unit\":\"1\",\"upperBound\":\"+1.5\",\"lowerBound\":\"-0.5\"}}";
@@ -136,7 +136,7 @@ public class JsonTestData {
 			.getTimeValue(2013, (byte) 10, (byte) 28, (byte) 0, (byte) 0,
 					(byte) 0, (byte) 11, 0, 0, 0, TimeValue.CM_GREGORIAN_PRO);
 	public static final JacksonValueGlobeCoordinates TEST_GLOBE_COORDINATES_VALUE = (JacksonValueGlobeCoordinates) JACKSON_OBJECT_FACTORY
-			.getGlobeCoordinatesValue(-90, 0, 10,
+			.getGlobeCoordinatesValue(-90000000000L, 0L, 10000000000L,
 					GlobeCoordinatesValue.GLOBE_EARTH);
 	public static final JacksonValueQuantity TEST_QUANTITY_VALUE = (JacksonValueQuantity) JACKSON_OBJECT_FACTORY
 			.getQuantityValue(new BigDecimal(1), new BigDecimal(-0.5),