Adds new static initializers to geojson collection objects (#692)

Author: Cameron Mace

services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java

@@ -16,6 +16,7 @@
 import com.mapbox.geojson.gson.PointSerializer;
 import com.mapbox.geojson.gson.BoundingBoxSerializer;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -92,6 +93,20 @@ public static FeatureCollection fromFeatures(@NonNull List<Feature> features) {
     return new AutoValue_FeatureCollection(null, features);
   }
 
+  /**
+   * Create a new instance of this class by giving the feature collection a single {@link Feature}.
+   *
+   * @param feature a single feature
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static FeatureCollection fromFeature(@NonNull Feature feature) {
+    List<Feature> featureList = new ArrayList<>();
+    featureList.add(feature);
+    return new AutoValue_FeatureCollection(null, featureList);
+  }
+
   /**
    * Create a new instance of this class by giving the feature collection an array of
    * {@link Feature}s. The array of features itself isn't null but it can be empty and have a length
@@ -124,6 +139,22 @@ public static FeatureCollection fromFeatures(@NonNull List<Feature> features,
     return new AutoValue_FeatureCollection(bbox, features);
   }
 
+  /**
+   * Create a new instance of this class by giving the feature collection a single {@link Feature}.
+   *
+   * @param feature a single feature
+   * @param bbox    optionally include a bbox definition as a double array
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static FeatureCollection fromFeature(@NonNull Feature feature,
+                                              @Nullable BoundingBox bbox) {
+    List<Feature> featureList = new ArrayList<>();
+    featureList.add(feature);
+    return new AutoValue_FeatureCollection(bbox, featureList);
+  }
+
   /**
    * This describes the type of GeoJson this object is, thus this will always return
    * {@link FeatureCollection}.

services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java

@@ -17,6 +17,7 @@
 import com.mapbox.geojson.gson.BoundingBoxSerializer;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -99,6 +100,20 @@ public static GeometryCollection fromGeometries(@NonNull List<Geometry> geometri
     return new AutoValue_GeometryCollection(null, geometries);
   }
 
+  /**
+   * Create a new instance of this class by giving the collection a single GeoJSON {@link Geometry}.
+   *
+   * @param geometry a non-null object of type geometry which makes up this collection
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static GeometryCollection fromGeometry(@NonNull Geometry geometry) {
+    List<Geometry> geometries = new ArrayList<>();
+    geometries.add(geometry);
+    return new AutoValue_GeometryCollection(null, geometries);
+  }
+
   /**
    * Create a new instance of this class by giving the collection a list of {@link Geometry}.
    *
@@ -113,6 +128,22 @@ public static GeometryCollection fromGeometries(@NonNull List<Geometry> geometri
     return new AutoValue_GeometryCollection(bbox, geometries);
   }
 
+  /**
+   * Create a new instance of this class by giving the collection a single GeoJSON {@link Geometry}.
+   *
+   * @param geometry a non-null object of type geometry which makes up this collection
+   * @param bbox     optionally include a bbox definition as a double array
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static GeometryCollection fromGeometry(@NonNull Geometry geometry,
+                                                @Nullable BoundingBox bbox) {
+    List<Geometry> geometries = new ArrayList<>();
+    geometries.add(geometry);
+    return new AutoValue_GeometryCollection(bbox, geometries);
+  }
+
   /**
    * This describes the TYPE of GeoJson this object is, thus this will always return
    * {@link GeometryCollection}.

services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java

@@ -94,14 +94,29 @@ public static MultiLineString fromLineStrings(@NonNull List<LineString> lineStri
     return new AutoValue_MultiLineString(null, coordinates);
   }
 
+  /**
+   * Create a new instance of this class by passing in a single {@link LineString} object. The
+   * LineStrings should comply with the GeoJson specifications described in the documentation.
+   *
+   * @param lineString a single LineString which make up this MultiLineString
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static MultiLineString fromLineString(@NonNull LineString lineString) {
+    List<List<Point>> coordinates = new ArrayList<>();
+    coordinates.add(lineString.coordinates());
+    return new AutoValue_MultiLineString(null, coordinates);
+  }
+
   /**
    * Create a new instance of this class by defining a list of {@link LineString} objects and
    * passing that list in as a parameter in this method. The LineStrings should comply with the
    * GeoJson specifications described in the documentation. Optionally, pass in an instance of a
    * {@link BoundingBox} which better describes this MultiLineString.
    *
    * @param lineStrings a list of LineStrings which make up this MultiLineString
-   * @param bbox        optionally include a bbox definition as a double array
+   * @param bbox        optionally include a bbox definition
    * @return a new instance of this class defined by the values passed inside this static factory
    *   method
    * @since 3.0.0
@@ -115,6 +130,23 @@ public static MultiLineString fromLineStrings(@NonNull List<LineString> lineStri
     return new AutoValue_MultiLineString(bbox, coordinates);
   }
 
+  /**
+   * Create a new instance of this class by passing in a single {@link LineString} object. The
+   * LineStrings should comply with the GeoJson specifications described in the documentation.
+   *
+   * @param lineString a single LineString which make up this MultiLineString
+   * @param bbox       optionally include a bbox definition
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static MultiLineString fromLineString(@NonNull LineString lineString,
+                                               @Nullable BoundingBox bbox) {
+    List<List<Point>> coordinates = new ArrayList<>();
+    coordinates.add(lineString.coordinates());
+    return new AutoValue_MultiLineString(bbox, coordinates);
+  }
+
   /**
    * Create a new instance of this class by defining a list of a list of {@link Point}s which follow
    * the correct specifications described in the Point documentation. Note that there should not be
@@ -137,7 +169,7 @@ public static MultiLineString fromLngLats(@NonNull List<List<Point>> points) {
    * distance greater than 0.
    *
    * @param points a list of {@link Point}s which make up the MultiLineString geometry
-   * @param bbox   optionally include a bbox definition as a double array
+   * @param bbox   optionally include a bbox definition
    * @return a new instance of this class defined by the values passed inside this static factory
    *   method
    * @since 3.0.0

services-geojson/src/main/java/com/mapbox/geojson/MultiPolygon.java

@@ -120,7 +120,7 @@ public static MultiPolygon fromPolygons(@NonNull List<Polygon> polygons) {
    * {@link BoundingBox} which better describes this MultiPolygon.
    *
    * @param polygons a list of Polygons which make up this MultiPolygon
-   * @param bbox     optionally include a bbox definition as a double array
+   * @param bbox     optionally include a bbox definition
    * @return a new instance of this class defined by the values passed inside this static factory
    *   method
    * @since 3.0.0
@@ -134,6 +134,39 @@ public static MultiPolygon fromPolygons(@NonNull List<Polygon> polygons,
     return new AutoValue_MultiPolygon(bbox, coordinates);
   }
 
+  /**
+   * Create a new instance of this class by defining a single {@link Polygon} objects and passing
+   * it in as a parameter in this method. The Polygon should comply with the GeoJson
+   * specifications described in the documentation.
+   *
+   * @param polygon a single Polygon which make up this MultiPolygon
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static MultiPolygon fromPolygon(@NonNull Polygon polygon) {
+    List<List<List<Point>>> coordinates = new ArrayList<>();
+    coordinates.add(polygon.coordinates());
+    return new AutoValue_MultiPolygon(null, coordinates);
+  }
+
+  /**
+   * Create a new instance of this class by defining a single {@link Polygon} objects and passing
+   * it in as a parameter in this method. The Polygon should comply with the GeoJson
+   * specifications described in the documentation.
+   *
+   * @param polygon a single Polygon which make up this MultiPolygon
+   * @param bbox    optionally include a bbox definition
+   * @return a new instance of this class defined by the values passed inside this static factory
+   *   method
+   * @since 3.0.0
+   */
+  public static MultiPolygon fromPolygon(@NonNull Polygon polygon, @Nullable BoundingBox bbox) {
+    List<List<List<Point>>> coordinates = new ArrayList<>();
+    coordinates.add(polygon.coordinates());
+    return new AutoValue_MultiPolygon(bbox, coordinates);
+  }
+
   /**
    * Create a new instance of this class by defining a list of a list of a list of {@link Point}s
    * which follow the correct specifications described in the Point documentation.
@@ -152,14 +185,13 @@ public static MultiPolygon fromLngLats(@NonNull List<List<List<Point>>> points)
    * which follow the correct specifications described in the Point documentation.
    *
    * @param points a list of {@link Point}s which make up the MultiPolygon geometry
-   * @param bbox   optionally include a bbox definition as a double array
+   * @param bbox   optionally include a bbox definition
    * @return a new instance of this class defined by the values passed inside this static factory
    *   method
    * @since 3.0.0
    */
   public static MultiPolygon fromLngLats(@NonNull List<List<List<Point>>> points,
                                          @Nullable BoundingBox bbox) {
-
     return new AutoValue_MultiPolygon(bbox, points);
   }
 

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

@@ -90,6 +90,16 @@ public void bbox_doesSerializeWhenPresent() throws Exception {
         + "]}");
   }
 
