On Cell::AddRing, close the LinearRing if the last point and the first are not the same

Author: Gonzalo-Mier

include/fields2cover/types/LinearRing.h

@@ -46,6 +46,8 @@ struct LinearRing : public Geometries<LinearRing, OGRLinearRing, wkbLinearRing,
   const Point startPoint() const;
   const Point endPoint() const;
   bool isClockwise() const;
+  bool isClosed() const;
+  LinearRing& closeRing();
 
   Point closestPointTo(const Point& p) const;
 };

src/fields2cover/types/Cell.cpp

@@ -122,7 +122,7 @@ Cell Cell::convexHull() const {
 
 void Cell::addRing(const LinearRing& t) {
   auto r = t.clone();
-  this->data_->addRing(r.get());
+  this->data_->addRing(r.closeRing().get());
 }
 
 void Cell::addGeometry(const LinearRing& ring) {

src/fields2cover/types/LinearRing.cpp

@@ -122,6 +122,17 @@ bool LinearRing::isClockwise() const {
   return data_->isClockwise();
 }
 
+bool LinearRing::isClosed() const {
+  return data_->IsEmpty() || data_->get_IsClosed();
+}
+
+LinearRing& LinearRing::closeRing() {
+  if (!this->isClosed()) {
+    this->addPoint(this->startPoint());
+  }
+  return *this;
+}
+
 Point LinearRing::closestPointTo(const Point& p) const {
   std::vector<double> dist;
   std::vector<Point> ps;

src/fields2cover/utils/parser.cpp

@@ -88,17 +88,17 @@ F2CPoint getPointFromJson(const json& ps) {
 }
 
 F2CCell getCellFromJson(const json& imported_cell) {
-  F2CLinearRing outer_ring;
-  for (auto&& ps : imported_cell["geometry"]["coordinates"][0]) {
-    outer_ring.addPoint(getPointFromJson(ps));
-  }
-  F2CCell cell(outer_ring);
-  for (int i = 1; i < imported_cell["geometry"]["coordinates"].size(); ++i) {
-    F2CLinearRing inner_ring;
-    for (auto&& ps : imported_cell["geometry"]["coordinates"][i]) {
-      inner_ring.addPoint(getPointFromJson(ps));
+  auto jsonToF2CRing = [] (const json& json_ring) {
+    F2CLinearRing ring;
+    for (auto&& ps : json_ring) {
+      ring.addPoint(getPointFromJson(ps));
     }
-    cell.addRing(inner_ring);
+    return ring;
+  };
+  F2CCell cell;
+  auto json_rings = imported_cell["geometry"]["coordinates"];
+  for (int i = 0; i < json_rings.size(); ++i) {
+    cell.addRing(jsonToF2CRing(json_rings[i]));
   }
   return cell;
 }