Fix Issues with Shifting of Insets to Position and String to Decimal Converter

include/cartogram_info.hpp

@@ -38,7 +38,7 @@ class CartogramInfo
   std::map<std::string, InsetState> &ref_to_inset_states();
   void replace_missing_and_zero_target_areas();
   std::string set_map_name(const std::string &);
-  void shift_insets_to_target_position();
+  void shift_insets_to_target_position(bool = false);
   void write_csv(const std::string &csv_file_name);
   void write_geojson(const std::string &, const std::string &, bool = false);
 };

include/inset_state.hpp

@@ -211,7 +211,7 @@ class InsetState
   unsigned int n_geo_divs() const;
   unsigned long n_points() const;
   unsigned int n_rings() const;
-  void normalize_inset_area(double total_cart_target_area, bool = false);
+  void normalize_inset_area(double, bool = false, bool = false);
   void normalize_target_area();
   std::string pos() const;
   void project();
@@ -240,7 +240,7 @@ class InsetState
   void store_original_geo_divs();
   double target_area_at(const std::string &) const;
   bool target_area_is_missing(const std::string &) const;
-  double total_inset_area() const;
+  double total_inset_area(bool = false) const;
   double total_target_area() const;
   Polygon transform_to_equal_area_projection_coor(Polygon edge_points);
   std::array<Point, 3> transformed_triangle(

src/cartogram_info/read_csv.cpp

@@ -51,10 +51,10 @@ void CartogramInfo::read_csv(const argparse::ArgumentParser &arguments)
   std::set<std::string> inset_pos_set;
   for (auto &row : reader) {
     if (row.size() < 2) {
-      std::cerr << "ERROR: CSV with >= 2 columns (IDs, target areas) required"
-                << std::endl
-                << "Some rows in your CSV may not have values for all columns"
-                << std::endl;
+      std::cerr
+        << "ERROR: CSV with >= 2 columns (IDs, target areas) required. Some "
+           "rows in your CSV may not have values for all columns"
+        << std::endl;
       _Exit(17);
     }
 
@@ -79,9 +79,9 @@ void CartogramInfo::read_csv(const argparse::ArgumentParser &arguments)
     }
 
     if (!StringToDecimalConverter::is_str_valid_characters(area_as_str)) {
-      std::cerr << "ERROR: Invalid area string: " << area_as_str << std::endl;
       std::cerr
-        << "Area string must only contain 0-9, '.', '-' and ',' or 'NA'."
+        << "ERROR: Invalid area string: " << area_as_str
+        << ". Area string must only contain 0-9, '.', '-' and ',' or 'NA'."
         << std::endl;
       _Exit(18);
     }

src/cartogram_info/read_geojson.cpp

@@ -185,8 +185,8 @@ void CartogramInfo::read_geojson(
   try {
     in_file >> j;
   } catch (nlohmann::json::parse_error &e) {
-    std::cerr << "ERROR: " << e.what() << ".\nexception id: " << e.id
-              << "\nbyte position of error: " << e.byte << std::endl;
+    std::cerr << "ERROR: " << e.what() << ". Exception id: " << e.id
+              << ". Byte position of error: " << e.byte << std::endl;
     _Exit(3);
   }
   check_geojson_validity(j);
@@ -222,7 +222,7 @@ void CartogramInfo::read_geojson(
           !properties.contains(id_header_) &&
           !id_header_.empty()) {  // Visual file not provided
           std::cerr << "ERROR: In GeoJSON, there is no property " << id_header_
-                    << " in feature.\nAvailable properties are: " << properties
+                    << " in feature. Available properties are: " << properties
                     << std::endl;
           _Exit(16);
         }
@@ -414,12 +414,18 @@ void CartogramInfo::read_geojson(
     std::inserter(ids_not_in_geojson, ids_not_in_geojson.end()));
   if (!ids_not_in_geojson.empty()) {
     std::cerr << "ERROR: Mismatch between GeoJSON and "
-              << visual_variable_file_ << "." << std::endl;
-    std::cerr << "The following IDs do not appear in the GeoJSON:"
-              << std::endl;
-    for (const auto &id : ids_not_in_geojson) {
-      std::cerr << "  " << id << std::endl;
+              << visual_variable_file_
+              << ". The following IDs do not appear in the GeoJSON: ";
+    std::vector<std::string> ids_not_in_geojson_vec(
+      ids_not_in_geojson.begin(),
+      ids_not_in_geojson.end());
+    for (size_t i = 0; i < ids_not_in_geojson_vec.size(); ++i) {
+      std::cerr << ids_not_in_geojson_vec[i];
+      if (i < ids_not_in_geojson_vec.size() - 1) {
+        std::cerr << ", ";
+      }
     }
+    std::cerr << std::endl;
     _Exit(20);
   }
 
@@ -433,12 +439,19 @@ void CartogramInfo::read_geojson(
     std::inserter(ids_not_in_vv, ids_not_in_vv.end()));
   if (!ids_not_in_vv.empty()) {
     std::cerr << "WARNING: Mismatch between GeoJSON and "
-              << visual_variable_file_ << "." << std::endl;
-    std::cerr << "The following IDs do not appear in " << visual_variable_file_
-              << ": " << std::endl;
-    for (const auto &id : ids_not_in_vv) {
-      std::cerr << "  " << id << std::endl;
+              << visual_variable_file_
+              << ". The following IDs do not appear in "
+              << visual_variable_file_ << ": ";
+    std::vector<std::string> ids_not_in_vv_vec(
+      ids_not_in_vv.begin(),
+      ids_not_in_vv.end());
+    for (size_t i = 0; i < ids_not_in_vv_vec.size(); ++i) {
+      std::cerr << ids_not_in_vv_vec[i];
+      if (i < ids_not_in_vv_vec.size() - 1) {
+        std::cerr << ", ";
+      }
     }
+    std::cerr << std::endl;
     // _Exit(21);
     // TODO: Decide, is this an error, or warning?
   }

src/cartogram_info/shift_insets_to_position.cpp

@@ -1,7 +1,7 @@
 #include "cartogram_info.hpp"
 #include "constants.hpp"
 
-void CartogramInfo::shift_insets_to_target_position()
+void CartogramInfo::shift_insets_to_target_position(bool output_to_stdout)
 {
   // For simplicity's sake, let us formally insert bounding boxes for
   // all conceivable inset positions
@@ -13,7 +13,7 @@ void CartogramInfo::shift_insets_to_target_position()
 
   // If the inset actually exists, we get its current bounding box
   for (const auto &[inset_pos, inset_state] : inset_states_) {
-    bboxes.at(inset_pos) = inset_state.bbox();
+    bboxes.at(inset_pos) = inset_state.bbox(output_to_stdout);
   }
 
   // Calculate the width and height of all positioned insets without spacing
@@ -82,6 +82,6 @@ void CartogramInfo::shift_insets_to_target_position()
       CGAL::Vector_2<Scd>(x, y));
 
     // Apply translation to all points
-    inset_state.transform_points(translate);
+    inset_state.transform_points(translate, output_to_stdout);
   }
 }

src/cartogram_info/write_geojson.cpp

@@ -91,7 +91,7 @@ nlohmann::json CartogramInfo::cgal_to_json(
 
   // Insert divider lines between all insets
   for (const auto &[inset_pos, inset_state] : inset_states_) {
-    const Bbox inset_bb = inset_state.bbox();
+    const Bbox inset_bb = inset_state.bbox(original_geo_divs_to_geojson);
     if (inset_pos == "T") {
       divider_container.push_back(divider_points(
         min_xmin_tcb,

src/inset_state/check_topology.cpp

@@ -16,10 +16,10 @@ void InsetState::holes_inside_polygons() const
           // "do_intersect(Polygon, Polygon)" may help.
           if (ext_ring.bounded_side(p) == CGAL::ON_UNBOUNDED_SIDE) {
             CGAL::set_pretty_mode(std::cerr);
-            std::cerr << "Hole detected outside polygon!" << std::endl;
-            std::cerr << "Hole: " << h << std::endl;
-            std::cerr << "Polygon: " << ext_ring << std::endl;
-            std::cerr << "GeoDiv: " << gd.id() << std::endl;
+            std::cerr << "ERROR: Hole detected outside polygon!";
+            std::cerr << " Hole: " << h;
+            std::cerr << ". Polygon: " << ext_ring;
+            std::cerr << ". GeoDiv: " << gd.id() << std::endl;
             _Exit(20);
           }
         }
@@ -34,16 +34,19 @@ void InsetState::is_simple(const char *caller_func) const
     for (const auto &pwh : gd.polygons_with_holes()) {
       if (!pwh.outer_boundary().is_simple()) {
         std::cerr << "ERROR: Outer boundary is not simple for GeoDiv "
-                  << gd.id() << std::endl;
-        std::cerr << "is_simple() called from " << caller_func << std::endl;
+                  << gd.id();
+        std::cerr << ". is_simple() called from " << caller_func << std::endl;
         write_cairo_map(
           inset_name_ + "_" + std::to_string(n_finished_integrations_) +
             "_not_simple_after_" + caller_func,
           false);
         exit(1);
       }
-      for (const auto &h : pwh.holes()) { if (!h.is_simple()) { std::cerr << gd.id() << std::endl; std::cerr << "ERROR: Hole is not simple for GeoDiv " << gd.id() << std::endl;
-          std::cerr << "is_simple() called from " << caller_func << std::endl;
+      for (const auto &h : pwh.holes()) {
+        if (!h.is_simple()) {
+          std::cerr << "ERROR: Hole is not simple for GeoDiv " << gd.id();
+          std::cerr << ". is_simple() called from " << caller_func
+                    << std::endl;
           write_cairo_map(
             inset_name_ + "_" + std::to_string(n_finished_integrations_) +
               "_not_simple_after_" + caller_func,

src/inset_state/fill_with_density_rays.cpp

@@ -122,7 +122,7 @@ void InsetState::fill_with_density_rays(bool plot_density)
           intersections_at_y[i + 1].ray_enters) {
 
           // Highlight where intersection is present
-          std::cerr << "\nInvalid Geometry!" << std::endl;
+          std::cerr << "\n ERROR: Invalid Geometry!" << std::endl;
           std::cerr << "Intersection of Polygons/Holes/Geodivs" << std::endl;
           std::cerr << "Y-coordinate: " << y << std::endl;
           std::cerr << "Left X-coordinate: " << left_x << std::endl;

src/inset_state/inset_state.cpp

@@ -20,7 +20,7 @@ double InsetState::area_error_at(const std::string &id) const
 
 Bbox InsetState::bbox(bool original_bbox) const
 {
-  auto &geo_divs = original_bbox ? geo_divs_original_ : geo_divs_;
+  auto &geo_divs = original_bbox ? geo_divs_original_transformed_ : geo_divs_;
   // Find joint bounding box for all "polygons with holes" in this inset
   double inset_xmin = dbl_inf;
   double inset_xmax = -dbl_inf;
@@ -895,10 +895,11 @@ double InsetState::target_area_at(const std::string &id) const
   }
 }
 
-double InsetState::total_inset_area() const
+double InsetState::total_inset_area(bool original_area) const
 {
+  auto &geo_divs = original_area ? geo_divs_original_transformed_ : geo_divs_;
   double total_inset_area = 0.0;
-  for (const auto &gd : geo_divs_) {
+  for (const auto &gd : geo_divs) {
     total_inset_area += gd.area();
   }
   return total_inset_area;

src/inset_state/interpolate_bilinearly.cpp

@@ -24,7 +24,7 @@ double interpolate_bilinearly(
 {
   if (x < 0 || x > lx || y < 0 || y > ly) {
     std::cerr << "ERROR: coordinate outside bounding box in " << __func__
-              << "().\n"
+              << "(). "
               << "x=" << x << ", y=" << y << std::endl;
     exit(1);
   }
@@ -114,7 +114,7 @@ double interpolate_bilinearly(
 {
   if (x < 0 || x > lx || y < 0 || y > ly) {
     std::cerr << "ERROR: coordinate outside bounding box in " << __func__
-              << "().\n"
+              << "(). "
               << "x=" << x << ", y=" << y << std::endl;
     exit(1);
   }

src/inset_state/project.cpp

@@ -132,7 +132,7 @@ void InsetState::exit_if_not_on_grid_or_edge(const Point p1) const
   if (
     (p1.x() != 0.0 && p1.x() != lx_ && p1.x() - int(p1.x()) != 0.5) ||
     (p1.y() != 0.0 && p1.y() != ly_ && p1.y() - int(p1.y()) != 0.5)) {
-    std::cerr << "Error: Invalid input coordinate in triangulation\n"
+    std::cerr << "ERROR: Invalid input coordinate in triangulation. "
               << "\tpt = (" << p1.x() << ", " << p1.y() << ")" << std::endl;
     exit(1);
   }
@@ -289,7 +289,7 @@ std::array<Point, 3> InsetState::untransformed_triangle(
   if (pt.x() < 0 || pt.x() > lx_ || pt.y() < 0 || pt.y() > ly_) {
     CGAL::set_pretty_mode(std::cerr);
     std::cerr << "ERROR: coordinate outside bounding box in " << __func__
-              << "().\npt = " << pt << std::endl;
+              << "(). pt = " << pt << std::endl;
     exit(1);
   }
 

src/inset_state/rescale_map.cpp

@@ -84,16 +84,17 @@ void InsetState::rescale_map(
 
 void InsetState::normalize_inset_area(
   double total_cart_target_area,
-  bool equal_area)
+  bool equal_area, bool normalize_original)
 {
-  const auto bb = bbox();
+  auto &geo_divs = normalize_original ? geo_divs_original_transformed_ : geo_divs_;
+  const auto bb = bbox(normalize_original);
 
   // Calculate scale_factor that makes inset areas proportional to their
   // target areas on the cartogram
   const double inset_area_prop =
     initial_target_area() / total_cart_target_area;
   const double scale_factor =
-    equal_area ? 1.0 : sqrt(inset_area_prop / total_inset_area());
+    equal_area ? 1.0 : sqrt(inset_area_prop / total_inset_area(normalize_original));
 
   // Rescale and translate all GeoDiv coordinates
   const Transformation translate(
@@ -102,7 +103,7 @@ void InsetState::normalize_inset_area(
       -(bb.xmin() + bb.xmax()) / 2,
       -(bb.ymin() + bb.ymax()) / 2));
   const Transformation scale(CGAL::SCALING, scale_factor);
-  for (auto &gd : geo_divs_) {
+  for (auto &gd : geo_divs) {
     for (auto &pwh : gd.ref_to_polygons_with_holes()) {
       auto &ext_ring = pwh.outer_boundary();
       ext_ring = transform(translate, ext_ring);

src/inset_state/scanline_graph.cpp

@@ -9,7 +9,7 @@ std::vector<std::vector<intersection> > InsetState::intersec_with_parallel_to(
   unsigned int resolution) const
 {
   if (axis != 'x' && axis != 'y') {
-    std::cerr << "Invalid axis in " << __func__ << "()" << std::endl;
+    std::cerr << "ERROR: Invalid axis in " << __func__ << "()" << std::endl;
     exit(984320);
   }
   const unsigned int grid_length = (axis == 'x' ? ly_ : lx_);
@@ -94,15 +94,15 @@ std::vector<std::vector<intersection> > InsetState::intersec_with_parallel_to(
 
           // Check whether the number of intersections is odd
           if (intersections.size() % 2 != 0) {
-            std::cerr << "Incorrect Topology.\n"
+            std::cerr << "ERROR: Incorrect Topology. "
                       << "Number of intersections: " << intersections.size()
-                      << "\n"
-                      << axis << "-coordinate: " << ray << "\n"
-                      << "Intersection points: " << std::endl;
+                      << ". "
+                      << axis << "-coordinate: " << ray << ". "
+                      << "Intersection points: ";
 
             for (auto &intersection : intersections) {
               std::cerr << (axis == 'x' ? intersection.x() : intersection.y())
-                        << std::endl;
+                        << " ";
             }
             std::cerr << std::endl << std::endl;
             _Exit(932875);

src/main.cpp

@@ -118,8 +118,10 @@ int main(const int argc, const char *argv[])
         inset_state.apply_albers_projection();
       }
     } else if (output_equal_area) {
-      std::cerr << "ERROR: Input GeoJSON is not a longitude-latitude map."
-                << std::endl;
+      std::cerr
+        << "ERROR: Input GeoJSON is not a longitude-latitude map. Therefore, "
+           "it is not possible to produce an equal-area map."
+        << std::endl;
       return EXIT_FAILURE;
     }
 
@@ -410,11 +412,18 @@ int main(const int argc, const char *argv[])
 
     // Rescale insets in correct proportion to each other
     inset_state.normalize_inset_area(
-      cart_info.cart_initial_total_target_area());
+      cart_info.cart_initial_total_target_area(),
+      false,
+      false);
+    inset_state.normalize_inset_area(
+      cart_info.cart_initial_total_target_area(),
+      false,
+      output_to_stdout);
   }
 
   // Shift insets so that they do not overlap
-  cart_info.shift_insets_to_target_position();
+  cart_info.shift_insets_to_target_position(false);
+  cart_info.shift_insets_to_target_position(output_to_stdout);
 
   // Output to GeoJSON
   cart_info.write_geojson(

src/misc/ft_real_2d.cpp

@@ -15,7 +15,7 @@ void FTReal2d::set_array_size(const unsigned int i, const unsigned int j)
 void FTReal2d::allocate(const unsigned int lx, const unsigned int ly)
 {
   if (lx * ly <= 0) {
-    std::cerr << "Invalid array dimensions in FTReal2dArray::allocate_ft()"
+    std::cerr << "ERROR: Invalid array dimensions in FTReal2dArray::allocate_ft()"
               << std::endl;
     _Exit(98915);
   }

src/misc/intersection.cpp

@@ -68,7 +68,7 @@ void add_intersections(
   const char axis)
 {
   if (axis != 'x' && axis != 'y') {
-    std::cerr << "Invalid axis in add_intersections()" << std::endl;
+    std::cerr << "ERROR: Invalid axis in add_intersections()" << std::endl;
     exit(984321);
   }
   Point prev_point = pgn[pgn.size() - 1];

src/misc/parse_arguments.cpp

@@ -141,7 +141,7 @@ argparse::ArgumentParser parsed_arguments(
   try {
     arguments.parse_args(argc, argv);
   } catch (const std::runtime_error &err) {
-    std::cerr << "ERROR: " << err.what() << std::endl;
+    std::cerr << "ERROR: " << err.what() << ". ";
     std::cerr << arguments;
     std::exit(1);
   }