BoundingBoxSerializer should do unshifting before serialization (#907)

similar to PointSerializer

Author: osana

services-geojson/src/main/java/com/mapbox/geojson/gson/BoundingBoxSerializer.java

@@ -6,8 +6,11 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.mapbox.geojson.BoundingBox;
+import com.mapbox.geojson.Point;
+import com.mapbox.geojson.shifter.CoordinateShifterManager;
 
 import java.lang.reflect.Type;
+import java.util.List;
 
 /**
  * Serializer used for converting the {@link BoundingBox} object inside a GeoJson object to a JSON
@@ -41,17 +44,24 @@ public JsonElement serialize(BoundingBox src, Type typeOfSrc, JsonSerializationC
     JsonArray bbox = new JsonArray();
 
     // Southwest
-    bbox.add(new JsonPrimitive(src.southwest().longitude()));
-    bbox.add(new JsonPrimitive(src.southwest().latitude()));
-    if (src.southwest().hasAltitude()) {
-      bbox.add(new JsonPrimitive(src.southwest().altitude()));
+    Point point = src.southwest();
+    List<Double> unshiftedCoordinates =
+            CoordinateShifterManager.getCoordinateShifter().unshiftPoint(point);
+
+    bbox.add(new JsonPrimitive(unshiftedCoordinates.get(0)));
+    bbox.add(new JsonPrimitive(unshiftedCoordinates.get(1)));
+    if (point.hasAltitude()) {
+      bbox.add(new JsonPrimitive(unshiftedCoordinates.get(2)));
     }
 
     // Northeast
-    bbox.add(new JsonPrimitive(src.northeast().longitude()));
-    bbox.add(new JsonPrimitive(src.northeast().latitude()));
-    if (src.southwest().hasAltitude()) {
-      bbox.add(new JsonPrimitive(src.northeast().altitude()));
+    point = src.northeast();
+    unshiftedCoordinates =
+            CoordinateShifterManager.getCoordinateShifter().unshiftPoint(point);
+    bbox.add(new JsonPrimitive(unshiftedCoordinates.get(0)));
+    bbox.add(new JsonPrimitive(unshiftedCoordinates.get(1)));
+    if (point.hasAltitude()) {
+      bbox.add(new JsonPrimitive(unshiftedCoordinates.get(2)));
     }
     return bbox;
   }

services-geojson/src/test/java/com/mapbox/geojson/LineStringTest.java

@@ -87,9 +87,10 @@ public void bbox_doesSerializeWhenPresent() throws Exception {
     points.add(Point.fromLngLat(3.0, 3.0));
     BoundingBox bbox = BoundingBox.fromLngLats(1.0, 2.0, 3.0, 4.0);
     LineString lineString = LineString.fromLngLats(points, bbox);
-    compareJson(lineString.toJson(),
-      "{\"coordinates\":[[1,1],[2,2],[3,3]],"
-        + "\"type\":\"LineString\",\"bbox\":[1.0,2.0,3.0,4.0]}");
+    String lineStringJson = lineString.toJson();
+    compareJson("{\"coordinates\":[[1,1],[2,2],[3,3]],"
+        + "\"type\":\"LineString\",\"bbox\":[1.0,2.0,3.0,4.0]}",
+            lineStringJson);
   }
 
   @Test

services-geojson/src/test/java/com/mapbox/geojson/shifter/ShifterTest.java

@@ -1,15 +1,20 @@
 package com.mapbox.geojson.shifter;
 
+import com.google.gson.JsonParser;
 import com.mapbox.geojson.BoundingBox;
+import com.mapbox.geojson.LineString;
 import com.mapbox.geojson.Point;
 
 import static com.mapbox.core.TestUtils.DELTA;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
+import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -46,7 +51,7 @@ public List<Double> unshiftPoint(List<Double> coordinates) {
   };
 
   @Test
-  public void basic_shift() throws Exception {
+  public void point_basic_shift() throws Exception {
 
     Point southwest = Point.fromLngLat(2.0, 2.0);
     Point northeast = Point.fromLngLat(4.0, 4.0);
@@ -68,16 +73,27 @@ public void basic_shift() throws Exception {
     assertEquals(southwestManualShifted, southwestShifted);
     assertEquals(northeastManualShifted, northeastShifted);
 
+    CoordinateShifterManager.setCoordinateShifter(null);
+  }
+
+  @Test
+  public void bbox_basic_shift() throws Exception {
+
+    CoordinateShifter shifter = new TestCoordinateShifter();
+
     BoundingBox boundingBoxFromDouble = BoundingBox.fromLngLats(2.0, 2.0, 4.0, 4.0);
-    BoundingBox boundingBoxFromPoints = BoundingBox.fromPoints(southwestShifted, northeastShifted);
+
+    BoundingBox boundingBoxFromPoints =
+            BoundingBox.fromPoints(Point.fromLngLat(2.0, 2.0),
+                                   Point.fromLngLat(4.0, 4.0));
 
     assertEquals(boundingBoxFromDouble, boundingBoxFromPoints);
 
     CoordinateShifterManager.setCoordinateShifter(null);
   }
 
   @Test
-  public void toJson() throws Exception {
+  public void point_toJson() throws Exception {
 
     // set shifter
     CoordinateShifterManager.setCoordinateShifter(new TestCoordinateShifter());
@@ -91,7 +107,7 @@ public void toJson() throws Exception {
   }
 
   @Test
-  public void fromJson() throws Exception {
+  public void point_fromJson() throws Exception {
 
     // set shifter
     CoordinateShifterManager.setCoordinateShifter(new TestCoordinateShifter());
@@ -104,4 +120,30 @@ public void fromJson() throws Exception {
 
     CoordinateShifterManager.setCoordinateShifter(null);
   }
+
+  @Test
+  public void linestring_basic_shift_with_bbox() {
+    // set shifter
+    CoordinateShifterManager.setCoordinateShifter(new TestCoordinateShifter());
+
+    List<Point> points = new ArrayList<>();
+    points.add(Point.fromLngLat(1.0, 1.0));
+    points.add(Point.fromLngLat(2.0, 2.0));
+    points.add(Point.fromLngLat(3.0, 3.0));
+    BoundingBox bbox = BoundingBox.fromLngLats(1.0, 2.0, 3.0, 4.0);
+    LineString lineString = LineString.fromLngLats(points, bbox);
+
+    String jsonString = lineString.toJson();
+    compareJson("{\"coordinates\":[[1,1],[2,2],[3,3]],"
+                    + "\"type\":\"LineString\",\"bbox\":[1.0,2.0,3.0,4.0]}",
+            jsonString);
+
+    CoordinateShifterManager.setCoordinateShifter(null);
+  }
+
+  public void compareJson(String expectedJson, String actualJson) {
+    JsonParser parser = new JsonParser();
+    assertThat(parser.parse(actualJson), Matchers.equalTo(parser.parse(expectedJson)));
+  }
+
 }