Do not create SVG files when redirected to sdout

build.sh

@@ -1,4 +1,8 @@
 # Find out if $BUILD_DIR is set, if not then assume it's in a local environment
+if [[ -z ${BUILD_DIR} ]]; then
+    BUILD_DIR=build
+fi
+
 if [[ -n ${BUILD_DIR} ]]; then
     # Docker is already a virtual environment so no need to create one
     # Build the project
@@ -10,13 +14,13 @@ else
     python3 -m venv .venv
     source .venv/bin/activate
 
-if [[ -z ${BUILD_TYPE} ]]; then
-    BUILD_TYPE=Release
-fi
-
-# Output BUILD_DIR and BUILD_TYPE
-echo "Building in directory: $BUILD_DIR, with build type: $BUILD_TYPE"
+    if [[ -z ${BUILD_TYPE} ]]; then
+        BUILD_TYPE=Release
+    fi
 
+    # Output BUILD_DIR and BUILD_TYPE
+    echo "Building in directory: $BUILD_DIR, with build type: $BUILD_TYPE"
+fi
 # Warn user if BUILD_DIR already exists
 if [[ -d $BUILD_DIR ]]; then
     echo "Warning: $BUILD_DIR already exists. Pre-existing cache may interfere with the build process and cause installation to fail. Consider deleting it before proceeding."

include/cartogram_info.hpp

@@ -59,7 +59,7 @@ class CartogramInfo
   void rescale_insets();
 
   std::string set_map_name(const std::string &);
-  void reposition_insets(bool output_to_stdout = false);
+  void reposition_insets();
 
   void plot_input();
   void preprocess();

include/inset_state.hpp

@@ -277,7 +277,6 @@ class InsetState
 
   void write_map(
     const std::string &,
-    bool,
     bool equal_area_map = false,
     const std::unordered_map<Point, Vector> =
       std::unordered_map<Point, Vector>()) const;

src/cartogram_info/cartogram_info.cpp