+  @Test
+  public void passingInSingleFeature_doesHandleCorrectly() throws Exception {
+    Point geometry = Point.fromLngLat(1.0, 2.0);
+    Feature feature = Feature.fromGeometry(geometry);
+    FeatureCollection geo = FeatureCollection.fromFeature(feature);
+    assertNotNull(geo.features());
+    assertEquals(1, geo.features().size());
+    assertEquals(2.0, ((Point) geo.features().get(0).geometry()).coordinates().get(1), DELTA);
+  }
+
   @Test
   public void fromJson() throws IOException {
     final String json = loadJsonFixture(SAMPLE_FEATURECOLLECTION);

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

@@ -79,6 +79,15 @@ public void bbox_returnsCorrectBbox() throws Exception {
     assertEquals(4.0, geometryCollection.bbox().north(), DELTA);
   }
 
+  @Test
+  public void passingInSingleGeometry_doesHandleCorrectly() throws Exception {
+    Point geometry = Point.fromLngLat(1.0, 2.0);
+    GeometryCollection collection = GeometryCollection.fromGeometry(geometry);
+    assertNotNull(collection);
+    assertEquals(1, collection.geometries().size());
+    assertEquals(2.0, ((Point) collection.geometries().get(0)).latitude(), DELTA);
+  }
+
   @Test
   public void bbox_doesSerializeWhenPresent() throws Exception {
     List<Point> points = new ArrayList<>();

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

@@ -74,6 +74,18 @@ public void bbox_returnsCorrectBbox() throws Exception {
     assertEquals(4.0, multiLineString.bbox().north(), DELTA);
   }
 
+  @Test
+  public void passingInSingleLineString_doesHandleCorrectly() throws Exception {
+    List<Point> points = new ArrayList<>();
+    points.add(Point.fromLngLat(1.0, 2.0));
+    points.add(Point.fromLngLat(3.0, 4.0));
+    LineString geometry = LineString.fromLngLats(points);
+    MultiLineString multiLineString = MultiLineString.fromLineString(geometry);
+    assertNotNull(multiLineString);
+    assertEquals(1, multiLineString.lineStrings().size());
+    assertEquals(2.0, multiLineString.lineStrings().get(0).coordinates().get(0).latitude(), DELTA);
+  }
+
   @Test
   public void bbox_doesSerializeWhenPresent() throws Exception {
     List<Point> points = new ArrayList<>();

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

@@ -84,6 +84,20 @@ public void bbox_returnsCorrectBbox() throws Exception {
     assertEquals(4.0, multiPolygon.bbox().north(), DELTA);
   }
 
+  @Test
+  public void passingInSinglePolygon_doesHandleCorrectly() throws Exception {
+    List<Point> points = new ArrayList<>();
+    points.add(Point.fromLngLat(1.0, 2.0));
+    points.add(Point.fromLngLat(3.0, 4.0));
+    List<List<Point>> pointsList = new ArrayList<>();
+    pointsList.add(points);
+    Polygon geometry = Polygon.fromLngLats(pointsList);
+    MultiPolygon multiPolygon = MultiPolygon.fromPolygon(geometry);
+    assertNotNull(multiPolygon);
+    assertEquals(1, multiPolygon.polygons().size());
+    assertEquals(2.0, multiPolygon.polygons().get(0).coordinates().get(0).get(0).latitude(), DELTA);
+  }
+
   @Test
   public void bbox_doesSerializeWhenPresent() throws Exception {
     List<Point> points = new ArrayList<>();