fix merge issues

mapbox · Jan 18, 2018 · 068b16d · 068b16d
1 parent 5868fa6
commit 068b16d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java b/services-geojson/src/main/java/com/mapbox/geojson/FeatureCollection.java
@@ -99,7 +99,7 @@ public static FeatureCollection fromFeatures(@NonNull List<Feature> features) {
   public static FeatureCollection fromFeature(@NonNull Feature feature) {
     List<Feature> featureList = new ArrayList<>();
     featureList.add(feature);
-    return new AutoValue_FeatureCollection(null, featureList);
+    return new AutoValue_FeatureCollection(TYPE, null, featureList);
   }
 
   /**
@@ -147,7 +147,7 @@ public static FeatureCollection fromFeature(@NonNull Feature feature,
                                               @Nullable BoundingBox bbox) {
     List<Feature> featureList = new ArrayList<>();
     featureList.add(feature);
-    return new AutoValue_FeatureCollection(bbox, featureList);
+    return new AutoValue_FeatureCollection(TYPE, bbox, featureList);
   }
 
   /**

diff --git a/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java b/services-geojson/src/main/java/com/mapbox/geojson/GeometryCollection.java
@@ -106,7 +106,7 @@ public static GeometryCollection fromGeometries(@NonNull List<Geometry> geometri
   public static GeometryCollection fromGeometry(@NonNull Geometry geometry) {
     List<Geometry> geometries = new ArrayList<>();
     geometries.add(geometry);
-    return new AutoValue_GeometryCollection(null, geometries);
+    return new AutoValue_GeometryCollection(TYPE, null, geometries);
   }
 
   /**
@@ -136,7 +136,7 @@ public static GeometryCollection fromGeometry(@NonNull Geometry geometry,
                                                 @Nullable BoundingBox bbox) {
     List<Geometry> geometries = new ArrayList<>();
     geometries.add(geometry);
-    return new AutoValue_GeometryCollection(bbox, geometries);
+    return new AutoValue_GeometryCollection(TYPE, bbox, geometries);
   }
 
   /**

diff --git a/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java b/services-geojson/src/main/java/com/mapbox/geojson/MultiLineString.java
@@ -104,7 +104,7 @@ public static MultiLineString fromLineStrings(@NonNull List<LineString> lineStri
   public static MultiLineString fromLineString(@NonNull LineString lineString) {
     List<List<Point>> coordinates = new ArrayList<>();
     coordinates.add(lineString.coordinates());
-    return new AutoValue_MultiLineString(null, coordinates);
+    return new AutoValue_MultiLineString(TYPE, null, coordinates);
   }
 
   /**
@@ -142,7 +142,7 @@ 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);
+    return new AutoValue_MultiLineString(TYPE, bbox, coordinates);
   }
 
   /**