Fix MultiPolygons not maintaining properties.

Author: luke-everhart

geojson_aoi/_async/parser.py

@@ -195,9 +195,23 @@ async def parse_aoi_async(
 
     elif geojson_parsed.get("type") == "FeatureCollection":
         for feature in geojson_parsed.get("features"):
-            if feature["geometry"]["type"] in valid_geoms:
+
+            # Append a copy of the properties list for each coordinate set
+            # in the MultiPolygon. This ensures the split Polygons maintain
+            # these properties.
+            if feature["geometry"]["type"] == "MultiPolygon":
+                for coordinate in feature["geometry"]["coordinates"]:
+                    properties.append(feature["properties"])
+
+            elif feature["geometry"]["type"] in valid_geoms:
                 properties.append(feature["properties"])
 
+    # The same MultiPolygon handling as before. But applied to top-level MultiPolyons
+    elif geojson_parsed.get("type") == "MultiPolygon":
+        if feature["geometry"]["type"] == "MultiPolygon":
+                for coordinate in feature.get("coordinates"):
+                    properties.append(feature["properties"])
+
     # Extract from FeatureCollection
     geoms = strip_featcol(geojson_parsed)
 

geojson_aoi/_sync/parser.py

@@ -195,9 +195,23 @@ def parse_aoi(
 
     elif geojson_parsed.get("type") == "FeatureCollection":
         for feature in geojson_parsed.get("features"):
-            if feature["geometry"]["type"] in valid_geoms:
+
+            # Append a copy of the properties list for each coordinate set
+            # in the MultiPolygon. This ensures the split Polygons maintain
+            # these properties.
+            if feature["geometry"]["type"] == "MultiPolygon":
+                for coordinate in feature["geometry"]["coordinates"]:
+                    properties.append(feature["properties"])
+
+            elif feature["geometry"]["type"] in valid_geoms:
                 properties.append(feature["properties"])
 
+    # The same MultiPolygon handling as before. But applied to top-level MultiPolyons
+    elif geojson_parsed.get("type") == "MultiPolygon":
+        if feature["geometry"]["type"] == "MultiPolygon":
+                for coordinate in feature.get("coordinates"):
+                    properties.append(feature["properties"])
+
     # Extract from FeatureCollection
     geoms = strip_featcol(geojson_parsed)
 
@@ -208,6 +222,9 @@ def parse_aoi(
         # Remove any properties that PostGIS might have assigned.
         for feature in result.featcol["features"]:
             feature.pop("properties", None)
+ 
+        # TODO: Parser breaks when properties and result.featcol['features'] arent't equal
+        # print(f"Properties: {len(properties)}\n Results: {len(result.featcol['features'])}")
 
         # Restore saved properties.
         if properties:

geojson_aoi/_sync/postgis.py

@@ -34,7 +34,9 @@ class PostGis:
     Can reuse an existing upstream connection.
     """
 
-    def __init__(self, db: str | Connection, geoms: list[GeoJSON], merge: bool = False):
+    def __init__(
+        self, db: str | Connection, geoms: list[GeoJSON], merge: bool = False
+    ):
         """Initialise variables and compose classes."""
         self.table_id = uuid4().hex
         self.geoms = geoms

tests/_async/test_parser.py

@@ -320,7 +320,11 @@ async def test_featurecollection_mixed_geoms(db, featurecollection_mixed_geoms):
     }
 
 
-# TODO: Add test case for FeatureCollection with a mix of features with properties
+async def test_featurecollection_multi_props(db, featurecollection_multipolygon_properties):
+    """Test a FeatureCollection that contatins a MultiPolygon Feature with properties."""
+    result = await parse_aoi_async(db, featurecollection_multipolygon_properties)
+
+    assert result["features"]["properties"] == {"id": 1}
 
 
 async def test_invalid_input(db):

tests/_sync/test_parser.py

@@ -320,6 +320,13 @@ def test_featurecollection_mixed_geoms(db, featurecollection_mixed_geoms):
     }
 
 
+def test_featurecollection_multi_props(db, featurecollection_multipolygon_properties):
+    """Test a FeatureCollection that contatins a MultiPolygon Feature with properties."""
+    result = parse_aoi(db, featurecollection_multipolygon_properties)
+
+    assert result["features"]["properties"] == {"id": 1}
+
+
 def test_invalid_input(db):
     """Invalud input for parse_aoi function."""
     with pytest.raises(
@@ -422,7 +429,10 @@ def test_warnings_raised_invalid_coords(db):
                 "properties": {},
             }
         ],
-        "crs": {"type": "name", "properties": {"name": "urn:ogc:def:crs:EPSG::4326"}},
+        "crs": {
+            "type": "name",
+            "properties": {"name": "urn:ogc:def:crs:EPSG::4326"},
+        },
     }
     with pytest.warns(UserWarning):
         parse_aoi(db, geojson_data)

tests/conftest.py

@@ -298,3 +298,35 @@ def featurecollection_mixed_geoms():
             },
         ],
     }
+
+@pytest_asyncio.fixture
+def featurecollection_multipolygon_properties():
+    """FeatureCollection containing a MultiPolygon with properties."""
+    return {
+        "type" : "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {
+                    "id": 1,
+                },
+                "geometry": {
+                    "type": "MultiPolygon",
+                    "coordinates": [
+                    [[[40.0, 40.0], [20.0, 45.0], [45.0, 30.0], [40.0, 40.0]]],
+                    [
+                        [
+                            [20.0, 35.0],
+                            [10.0, 30.0],
+                            [10.0, 10.0],
+                            [30.0, 5.0],
+                            [45.0, 20.0],
+                            [20.0, 35.0],
+                        ],
+                        [[30.0, 20.0], [20.0, 15.0], [20.0, 25.0], [30.0, 20.0]],
+                    ],
+                ],
+                }
+            }
+        ]
+    }