From ef0c74b2a26947ed2e77a731e776631d11c138c3 Mon Sep 17 00:00:00 2001
From: George Boot <884482+georgeboot@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:36:52 +0100
Subject: [PATCH 1/2] Forward srid to children of multitype container items

---
 src/ewkb.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ewkb.rs b/src/ewkb.rs
index ae325d6..7b1ae6f 100644
--- a/src/ewkb.rs
+++ b/src/ewkb.rs
@@ -571,7 +571,9 @@ macro_rules! impl_read_for_geometry_container_type {
                 let mut $itemname: Vec<$itemtype<P>> = vec![];
                 let size = read_u32(raw, is_be)? as usize;
                 for _ in 0..size {
-                    $itemname.push($itemtype::read_ewkb(raw)?);
+                    let _byte_order = raw.read_i8()?;
+                    let type_id = read_u32(raw, is_be)?;
+                    $itemname.push($itemtype::read_ewkb_body(raw, is_be, type_id, srid)?);
                 }
                 Ok($geotype::<P> {
                     $itemname: $itemname,

From 01161d9d5a6626936f1f18bb839e40f3f7e377b4 Mon Sep 17 00:00:00 2001
From: George Boot <884482+georgeboot@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:12:18 +0100
Subject: [PATCH 2/2] Add test

---
 src/ewkb.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/ewkb.rs b/src/ewkb.rs
index 7b1ae6f..fde2eb0 100644
--- a/src/ewkb.rs
+++ b/src/ewkb.rs
@@ -1885,3 +1885,21 @@ fn test_iterators() {
     let line = self::LineStringT::<Point> {srid: Some(4326), points: vec![p(10.0, -20.0), p(0., -0.5)]};
     assert_eq!(line.points().last(), Some(&Point { x: 0., y: -0.5, srid: None }));
 }
+
+#[test]
+#[cfg_attr(rustfmt, rustfmt_skip)]
+fn test_srid_on_multipolygons() {
+    let p = |x, y| Point { x: x, y: y, srid: Some(4326) };
+    // SELECT 'SRID=4326;MULTIPOLYGON (((0 0, 2 0, 2 2, 0 2, 0 0)), ((10 10, -2 10, -2 -2, 10 -2, 10 10)))'::geometry
+    let line = LineStringT::<Point> {srid: Some(4326), points: vec![p(0., 0.), p(2., 0.), p(2., 2.), p(0., 2.), p(0., 0.)]};
+    let poly1 = PolygonT::<Point> {srid: Some(4326), rings: vec![line]};
+    let line = LineStringT::<Point> {srid: Some(4326), points: vec![p(10., 10.), p(-2., 10.), p(-2., -2.), p(10., -2.), p(10., 10.)]};
+    let poly2 = PolygonT::<Point> {srid: Some(4326), rings: vec![line]};
+    let multipoly = MultiPolygonT::<Point> {srid: Some(4326), polygons: vec![poly1, poly2]};
+    let hex = multipoly.as_ewkb().to_hex_ewkb();
+    let ewkb = hex_to_vec(&hex);
+    let geom = MultiPolygon::read_ewkb(&mut ewkb.as_slice()).unwrap();
+
+    assert_eq!(geom.srid, Some(4326));
+    assert_eq!(geom.polygons[0].srid, Some(4326));
+}
\ No newline at end of file