Split geom::segmentize() function into two

with and without output parameter

Author: joto

src/geom-functions.cpp

@@ -309,22 +309,28 @@ static void split_linestring(linestring_t const &line, double split_at,
     }
 }
 
-geometry_t segmentize(geometry_t const &geom, double max_segment_length)
+void segmentize(geometry_t *output, geometry_t const &input,
+                double max_segment_length)
 {
-    geometry_t output{multilinestring_t{}, geom.srid()};
-    auto *multilinestring = &output.get<multilinestring_t>();
+    output->set_srid(input.srid());
+    auto *multilinestring = &output->set<multilinestring_t>();
 
-    if (geom.is_linestring()) {
-        split_linestring(geom.get<linestring_t>(), max_segment_length,
+    if (input.is_linestring()) {
+        split_linestring(input.get<linestring_t>(), max_segment_length,
                          multilinestring);
-    } else if (geom.is_multilinestring()) {
-        for (auto const &line : geom.get<multilinestring_t>()) {
+    } else if (input.is_multilinestring()) {
+        for (auto const &line : input.get<multilinestring_t>()) {
             split_linestring(line, max_segment_length, multilinestring);
         }
     } else {
-        output.reset();
+        output->reset();
     }
+}
 
+geometry_t segmentize(geometry_t const &input, double max_segment_length)
+{
+    geometry_t output;
+    segmentize(&output, input, max_segment_length);
     return output;
 }
 

src/geom-functions.hpp

@@ -115,13 +115,27 @@ geometry_t transform(geometry_t const &input, reprojection const &reprojection);
  * Returns a modified geometry having no segment longer than the given
  * max_segment_length.
  *
- * \param geom The input geometry, must be a linestring or multilinestring.
+ * \param output Pointer to output geometry. Will be a multilinestring
+ *        geometry, or nullgeom_t on error.
+ * \param input The input geometry, must be a linestring or multilinestring.
  * \param max_segment_length The maximum length (using Euclidean distance
- *        in the length unit of the srs of the geometry) of each resulting
+ *        in the length unit of the SRS of the geometry) of each resulting
+ *        linestring.
+ */
+void segmentize(geometry_t *output, geometry_t const &input,
+                double max_segment_length);
+
+/**
+ * Returns a modified geometry having no segment longer than the given
+ * max_segment_length.
+ *
+ * \param input The input geometry, must be a linestring or multilinestring.
+ * \param max_segment_length The maximum length (using Euclidean distance
+ *        in the length unit of the SRS of the geometry) of each resulting
  *        linestring.
  * \returns Resulting multilinestring geometry, nullgeom_t on error.
  */
-geometry_t segmentize(geometry_t const &geom, double max_segment_length);
+geometry_t segmentize(geometry_t const &input, double max_segment_length);
 
 /**
  * Calculate area of geometry.