Add missing WKB MultiPoint parser implementation

Author: joto

src/wkb.cpp

@@ -207,15 +207,19 @@ class make_ewkb_visitor
 
     std::string operator()(geom::point_t const &geom) const
     {
-        // 9 byte header plus one set of coordinates
-        constexpr const std::size_t size = 9 + 2 * 8;
-
         std::string data;
 
-        data.reserve(size);
-        write_point(&data, geom, m_srid);
-
-        assert(data.size() == size);
+        if (m_ensure_multi) {
+            write_header(&data, wkb_multi_point, m_srid);
+            write_length(&data, 1);
+            write_point(&data, geom);
+        } else {
+            // 9 byte header plus one set of coordinates
+            constexpr const std::size_t size = 9 + 2 * 8;
+            data.reserve(size);
+            write_point(&data, geom, m_srid);
+            assert(data.size() == size);
+        }
 
         return data;
     }
@@ -317,7 +321,7 @@ class ewkb_parser_t
             parse_polygon(&geom.set<geom::polygon_t>());
             break;
         case geometry_type::wkb_multi_point:
-            // XXX not implemented yet
+            parse_multi_point(&geom);
             break;
         case geometry_type::wkb_multi_line:
             parse_multi_linestring(&geom);
@@ -448,6 +452,28 @@ class ewkb_parser_t
         }
     }
 
+    void parse_multi_point(geom::geometry_t *geom)
+    {
+        auto &multipoint = geom->set<geom::multipoint_t>();
+        auto const num_geoms = parse_length();
+        if (num_geoms == 0) {
+            throw std::runtime_error{
+                "Invalid WKB geometry: Multipoint without points"};
+        }
+
+        multipoint.reserve(num_geoms);
+        for (uint32_t i = 0; i < num_geoms; ++i) {
+            auto &point = multipoint.emplace_back();
+            uint32_t const type = parse_header();
+            if (type != geometry_type::wkb_point) {
+                throw std::runtime_error{
+                    "Invalid WKB geometry: Multipoint containing"
+                    " something other than point: {}"_format(type)};
+            }
+            parse_point(&point);
+        }
+    }
+
     void parse_multi_linestring(geom::geometry_t *geom)
     {
         auto &multilinestring = geom->set<geom::multilinestring_t>();

tests/test-wkb.cpp

@@ -83,6 +83,37 @@ TEST_CASE("wkb: polygon with inner rings", "[NoDB]")
             geom.get<geom::polygon_t>().inners().front());
 }
 
+TEST_CASE("wkb: point as multipoint", "[NoDB]")
+{
+    geom::geometry_t geom{geom::point_t{1.2, 2.3}, 47};
+
+    auto const result = ewkb_to_geom(geom_to_ewkb(geom, true));
+    REQUIRE(result.is_multipoint());
+    REQUIRE(result.srid() == 47);
+    auto const &rmp = result.get<geom::multipoint_t>();
+    REQUIRE(rmp.num_geometries() == 1);
+
+    REQUIRE(rmp[0] == geom.get<geom::point_t>());
+}
+
+TEST_CASE("wkb: multipoint", "[NoDB]")
+{
+    geom::geometry_t geom{geom::multipoint_t{}, 46};
+
+    auto &mp = geom.get<geom::multipoint_t>();
+    mp.emplace_back(geom::point_t{{1.2, 2.3}});
+    mp.emplace_back(geom::point_t{{7.0, 7.0}});
+
+    auto const result = ewkb_to_geom(geom_to_ewkb(geom));
+    REQUIRE(result.is_multipoint());
+    REQUIRE(result.srid() == 46);
+    auto const &rmp = result.get<geom::multipoint_t>();
+    REQUIRE(rmp.num_geometries() == 2);
+
+    REQUIRE(rmp[0] == mp[0]);
+    REQUIRE(rmp[1] == mp[1]);
+}
+
 TEST_CASE("wkb: linestring as multilinestring", "[NoDB]")
 {
     geom::geometry_t geom{