contrek 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ca1b703822f8170679cfef42bdc5665fca4dcbeb49e0994efb78c1d325ff94
-  data.tar.gz: b64cf8c4f9110bcbac96e01c86fb4b923a19d342eefd11e56933fdfdde1889fd
+  metadata.gz: a6ed7af7c2661396d55b6ddacd89dfc6c08c4c54744d1443d03a6ba533605ed4
+  data.tar.gz: 3308bedea2f5e89fe8031a65c404c250490542142101dba32fd09f8510cb8cfb
 SHA512:
-  metadata.gz: 0e3e13330789b1d83025882e2179e54b2389092205ce9d0c5af8b7ba770118a1c585283f1367c15799c4ad3bb06ea1e97c6e15262c33ea229ef169fd343b03c1
-  data.tar.gz: fd08b11d3a2604724960d0bbd2e24516e7136f39cacb304df970c5c96670800f8863b561a85f4c64ff14d0a0c24a5b3d45f7a93070161f7f94ac97148e414d6b
+  metadata.gz: 250b0ed1bce589beaae764e03226206853f9e9c3bb356fe3bf827cd25c69d72f33ad820f3afa5d9d31aa83e628e67dd8c4500782dcdb668f44b0e098932f6c4f
+  data.tar.gz: 7cf17a172afd9ec9b1788f2abe1779421d204886b99fd54e4729fbf9b616cc3968bb7586cafa5b17da6b5cbcf9641e3f210ee6d3d320e4be67e945022964af13

data/CHANGELOG.md

@@ -167,3 +167,9 @@ All notable changes to this project will be documented in this file.
 - Fixed `VerticalMerger` handling of polygon orientation and starting points.
 - Added `detach()` to `RawBitmap` on the C++ side.
 - Added an OpenCV coordinate converter helper for converting contours to Contrek-compatible polygons.
+
+## [1.4.5] - 2026-10-11
+- Added tile boundary validation for external geometries, with support for bypassing checks via `unsafe_mode: true`.
+
+## [1.4.6] - 2026-10-18
+- Added tile metadata, polygon bounds, ordering, and shared boundary validation for Ruby and C++ mergers, with `unsafe_mode: true` to bypass validation.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contrek (1.4.3)
+    contrek (1.4.6)
       chunky_png (~> 1.4)
       concurrent-ruby (~> 1.3.5)
       ffi (~> 1.17)

data/README.md

