deserialization: avoid null values on generated types

dartclub · Feb 29, 2024 · 793b07d · 793b07d
1 parent a788b56
commit 793b07d
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 48 deletions.
diff --git a/lib/src/geojson.dart b/lib/src/geojson.dart
@@ -434,7 +434,7 @@ abstract class GeometryType<T> extends GeometryObject {
 }
 
 /// Point, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.2
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class Point extends GeometryType<Position> {
   Point({BBox? bbox, required Position coordinates})
       : super.withType(coordinates, GeoJSONObjectType.point, bbox: bbox);
@@ -460,7 +460,7 @@ class Point extends GeometryType<Position> {
 }
 
 /// MultiPoint, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.3
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class MultiPoint extends GeometryType<List<Position>> {
   MultiPoint({BBox? bbox, List<Position> coordinates = const []})
       : super.withType(coordinates, GeoJSONObjectType.multiPoint, bbox: bbox);
@@ -485,7 +485,7 @@ class MultiPoint extends GeometryType<List<Position>> {
 }
 
 /// LineString, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.4
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class LineString extends GeometryType<List<Position>> {
   LineString({BBox? bbox, List<Position> coordinates = const []})
       : super.withType(coordinates, GeoJSONObjectType.lineString, bbox: bbox);
@@ -509,7 +509,7 @@ class LineString extends GeometryType<List<Position>> {
 }
 
 /// MultiLineString, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.5
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class MultiLineString extends GeometryType<List<List<Position>>> {
   MultiLineString({BBox? bbox, List<List<Position>> coordinates = const []})
       : super.withType(coordinates, GeoJSONObjectType.multiLineString,
@@ -538,7 +538,7 @@ class MultiLineString extends GeometryType<List<List<Position>>> {
 }
 
 /// Polygon, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.6
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class Polygon extends GeometryType<List<List<Position>>> {
   Polygon({BBox? bbox, List<List<Position>> coordinates = const []})
       : super.withType(coordinates, GeoJSONObjectType.polygon, bbox: bbox);
@@ -565,7 +565,7 @@ class Polygon extends GeometryType<List<List<Position>>> {
 }
 
 /// MultiPolygon, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.7
-@JsonSerializable(explicitToJson: true)
+@JsonSerializable(explicitToJson: true, includeIfNull: false)
 class MultiPolygon extends GeometryType<List<List<List<Position>>>> {
   MultiPolygon({BBox? bbox, List<List<List<Position>>> coordinates = const []})
       : super.withType(coordinates, GeoJSONObjectType.multiPolygon, bbox: bbox);
@@ -592,7 +592,8 @@ class MultiPolygon extends GeometryType<List<List<List<Position>>>> {
 }
 
 /// GeometryCollection, as specified here https://tools.ietf.org/html/rfc7946#section-3.1.8
-@JsonSerializable(explicitToJson: true, createFactory: false)
+@JsonSerializable(
+    explicitToJson: true, createFactory: false, includeIfNull: false)
 class GeometryCollection extends GeometryObject {
   List<GeometryType> geometries;
 

diff --git a/lib/src/geojson.g.dart b/lib/src/geojson.g.dart