Merge pull request #33 from divvitco/fix-polygon-fromjson

`fromJson` method fix with casting
divvitco · Apr 5, 2024 · 542f096 · 542f096
2 parents 2e5ec67 + fbc4579
commit 542f096
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/lib/src/featureTypes/feature_collection.dart b/lib/src/featureTypes/feature_collection.dart
@@ -55,7 +55,7 @@ class FeatureCollection {
     }
 
     return FeatureCollection(
-      (json['features'] as List<Map<String, dynamic>>)
+      (List<Map<String, dynamic>>.from(json['features']))
           .map((Map<String, dynamic> f) {
         if (f['geometry']['type'] == 'Point') {
           return Point.fromJson(f);

diff --git a/lib/src/featureTypes/multi_polygon.dart b/lib/src/featureTypes/multi_polygon.dart
@@ -71,16 +71,20 @@ class MultiPolygon extends Feature {
       throw ArgumentError('json is not a MultiPolygon');
     }
 
-    return MultiPolygon(
-      (json['geometry']['coordinates'] as List<List<List<List<double>>>>)
-          .map((dynamic poly) => (poly as List<List<List<double>>>)
-              .map((dynamic shape) => LinearRing((shape as List<List<double>>)
-                  .map((dynamic coord) => Coordinate.fromJson(coord))
+    MultiPolygon poly = MultiPolygon(
+      (json['geometry']['coordinates'] as List)
+          .map((poly) => (poly as List)
+              .map((shape) => LinearRing((shape as List)
+                  .map((coord) => Coordinate.fromJson((coord as List)
+                      .map((e) => (e is int ? e.toDouble() : e as double))
+                      .toList()))
                   .toList()))
-              .toList())
-          .toList(),
+              .toList()) // Convert the outer Iterable to a List
+          .toList(), // Convert the inner Iterable to a List
       properties: Map<String, dynamic>.from(json['properties']),
     );
+
+    return poly;
   }
 
   /// Creates a [MultiPolygon] from a WKT [String].

diff --git a/lib/src/featureTypes/polygon.dart b/lib/src/featureTypes/polygon.dart
@@ -44,11 +44,14 @@ class Polygon extends Feature {
       throw ArgumentError('json is not a Polygon');
     }
 
-    List<LinearRing> rings =
-        (json['geometry']['coordinates'] as List<List<dynamic>>)
-            .map((List<dynamic> shape) => LinearRing(
-                shape.map((dynamic c) => Coordinate.fromJson(c)).toList()))
-            .toList();
+    List<LinearRing> rings = (json['geometry']['coordinates'] as List)
+        .map((shape) => LinearRing((shape as List)
+            .map((c) => Coordinate.fromJson((c as List)
+                .map((e) => (e is int ? e.toDouble() : e as double))
+                .toList()))
+            .toList()))
+        .toList();
+
     return Polygon(rings,
         properties: Map<String, dynamic>.from(json['properties']));
   }