@@ -676,6 +676,64 @@ result = Contrek.contour!(
 
 The choice mainly affects how diagonally touching regions are interpreted.
 
+## Merging External Geometry
+
+Contrek's merger can process polygon data produced by external contour
+extractors, provided that the input geometry follows the requirements below.
+
+### The Laws of the Tiles
+
+1. **Adjacent tiles must share an overlap and have identical exposed boundary sequences.**
+   Adjacent tiles must share a single scanline of overlap. The exposed contour
+   segments on their shared boundary must have identical coordinate sequences,
+   including all intermediate vertices, expressed in the same coordinate system.
+   Any mismatch between the two sequences makes the tiles incompatible for merging.
+
+2. **Coordinates must describe cell boundaries.**
+   A cell is the square area occupied by a pixel in the raster. Coordinates
+   must describe the boundaries of these cells, rather than representing a
+   pixel by its center or by a single vertex.
+
+3. **Contours must follow cell boundaries.**
+   Contour segments supplied to the merger must follow the horizontal and
+   vertical edges of the raster cells. Diagonal segments are not allowed in
+   the geometry passed to the merger.
+
+4. **Polygon orientation (`versus`) must be consistent across all tiles.**
+   All polygons must follow the orientation declared by the result, either
+   clockwise or counterclockwise. The same orientation must be used by every
+   tile submitted to the merger.
+
+5. **Every contour must start at the canonical point of its first scanline.**
+   A *scanline* is a horizontal raster row scanned from left to right, like
+   the electron beam of a CRT display. Consider the topmost scanline
+   intersecting the contour. On that scanline, a **counterclockwise** contour
+   must start from the **leftmost** point, while a **clockwise** contour must
+   start from the **rightmost** point.
+
+6. **The bounding box must match the contour geometry.**
+   `min_x`, `max_x`, `min_y`, and `max_y` must correctly describe the spatial
+   extent of the contour.
+
+7. **Tile metadata must match the supplied geometry.**
+   `width`, `height`, and `versus` must correctly describe the tile. In
+   particular, `height` must represent the actual height of the result.
+
+8. **Polygons must be sorted in raster scan order.**
+   Polygons must be ordered by increasing **Y**, and then by increasing **X**
+   when they have the same Y: top to bottom, and left to right at the same
+   vertical position.
+
+### Boundary Validation
+
+By default, Contrek validates the shared boundaries of adjacent tiles when merging externally supplied geometries. Boundary coordinates must match exactly, including intermediate vertices. Otherwise, the merger raises a `Tile boundary mismatch` error.
+
+This validation can be disabled by setting `unsafe_mode: true`, avoiding validation overhead when the input geometries are known to be valid.
+
+**Important:** Boundary validation does not verify all the Laws of the Tiles. Users supplying external geometries remain responsible for satisfying every requirement listed above.
+
+**Important:** Boundary validation prioritizes correctness over performance and introduce additional processing overhead. Experienced users who can guarantee that their input geometries satisfy the Laws of the Tiles can enable `unsafe_mode: true` to bypass validation entirely and achieve maximum merging performance. This option can also be useful during debugging to isolate merging issues from validation errors.
+
 # Results
 
 The tracing result contains two kinds of information:

data/ext/cpp_polygon_finder/PolygonFinder/src/Tests.cpp

@@ -294,7 +294,9 @@ void Tests::test_h()
   PolygonFinder pl_right(&b_right, &matcher, nullptr, options);
   ProcessResult *right_result = pl_right.process_info();
 
-  Options merger_options = {};
+  Options merger_options = {
+    {"unsafe_mode", true}
+  };
   HorizontalMerger hmerger(1, merger_options);
   hmerger.add_tile(*left_result);
   hmerger.add_tile(*right_result);
@@ -326,7 +328,9 @@ double get_peak_rss() {
 
 void stream_png_image(const std::string& filepath, uint32_t stripe_height, bool generate_svg = false, bool generate_png = false) {
     std::vector<ProcessResult*> result_clones;
-    Options options = {};
+    Options options = {
+      {"unsafe_mode", true}
+    };
     VerticalMerger vmerger(0, options);
 
     PngSource source(filepath);
@@ -409,7 +413,7 @@ void stream_progressive_png_image(const std::string& filepath, uint32_t stripe_h
 
   SvgStreamingMerger merger(
     0,
-    {{"bounds", true}},
+    {{"bounds", true}, {"unsafe_mode", true}},
     &stream,
     source.width(),
     source.height());

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/PolygonFinder.h

@@ -68,7 +68,8 @@ struct pf_Options {
 
 struct ProcessResult {
   int groups;
-  int width, height;
+  int width = 0;
+  int height = 0;
   int versus;
   int number_of_threads;
   bool has_bounds = false;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/GeoJsonStreamingMerger.h

@@ -34,7 +34,7 @@ class GeoJsonStreamingMerger : public StreamingMerger {
     if (!transform || !crs) throw std::invalid_argument("Invalid geo_localization.");
 
     const std::string authority = crs->get<std::string>("authority", "");
-    const auto code = crs->get("code", 0L);
+    const auto code = crs->get("code", std::int64_t{0});
     if (authority != "EPSG" || code != 4326) throw std::invalid_argument("Unsupported CRS: " + authority + ":" + std::to_string(code));
     const double x_origin = transform->get<double>("x_origin", 0.0);
     const double y_origin = transform->get<double>("y_origin", 0.0);

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.cpp

@@ -10,6 +10,9 @@
 #include <iostream>
 #include <string>
 #include <vector>
+#include <algorithm>
+#include <list>
+#include <memory>
 #include "Merger.h"
 
 Merger::Merger(int number_of_threads, const Options& options)
@@ -17,7 +20,9 @@ Merger::Merger(int number_of_threads, const Options& options)
   if (options.contains("versus")) {
     std::cerr << "[Contrek WARNING] The given options 'versus' will be ignored." << std::endl;
   }
-  if (!this->safe()) {
+  if (safe()) {
+    validator_ = std::make_unique<MergerValidator>(*this);
+  } else {
     std::cerr << "[Contrek WARNING] Processing tile with 'unsafe_mode: true'. "
               << "Incompatible result options might lead to unexpected vector geometry.\n";
   }
@@ -28,7 +33,10 @@ bool Merger::safe() {
 }
 
 void Merger::add_tile(ProcessResult& result)
-{ if (this->height == 0) {
+{ if (validator_) {
+    validator_->validate_metadata(result);
+  }
+  if (this->height == 0) {
     this->height = result.height;
   } else {
     if (result.height != this->height && safe()) {
@@ -51,6 +59,9 @@ void Merger::add_tile(ProcessResult& result)
   }
 
   int end_x = this->current_x + result.width;
+  if (validator_) {
+    validator_->validate(result, this->current_x, end_x);
+  }
   Tile* tile = new Tile(this, this->current_x, end_x, std::to_string(tiles_.size()), tiles_.size(), Benchmarks {0, 0});
   tile->assign_raw_polygons(result.polygons, result.treemap);
   tiles_.queue_push(tile);
@@ -76,3 +87,4 @@ void Merger::translate(ProcessResult& result, int offset) {
     polygon.bounds.max_x += offset;
   }
 }
+

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.h

@@ -10,7 +10,10 @@
 #pragma once
 #include <string>
 #include <vector>
+#include <list>
+#include <memory>
 #include "Finder.h"
+#include "MergerValidator.h"
 #include "../Options.h"
 
 class Merger : public Finder {
@@ -23,4 +26,5 @@ class Merger : public Finder {
  protected:
   void translate(ProcessResult& result, int offset);
   int current_x = 0;
+  std::unique_ptr<MergerValidator> validator_;
 };

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/MergerValidator.cpp

@@ -0,0 +1,104 @@
+/*
+ * MergerValidator.cpp
+ *
+ * Copyright (c) 2025-2026 Emanuele Cesaroni
+ *
+ * Licensed under the GNU Affero General Public License v3 (AGPLv3).
+ * See the LICENSE file in this directory for the full license text.
+ */
+
+#include "MergerValidator.h"
+#include "Merger.h"
+#include <algorithm>
+#include <stdexcept>
+#include <vector>
+#include <list>
+#include <utility>
+
+MergerValidator::MergerValidator(const Merger& merger)
+  : merger_(merger) {}
+
+void MergerValidator::validate_metadata(const ProcessResult& result) const {
+  if (result.width <= 0) {
+    throw std::invalid_argument("Invalid result metadata: width must be a positive integer");
+  }
+  if (result.height <= 0) {
+    throw std::invalid_argument("Invalid result metadata: height must be a positive integer");
+  }
+  if (result.versus != Node::A && result.versus != Node::O) {
+    throw std::invalid_argument("Invalid result metadata: unsupported versus option");
+  }
+}
+
+void MergerValidator::validate(const ProcessResult& result, int start_x, int end_x) {
+  validate_bounds(result.polygons);
+  validate_polygon_order(result.polygons);
+  validate_boundary(result, start_x);
+
+  previous_boundary_ = boundary_coordinates(result.polygons, end_x);
+  has_previous_boundary_ = true;
+}
+
+void MergerValidator::validate_bounds(const std::list<Polygon>& polygons) const {
+  for (const auto& polygon : polygons) {
+    if (polygon.outer.empty()) {
+      throw std::invalid_argument("Invalid polygon: empty outer contour");
+    }
+    RectBounds actual = RectBounds::empty();
+
+    for (const auto& point : polygon.outer) {
+      actual.expand(point.x, point.y);
+    }
+
+    const auto& bounds = polygon.bounds;
+    if (bounds.min_x != actual.min_x ||
+        bounds.max_x != actual.max_x ||
+        bounds.min_y != actual.min_y ||
+        bounds.max_y != actual.max_y) {
+      throw std::invalid_argument("Invalid polygon bounds: bounding box does not match outer contour");
+    }
+  }
+}
+
+void MergerValidator::validate_polygon_order(const std::list<Polygon>& polygons) const {
+  bool has_previous = false;
+  std::pair<int, int> previous;
+
+  for (const auto& polygon : polygons) {
+    const auto& bounds = polygon.bounds;
+
+    const std::pair<int, int> current = merger_.transpose()
+      ? std::make_pair(bounds.min_x, bounds.min_y)
+      : std::make_pair(bounds.min_y, bounds.min_x);
+
+    if (has_previous && current < previous) {
+      throw std::invalid_argument("Invalid polygon order: polygons are not in raster scan order");
+    }
+    previous = current;
+    has_previous = true;
+  }
+}
+
+void MergerValidator::validate_boundary(const ProcessResult& result, int start_x) const {
+  if (!has_previous_boundary_) return;
+
+  const auto current = boundary_coordinates(result.polygons, start_x);
+  if (previous_boundary_ != current) {
+    throw std::invalid_argument("Tile boundary mismatch: adjacent tiles have different edge coordinates");
+  }
+}
+
+std::vector<int> MergerValidator::boundary_coordinates(const std::list<Polygon>& polygons, int boundary_x) {
+  std::vector<int> coordinates;
+
+  for (const auto& polygon : polygons) {
+    for (const auto& point : polygon.outer) {
+      if (point.x == boundary_x) {
+        coordinates.push_back(point.y);
+      }
+    }
+  }
+
+  std::sort(coordinates.begin(), coordinates.end());
+  return coordinates;
+}

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/MergerValidator.h

@@ -0,0 +1,35 @@
+/*
+ * MergerValidator.h
+ *
+ * Copyright (c) 2025-2026 Emanuele Cesaroni
+ *
+ * Licensed under the GNU Affero General Public License v3 (AGPLv3).
+ * See the LICENSE file in this directory for the full license text.
+ */
+
+#pragma once
+
+#include <vector>
+#include <list>
+#include "../PolygonFinder.h"
+
+class Merger;
+
+class MergerValidator {
+ public:
+  explicit MergerValidator(const Merger& merger);
+
+  void validate_metadata(const ProcessResult& result) const;
+  void validate(const ProcessResult& result, int start_x, int end_x);
+
+ private:
+  const Merger& merger_;
+  std::vector<int> previous_boundary_;
+  bool has_previous_boundary_ = false;
+
+  void validate_bounds(const std::list<Polygon>& polygons) const;
+  void validate_polygon_order(const std::list<Polygon>& polygons) const;
+  void validate_boundary(const ProcessResult& result, int start_x) const;
+
+  static std::vector<int> boundary_coordinates(const std::list<Polygon>& polygons, int boundary_x);
+};

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Tile.cpp

@@ -60,27 +60,25 @@ void Tile::assign_raw_polygons(const std::list<Polygon>& raw_polylines, const st
   std::unordered_map<int, Shape*> shapes_map;
   int polyline_index = 0;
   for (const auto& raw_polyline : raw_polylines)
-  { if (raw_polyline.bounds.width() > 0)
-    { Polyline* polyline = this->shapes_pool->acquire_polyline(this, raw_polyline.outer, raw_polyline.bounds);
-      std::vector<InnerPolyline*> inner_polylines_list;
-      for (auto& raw_points : raw_polyline.inner) {
-        inner_polylines_list.push_back(this->shapes_pool->acquire_inner_polyline(raw_points, nullptr));
-      }
-      Shape* shape = this->shapes_pool->acquire_shape(polyline, inner_polylines_list);
-      polyline->shape = shape;
-      this->shapes_.push_back(shape);
-
-      if (treemap.size() > 0)
-      { auto treemap_entry = treemap[polyline_index];
-        shapes_map[polyline_index] = shape;
-        if (treemap_entry.first != -1 && treemap_entry.second != -1) {
-          auto it = shapes_map.find(treemap_entry.first);
-          if (it != shapes_map.end()) {
-            Shape* parent = it->second;
-            shape->set_parent_shape(parent);
-            shape->fixed = true;
-            shape->parent_inner_polyline = parent->inner_polylines[treemap_entry.second];
-          }
+  { Polyline* polyline = this->shapes_pool->acquire_polyline(this, raw_polyline.outer, raw_polyline.bounds);
+    std::vector<InnerPolyline*> inner_polylines_list;
+    for (auto& raw_points : raw_polyline.inner) {
+      inner_polylines_list.push_back(this->shapes_pool->acquire_inner_polyline(raw_points, nullptr));
+    }
+    Shape* shape = this->shapes_pool->acquire_shape(polyline, inner_polylines_list);
+    polyline->shape = shape;
+    this->shapes_.push_back(shape);
+
+    if (treemap.size() > 0)
+    { auto treemap_entry = treemap[polyline_index];
+      shapes_map[polyline_index] = shape;
+      if (treemap_entry.first != -1 && treemap_entry.second != -1) {
+        auto it = shapes_map.find(treemap_entry.first);
+        if (it != shapes_map.end()) {
+          Shape* parent = it->second;
+          shape->set_parent_shape(parent);
+          shape->fixed = true;
+          shape->parent_inner_polyline = parent->inner_polylines[treemap_entry.second];
         }
       }
     }

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/shared/OpencvConverter.cpp

@@ -0,0 +1,51 @@
+/*
+ * OpencvConverter.cpp
+ *
+ * Copyright (c) 2025-2026 Emanuele Cesaroni
+ *
+ * Licensed under the GNU Affero General Public License v3 (AGPLv3).
+ * See the LICENSE file in this directory for the full license text.
+ */
+
+#include "OpencvConverter.h"
+
+#include <algorithm>
+#include <functional>
+#include <limits>
+#include <utility>
+#include <vector>
+
+std::size_t OpencvConverter::EdgeKeyHash::operator()(const EdgeKey& key) const {
+  return std::hash<uint64_t>{}(key.a) ^
+         (std::hash<uint64_t>{}(key.b) << 1);
+}
+
+uint64_t OpencvConverter::point_key(const Point& p) {
+  return (static_cast<uint64_t>(static_cast<uint32_t>(p.x)) << 32) |
+         static_cast<uint32_t>(p.y);
+}
+
+OpencvConverter::EdgeKey OpencvConverter::edge_key(const Point& a, const Point& b) {
+  uint64_t ka = point_key(a);
+  uint64_t kb = point_key(b);
+  if (ka > kb) {
+    std::swap(ka, kb);
+  }
+  return {ka, kb};
+}
+
+void OpencvConverter::rotate_to_scanline_start(std::vector<Point>& points, const RectBounds& bounds) {
+  if (points.empty()) return;
+
+  std::size_t index = points.size();
+  int min_x = std::numeric_limits<int>::max();
+  for (std::size_t i = 0; i < points.size(); ++i) {
+    if (points[i].y == bounds.min_y && points[i].x < min_x) {
+      min_x = points[i].x;
+      index = i;
+    }
+  }
+  if (index != points.size() && index > 0) {
+    std::rotate(points.begin(), points.begin() + index, points.end());
+  }
+}

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/shared/OpencvConverter.h

@@ -0,0 +1,205 @@
+/*
+ * OpencvConverter.h
+ *
+ * Copyright (c) 2025-2026 Emanuele Cesaroni
+ *
+ * Licensed under the GNU Affero General Public License v3 (AGPLv3).
+ * See the LICENSE file in this directory for the full license text.
+ */
+
+#pragma once
+
+#include <vector>
+#include <unordered_map>
+#include <unordered_set>
+#include <cstdint>
+#include <stdexcept>
+#include <cstdlib>
+
+#include "polygon/finder/Node.h"
+#include "RectBounds.h"
+
+class OpencvConverter {
+ private:
+  static constexpr int chain_dir[3][3] = {
+    {3, 4, 5},
+    {2, -1, 6},
+    {1, 0, 7}
+  };
+
+  static constexpr int corner_x[4] = {0, 1, 1, 0};
+  static constexpr int corner_y[4] = {1, 1, 0, 0};
+
+  struct BoundaryEdge {
+    Point a;
+    Point b;
+  };
+
+  struct EdgeKey {
+    uint64_t a;
+    uint64_t b;
+    bool operator==(const EdgeKey& other) const {
+      return a == other.a && b == other.b;
+    }
+  };
+
+  struct EdgeKeyHash {
+    std::size_t operator()(const EdgeKey& key) const;
+  };
+
+  static uint64_t point_key(const Point& p);
+  static EdgeKey edge_key(const Point& a, const Point& b);
+  static void rotate_to_scanline_start(std::vector<Point>& points, const RectBounds& bounds);
+
+  template<typename P>
+  static int chain_direction(const P& from, const P& to) {
+    const int dx = to.x - from.x;
+    const int dy = to.y - from.y;
+
+    if (dx == 0 && dy == 0)
+      throw std::invalid_argument("Zero-length contour step");
+
+    if (std::abs(dx) > 1 || std::abs(dy) > 1)
+      throw std::invalid_argument("Non-adjacent contour step");
+
+    return chain_dir[dx + 1][dy + 1];
+  }
+
+ public:
+  template<typename P>
+  static std::vector<Point> contour_to_cell_boundary(const std::vector<P>& contour, const RectBounds& bounds) {
+    std::vector<Point> raw;
+    const std::size_t n = contour.size();
+
+    if (n == 0) {
+      return raw;
+    }
+
+    if (n == 1) {
+      const int x = contour[0].x;
+      const int y = contour[0].y;
+      return {
+        Point(x, y + 1),
+        Point(x + 1, y + 1),
+        Point(x + 1, y),
+        Point(x, y)
+      };
+    }
+
+    raw.reserve(n * 2);
+
+    for (std::size_t i = 0; i < n; ++i) {
+      const P& previous = contour[(i + n - 1) % n];
+      const P& current  = contour[i];
+      const P& next     = contour[(i + 1) % n];
+      const int incoming = chain_direction(previous, current);
+      const int outgoing = chain_direction(current, next);
+      int corner = incoming >> 1;
+      const int last_corner = ((outgoing + 1) >> 1) & 3;
+      for (;;) {
+        raw.emplace_back(current.x + corner_x[corner], current.y + corner_y[corner]);
+        if (corner == last_corner) {
+          break;
+        }
+        corner = (corner + 1) & 3;
+      }
+    }
+
+    std::vector<BoundaryEdge> edges;
+    edges.reserve(raw.size());
+
+    for (std::size_t i = 0; i < raw.size(); ++i) {
+      const Point& a = raw[i];
+      const Point& b = raw[(i + 1) % raw.size()];
+      if (a.x == b.x && a.y == b.y) {
+        continue;
+      }
+      edges.push_back({a, b});
+    }
+
+    std::unordered_map<EdgeKey, int, EdgeKeyHash> counts;
+
+    for (const auto& edge : edges) {
+      ++counts[edge_key(edge.a, edge.b)];
+    }
+
+    std::unordered_set<EdgeKey, EdgeKeyHash> kept;
+    std::vector<BoundaryEdge> filtered;
+    filtered.reserve(edges.size());
+
+    for (const auto& edge : edges) {
+      const EdgeKey key = edge_key(edge.a, edge.b);
+      if (((counts[key] & 1) == 0) ||
+          (kept.find(key) != kept.end())) {
+        continue;
+      }
+      kept.insert(key);
+      filtered.push_back(edge);
+    }
+
+    if (filtered.empty()) {
+      return {};
+    }
+
+    std::unordered_map<uint64_t, std::vector<std::size_t>> outgoing;
+    for (std::size_t i = 0; i < filtered.size(); ++i) {
+      outgoing[point_key(filtered[i].a)].push_back(i);
+    }
+
+    std::vector<bool> used(filtered.size(), false);
+    std::size_t used_count = 0;
+    std::vector<Point> result;
+    result.reserve(filtered.size());
+
+    auto first_unused = [&]() {
+      for (std::size_t i = 0; i < used.size(); ++i) {
+        if (!used[i])
+          return i;
+      }
+      return used.size();
+    };
+
+    std::size_t current = 0;
+
+    while (used_count < filtered.size()) {
+      if (used[current]) {
+        current = first_unused();
+        if (current == used.size()) {
+          break;
+        }
+      }
+
+      const BoundaryEdge& edge = filtered[current];
+
+      used[current] = true;
+      ++used_count;
+
+      result.push_back(edge.a);
+
+      const uint64_t finish = point_key(edge.b);
+
+      auto it = outgoing.find(finish);
+      std::size_t next_edge = filtered.size();
+
+      if (it != outgoing.end()) {
+        for (std::size_t candidate : it->second) {
+          if (!used[candidate]) {
+            next_edge = candidate;
+            break;
+          }
+        }
+      }
+
+      if (next_edge != filtered.size()) {
+        current = next_edge;
+      } else {
+        current = first_unused();
+        if (current == used.size())
+          break;
+      }
+    }
+
+    rotate_to_scanline_start(result, bounds);
+    return result;
+  }
+};

data/ext/cpp_polygon_finder/cpp_polygon_finder.cpp

@@ -106,6 +106,8 @@
 #include "PolygonFinder/src/polygon/finder/concurrent/PartPool.cpp"
 #include "PolygonFinder/src/polygon/finder/concurrent/Merger.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/Merger.cpp"
+#include "PolygonFinder/src/polygon/finder/concurrent/MergerValidator.h"
+#include "PolygonFinder/src/polygon/finder/concurrent/MergerValidator.cpp"
 #include "PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.cpp"
 #include "PolygonFinder/src/polygon/finder/concurrent/VerticalMerger.h"
@@ -571,6 +573,7 @@ void Init_cpp_polygon_finder() {
     rb_cstd_ofstream.define_method("closed?", [](OfstreamWrapper& self) { return self.closed(); });
     rb_cstd_ofstream.define_method("rewind",  [](OfstreamWrapper& self) { self.rewind(); });
     rb_cstd_ofstream.define_method("read",    [](OfstreamWrapper& self) { return self.read(); });
+    rb_cstd_ofstream.define_method("path",    [](OfstreamWrapper& self) { return self.path; });
 
   Data_Type<StreamingMerger> rb_cstreaming_merger = define_class<StreamingMerger, VerticalMerger>("CPPStreamingMerger");
     rb_cstreaming_merger.define_method("add_tile", [](StreamingMerger& self, Object rb_result, bool flush) {

data/lib/contrek/finder/concurrent/merger.rb

@@ -18,23 +18,28 @@ module Contrek
           warn "[Contrek WARNING] The given options '#{warn_options.join(",")}' will be ignored."
         end
         @options = {unsafe_mode: false}.merge(@user_options).except(*IGNORE_OPTIONS)
-        unless safe?
+        if safe?
+          @validator = MergerValidator.new(self)
+        else
           warn "[Contrek WARNING] Processing tile with 'unsafe_mode: true'. Incompatible result options might lead to unexpected vector geometry."
         end
       end
 
       def add_tile(result)
+        @validator&.validate_metadata(result)
+
         @height ||= result.metadata[:height]
         raise ArgumentError, "All results must have the same height" if @height != result.metadata[:height] && safe?
         @options[:versus] ||= result.metadata[:versus]
         raise ArgumentError, "All results must have the same versus option" if @options[:versus] != result.metadata[:versus] && safe?
-        if safe? && result.metadata[:options].key?(:compress)
+        if safe? && result.metadata[:options]&.key?(:compress)
           if (result.metadata[:options][:compress].keys - [:uniq, :linear]).any?
             raise ArgumentError, "Result with not supported postprocessing compression mode"
           end
         end
 
         end_x = @current_x + result.metadata[:width]
+        @validator&.validate(result, @current_x, end_x)
 
         tile = Tile.new(
           finder: self,

data/lib/contrek/finder/concurrent/merger_validator.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Concurrent
+    class MergerValidator
+      def initialize(merger)
+        @merger = merger
+      end
+
+      def validate(result, start_x, end_x)
+        validate_bounds(result.polygons)
+        validate_polygon_order(result.polygons)
+        validate_boundary(result, start_x)
+
+        @previous_boundary = boundary_coordinates(result.polygons, end_x)
+      end
+
+      def validate_metadata(result)
+        metadata = result.metadata
+        [:width, :height, :versus].each do |key|
+          raise ArgumentError, "Missing result metadata: #{key}" unless metadata.key?(key)
+        end
+        [:width, :height].each do |key|
+          value = metadata[key]
+          unless value.is_a?(Integer) && value.positive?
+            raise ArgumentError, "Invalid result metadata: #{key} must be a positive integer"
+          end
+        end
+        unless [:a, :o].include?(metadata[:versus])
+          raise ArgumentError, "Invalid result metadata: unsupported versus option"
+        end
+      end
+
+      private
+
+      def validate_polygon_order(polygons)
+        previous = nil
+        polygons.each do |polygon|
+          bounds = polygon[:bounds]
+          current = if @merger.transpose?
+            [bounds[:min_x], bounds[:min_y]]
+          else
+            [bounds[:min_y], bounds[:min_x]]
+          end
+          if previous && (current <=> previous) < 0
+            raise ArgumentError, "Invalid polygon order: polygons are not in raster scan order"
+          end
+          previous = current
+        end
+      end
+
+      def validate_boundary(result, start_x)
+        return unless @previous_boundary
+
+        current = boundary_coordinates(result.polygons, start_x)
+        unless @previous_boundary == current
+          raise ArgumentError, "Tile boundary mismatch: adjacent tiles have different edge coordinates"
+        end
+      end
+
+      def boundary_coordinates(polygons, boundary_x)
+        coordinates = []
+        polygons.each do |polygon|
+          polygon[:outer].each do |point|
+            coordinates << point[:y] if point[:x] == boundary_x
+          end
+        end
+        coordinates.sort!
+      end
+
+      def validate_bounds(polygons)
+        polygons.each do |polygon|
+          outer = polygon[:outer]
+          raise ArgumentError, "Invalid polygon: empty outer contour" if outer.empty?
+          bounds = polygon[:bounds]
+          min_x = max_x = outer[0][:x]
+          min_y = max_y = outer[0][:y]
+          outer.each do |point|
+            x = point[:x]
+            y = point[:y]
+            min_x = x if x < min_x
+            max_x = x if x > max_x
+            min_y = y if y < min_y
+            max_y = y if y > max_y
+          end
+          unless bounds[:min_x] == min_x &&
+              bounds[:max_x] == max_x &&
+              bounds[:min_y] == min_y &&
+              bounds[:max_y] == max_y
+            raise ArgumentError, "Invalid polygon bounds: bounding box does not match outer contour"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/contrek/finder/concurrent/tile.rb

@@ -92,7 +92,6 @@ module Contrek
         @shapes = []
         shapes_map = {}
         raw_polylines.each_with_index do |raw_polyline, polyline_index|
-          next if raw_polyline[:bounds][:max_x] - raw_polyline[:bounds][:min_x] == 0
           shape = Shape.new.tap do |shape|
             shape.outer_polyline = Polyline.new(tile: self, polygon: raw_polyline[:outer], shape: shape, bounds: raw_polyline[:bounds])
             shape.inner_polylines = raw_polyline[:inner].map { |raw| InnerPolyline.new(shape: shape, raw_coordinates: raw) }

data/lib/contrek/shared/opencv_converter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Shared
     class OpencvConverter

data/lib/contrek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Contrek
-  VERSION = "1.4.4"
+  VERSION = "1.4.6"
 end

data/lib/contrek.rb

@@ -45,13 +45,13 @@ require "contrek/finder/concurrent/polyline"
 require "contrek/finder/concurrent/cluster"
 require "contrek/finder/concurrent/finder"
 require "contrek/finder/concurrent/merger"
+require "contrek/finder/concurrent/merger_validator"
 require "contrek/finder/concurrent/horizontal_merger"
 require "contrek/finder/concurrent/vertical_merger"
 require "contrek/finder/concurrent/streaming_merger"
 require "contrek/finder/concurrent/svg_streaming_merger"
 require "contrek/finder/concurrent/geo_json_streaming_merger"
 require "contrek/finder/concurrent/cursor"
-require "contrek/map/mercator_projection"
 require "contrek/matchers/matcher"
 require "contrek/matchers/matcher_hsb"
 require "contrek/matchers/value_not_matcher"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.6
 platform: ruby
 authors:
 - Emanuele Cesaroni
@@ -215,6 +215,8 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/InnerPolyline.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/MergerValidator.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/MergerValidator.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Part.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Part.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/PartPool.cpp
@@ -263,6 +265,8 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/reducers/UniqReducer.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/reducers/VisvalingamReducer.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/reducers/VisvalingamReducer.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/shared/OpencvConverter.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/shared/OpencvConverter.h
 - ext/cpp_polygon_finder/cpp_polygon_finder.cpp
 - ext/cpp_polygon_finder/extconf.rb
 - lib/LICENSE-MIT.md
@@ -303,6 +307,7 @@ files:
 - lib/contrek/finder/concurrent/inner_polyline.rb
 - lib/contrek/finder/concurrent/listable.rb
 - lib/contrek/finder/concurrent/merger.rb
+- lib/contrek/finder/concurrent/merger_validator.rb
 - lib/contrek/finder/concurrent/part.rb
 - lib/contrek/finder/concurrent/partitionable.rb
 - lib/contrek/finder/concurrent/polyline.rb
@@ -323,7 +328,6 @@ files:
 - lib/contrek/finder/node_cluster.rb
 - lib/contrek/finder/polygon_finder.rb
 - lib/contrek/finder/result.rb
-- lib/contrek/map/mercator_projection.rb
 - lib/contrek/matchers/matcher.rb
 - lib/contrek/matchers/matcher_hsb.rb
 - lib/contrek/matchers/value_not_matcher.rb

data/lib/contrek/map/mercator_projection.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-module Map
-  class MercatorProjection
-    MERCATOR_RANGE = 256
-
-    class LatLng
-      attr_reader :lat, :lng
-      def initialize(lat:, lng:)
-        @lat = lat
-        @lng = lng
-      end
-    end
-
-    class Point
-      attr_accessor :x, :y
-      def initialize(x: 0, y: 0)
-        @x = x
-        @y = y
-      end
-    end
-
-    def initialize
-      @pixel_origin = Point.new(x: MERCATOR_RANGE / 2, y: MERCATOR_RANGE / 2)
-      @pixels_per_lon_degree = MERCATOR_RANGE.to_f / 360
-      @pixels_per_lon_radian = MERCATOR_RANGE.to_f / (2 * Math::PI)
-    end
-
-    def self.get_corners(center, zoom, map_width, map_height)
-      scale = 2**zoom
-      proj = Map::MercatorProjection.new
-      center_px = proj.from_lat_lng_to_point(lat_lng: center)
-      sw_point = Point.new(x: center_px.x - ((map_width / 2).to_f / scale), y: center_px.y + ((map_height / 2).to_f / scale))
-      sw_lat_lon = proj.from_point_to_lat_lng(sw_point)
-      ne_point = Point.new(x: center_px.x + ((map_width / 2).to_f / scale), y: center_px.y - ((map_height / 2).to_f / scale))
-      ne_lat_lon = proj.from_point_to_lat_lng(ne_point)
-      {
-        N: ne_lat_lon.lat,
-        E: ne_lat_lon.lng,
-        S: sw_lat_lon.lat,
-        W: sw_lat_lon.lng
-      }
-    end
-
-    def from_lat_lng_to_point(lat_lng:, opt_point: nil)
-      point = opt_point.nil? ? Point.new(x: 0, y: 0) : opt_point
-      origin = @pixel_origin
-      point.x = origin.x + (lat_lng.lng * @pixels_per_lon_degree)
-      siny = bound(Math.sin(degreesToRadians(lat_lng.lat)), -0.9999, 0.9999)
-      point.y = origin.y + (0.5 * Math.log((1 + siny) / (1 - siny)) * -@pixels_per_lon_radian)
-      point
-    end
-
-    def from_point_to_lat_lng(point)
-      origin = @pixel_origin
-      lng = (point.x - origin.x) / @pixels_per_lon_degree
-      lat_radians = (point.y - origin.y) / -@pixels_per_lon_radian
-      lat = radiansToDegrees(2 * Math.atan(Math.exp(lat_radians)) - (Math::PI / 2))
-      LatLng.new(lat: lat, lng: lng)
-    end
-
-    private
-
-    def degreesToRadians(deg)
-      deg * (Math::PI / 180)
-    end
-
-    def radiansToDegrees(rad)
-      rad / (Math::PI / 180)
-    end
-
-    def bound(value, opt_min, opt_max)
-      value = [value, opt_min].max if !opt_min.nil?
-      value = [value, opt_max].min if !opt_max.nil?
-      value
-    end
-  end
-end