@@ -435,6 +435,11 @@ void CartogramInfo::write_shifted_insets()
 
 void CartogramInfo::write_svg(const std::string &suffix)
 {
+  // Skip SVG output if redirect_exports_to_stdout is enabled
+  if (args_.redirect_exports_to_stdout) {
+    return;
+  }
+
   InsetState insets_combined = convert_to_inset_state();
   insets_combined.rescale_map();
 

src/cartogram_info/shift_insets_to_position.cpp

@@ -1,7 +1,7 @@
 #include "cartogram_info.hpp"
 #include "constants.hpp"
 
-void CartogramInfo::reposition_insets(bool output_to_stdout)
+void CartogramInfo::reposition_insets()
 {
 
   // Warn user about repositoning insets with `--skip_projection` flag
@@ -28,7 +28,7 @@ void CartogramInfo::reposition_insets(bool output_to_stdout)
   // If the inset actually exists, we get its current bounding box
   for (const InsetState &inset_state : inset_states_) {
     std::string inset_pos = inset_state.pos();
-    bboxes.at(inset_pos) = inset_state.bbox(output_to_stdout);
+    bboxes.at(inset_pos) = inset_state.bbox(args_.redirect_exports_to_stdout);
   }
 
   // Calculate the width and height of all positioned insets without spacing
@@ -100,7 +100,7 @@ void CartogramInfo::reposition_insets(bool output_to_stdout)
     // Apply translation to all points
     inset_state.transform_points(translate, false);
 
-    if (output_to_stdout) {
+    if (args_.redirect_exports_to_stdout) {
       inset_state.transform_points(translate, true);
     }
   }

src/draw/draw.cpp

@@ -161,7 +161,6 @@ void InsetState::write_intersections_image()
 
 void InsetState::write_map(
   const std::string &file_name,
-  const bool plot_grid,
   const bool equal_area_map,
   const std::unordered_map<Point, Vector> vectors) const
 {
@@ -177,7 +176,7 @@ void InsetState::write_map(
     /*colours       =*/has_colors,
     *this);
 
-  if (plot_grid) {
+  if (args_.plot_grid) {
     write_grid(cvs, *this);
     write_legend(cvs, equal_area_map, *this);
   }

src/inset_state/blur_density.cpp

@@ -27,8 +27,8 @@ void InsetState::blur_density()
   execute_fftw_bwd_plan();
   timer.stop("Blur");
 
-  // Do not plot if the blur width is too small
-  if (args_.plot_density && bw > 0.1) {
+  // Do not plot if the blur width is too small or when redirecting to stdout
+  if (args_.plot_density && bw > 0.1 && !args_.redirect_exports_to_stdout) {
     std::string file_name = file_prefix_ + "_blurred_density.svg";
     write_density_image(file_name);
   }

src/inset_state/fill_with_density.cpp

@@ -14,8 +14,8 @@ void InsetState::fill_with_density()
     fill_with_density_clip();
   }
 
-  // Plot density map if requested
-  if (args_.plot_density) {
+  // Plot density map if requested (but not when redirecting to stdout)
+  if (args_.plot_density && !args_.redirect_exports_to_stdout) {
     std::string file_name = file_prefix_ + "_unblurred_density.svg";
     write_density_image(file_name);
   }

src/inset_state/flatten_density.cpp

@@ -34,7 +34,7 @@ bool InsetState::flatten_density()
     create_and_refine_quadtree();
     create_delaunay_t();
 
-    if (args_.plot_quadtree) {
+    if (args_.plot_quadtree && !args_.redirect_exports_to_stdout) {
       write_quadtree(file_prefix_ + "_quadtree");
       write_delaunay_triangles(file_prefix_ + "a_delaunay_t", false);
     }

src/inset_state/integrate.cpp

@@ -27,13 +27,13 @@ void InsetState::preprocess()
     std::cerr << "End of initial simplification of " << pos_ << std::endl;
   }
 
-  // Plot if requested
-  if (args_.plot_polygons) {
+  // Plot if requested (but not when redirecting to stdout)
+  if (args_.plot_polygons && !args_.redirect_exports_to_stdout) {
 
     // Color if necessary
     auto_color();
     initialize_identity_proj();
-    write_map(inset_name_ + "_input", args_.plot_grid, true);
+    write_map(inset_name_ + "_input", true);
   }
 
   timer.stop("Preprocessing");
@@ -137,9 +137,10 @@ void InsetState::integrate(ProgressTracker &progress_tracker)
   std::cerr << "Finished integrating inset " << pos_ << std::endl;
   progress_tracker.update_and_print_progress_end_integration(n_geo_divs());
 
-  // Write SVG for this inset, if requested
-  if (args_.plot_polygons) {
-    write_map(inset_name() + "_output", args_.plot_grid, false);
+  // Write SVG for this inset, if requested (but not when redirecting to
+  // stdout)
+  if (args_.plot_polygons && !args_.redirect_exports_to_stdout) {
+    write_map(inset_name() + "_output", false);
   }
 
   // Project original map with cumulative projection

src/inset_state/project.cpp

@@ -11,8 +11,8 @@ void InsetState::project()
       densify_geo_divs_using_delaunay_t();
     }
 
-    // Plot if requested
-    if (args_.plot_quadtree) {
+    // Plot if requested (but not when redirecting to stdout)
+    if (args_.plot_quadtree && !args_.redirect_exports_to_stdout) {
       write_delaunay_triangles(
         file_prefix_ + "c_updated_delaunay_t_after_flatten",
         false);
@@ -21,7 +21,7 @@ void InsetState::project()
     // Project using the updated Delaunay triangulation and plot
     project_with_delaunay_t(args_.redirect_exports_to_stdout);
 
-    if (args_.plot_quadtree) {
+    if (args_.plot_quadtree && !args_.redirect_exports_to_stdout) {
       write_delaunay_triangles(
         file_prefix_ + "d_projected_with_updated_delaunay_t",
         true);
@@ -50,7 +50,7 @@ void InsetState::project()
 
     simplify(args_.target_points_per_inset);
   }
-  if (args_.plot_intersections) {
+  if (args_.plot_intersections && !args_.redirect_exports_to_stdout) {
     write_intersections_image();
   }
 }

src/main.cpp

@@ -28,8 +28,9 @@ int main(const int argc, const char *argv[])
   // Store total number of GeoDivs to monitor progress
   size_t total_geo_divs = cart_info.n_geo_divs();
 
-  // Write input map, with insets nicely placed
-  if (args.plot_polygons) {
+  // Write input map, with insets nicely placed (but not when redirecting to
+  // stdout)
+  if (args.plot_polygons && !args.redirect_exports_to_stdout) {
     cart_info.plot_input();
   }
 
@@ -59,12 +60,12 @@ int main(const int argc, const char *argv[])
   cart_info.rescale_insets();
 
   // Shift insets so that they do not overlap
-  cart_info.reposition_insets(args.redirect_exports_to_stdout);
+  cart_info.reposition_insets();
 
   // Output to GeoJSON
   cart_info.write_geojson("cartogram");
 
-  if (args.plot_polygons) {
+  if (args.plot_polygons && !args.redirect_exports_to_stdout) {
     cart_info.write_svg("cartogram");
   }