fix: GeographyCollection::Decode recount number of shapes (#55)

Closes #54.
paleolimbot · Dec 8, 2024 · c7a0197 · c7a0197
1 parent 9ebe016
commit c7a0197
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/s2geography/geography.cc b/src/s2geography/geography.cc
@@ -392,6 +392,8 @@ void GeographyCollection::Decode(Decoder* decoder, const EncodeTag& tag) {
   for (uint32_t i = 0; i < n_features; i++) {
     features_.push_back(Geography::DecodeTagged(decoder));
   }
+
+  CountShapes();
 }
 
 namespace {

diff --git a/src/s2geography/geography.h b/src/s2geography/geography.h
@@ -213,10 +213,7 @@ class GeographyCollection : public Geography {
       : Geography(GeographyKind::GEOGRAPHY_COLLECTION),
         features_(std::move(features)),
         total_shapes_(0) {
-    for (const auto& feature : features_) {
-      num_shapes_.push_back(feature->num_shapes());
-      total_shapes_ += feature->num_shapes();
-    }
+    CountShapes();
   }
 
   int num_shapes() const;
@@ -235,6 +232,13 @@ class GeographyCollection : public Geography {
   std::vector<std::unique_ptr<Geography>> features_;
   std::vector<int> num_shapes_;
   int total_shapes_;
+
+  inline void CountShapes() {
+    for (const auto& feature : features_) {
+      num_shapes_.push_back(feature->num_shapes());
+      total_shapes_ += feature->num_shapes();
+    }
+  }
 };
 
 // A Geography with a MutableS2ShapeIndex as the underlying data.

diff --git a/src/s2geography/geography_test.cc b/src/s2geography/geography_test.cc
@@ -204,12 +204,16 @@ TEST(Geography, EncodedGeographyCollection) {
   std::vector<std::unique_ptr<Geography>> child_geogs;
   child_geogs.emplace_back(child_geog.release());
   GeographyCollection geog(std::move(child_geogs));
+  ASSERT_EQ(geog.num_shapes(), 1);
+  ASSERT_EQ(geog.dimension(), 0);
   geog.EncodeTagged(&encoder, EncodeOptions());
 
   Decoder decoder(encoder.base(), encoder.length());
   auto roundtrip = Geography::DecodeTagged(&decoder);
   ASSERT_EQ(roundtrip->kind(), GeographyKind::GEOGRAPHY_COLLECTION);
   ASSERT_THAT(*roundtrip, WktEquals6("GEOMETRYCOLLECTION (POINT (-64 45))"));
+  ASSERT_EQ(roundtrip->num_shapes(), 1);
+  ASSERT_EQ(roundtrip->dimension(), 0);
 
   auto roundtrip_typed =
       reinterpret_cast<GeographyCollection*>(roundtrip.get());