contrek 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802afd86666e1705cc50240c6f7d79abfd9c7e93c315b1222199e79836fdd9e2
-  data.tar.gz: e9f593c3ef9a661720f2587b44d65406839b25c2bc1690b8c4bfae477f967de6
+  metadata.gz: a2ca1b703822f8170679cfef42bdc5665fca4dcbeb49e0994efb78c1d325ff94
+  data.tar.gz: b64cf8c4f9110bcbac96e01c86fb4b923a19d342eefd11e56933fdfdde1889fd
 SHA512:
-  metadata.gz: 8e4d8940a0f6cb93fc0ee685808c8889110bedbfd604fb8de3e3aca6b0fb9caa69d57bec518cc50ce15314a6ffa45e525fc947b60d52d71403510b6c77b7302f
-  data.tar.gz: e12d7f30b9dec7ee474ab5c400f86f8331cc8eaa8e1571e6c8b895ddea4a4f0633806d2ccb0b4fdd12380d77caa714c4b6c85b9f347e3bf6ff70f39b0a1cb9d9
+  metadata.gz: 0e3e13330789b1d83025882e2179e54b2389092205ce9d0c5af8b7ba770118a1c585283f1367c15799c4ad3bb06ea1e97c6e15262c33ea229ef169fd343b03c1
+  data.tar.gz: fd08b11d3a2604724960d0bbd2e24516e7136f39cacb304df970c5c96670800f8863b561a85f4c64ff14d0a0c24a5b3d45f7a93070161f7f94ac97148e414d6b

data/CHANGELOG.md

@@ -161,4 +161,9 @@ All notable changes to this project will be documented in this file.
 - Contrek takes care of the streaming process, providing an API that greatly simplifies the implementation of streaming raster processing.
 
 ## [1.4.3] - 2026-09-09
-- Added TIFF/GeoTIFF streaming support with geolocation metadata and direct WGS84 GeoJSON output.
+- Added TIFF/GeoTIFF streaming support with geolocation metadata and direct WGS84 GeoJSON output.
+
+## [1.4.4] - 2026-09-19
+- 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.

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/RawBitmap.cpp

@@ -8,13 +8,14 @@
  */
 
 #include "RawBitmap.h"
-#include "spng.h"
 #include <memory>
 #include <cstdio>
 #include <iostream>
 #include <cstring>
 #include <cerrno>
 #include <string>
+#include <utility>
+#include "spng.h"
 
 RawBitmap::RawBitmap() : Bitmap("", 0),
   width(0),
@@ -169,3 +170,16 @@ bool RawBitmap::save_to_png(const std::string& filename) {
 
   return (ret == 0);
 }
+
+std::unique_ptr<RawBitmap> RawBitmap::detach() {
+  auto detached = std::make_unique<RawBitmap>();
+
+  detached->width = width;
+  detached->height = height;
+  detached->bpp = bpp;
+  detached->image = std::move(image);
+
+  define(width, height, bpp, false);
+
+  return detached;
+}

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/RawBitmap.h

@@ -32,6 +32,7 @@ class RawBitmap : public Bitmap {
   void fill(unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255);
   void draw_line(int x0, int y0, int x1, int y1, unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255);
   void draw_filled_rectangle(int x, int y, int w, int h, unsigned char r, unsigned char g, unsigned char b, unsigned char a = 255);
+  std::unique_ptr<RawBitmap> detach();
 
  protected:
   std::unique_ptr<unsigned char[]> image;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/bitmaps/streaming/RasterStreamer.h

@@ -40,17 +40,10 @@ class RasterStreamer {
     const uint32_t bytes_per_pixel = source_.get_bytes_per_pixel();
     const std::size_t row_size = static_cast<std::size_t>(width) * static_cast<std::size_t>(bytes_per_pixel);
     uint32_t source_row = 0;
-    uint32_t previous_buffer_rows = 0;
     bool first_stripe = true;
+    std::vector<unsigned char> overlap_row(row_size);
 
     while (source_row < height) {
-      std::vector<unsigned char> overlap_row;
-      if (!first_stripe) {
-        overlap_row.resize(row_size);
-        const unsigned char* previous_last_row = buffer.get_row_ptr(previous_buffer_rows - 1);
-        std::memcpy(overlap_row.data(), previous_last_row, row_size);
-      }
-
       const uint32_t overlap_rows = first_stripe ? 0 : OVERLAP;
       const uint32_t available_rows = stripe_height_ - overlap_rows;
       const uint32_t remaining_rows = height - source_row;
@@ -80,8 +73,10 @@ class RasterStreamer {
       }
       const std::size_t buffer_size = static_cast<std::size_t>(buffer_rows) * row_size;
 
+      const unsigned char* last_row = buffer.get_row_ptr(buffer_rows - 1);
+      std::memcpy(overlap_row.data(), last_row, row_size);
+
       std::forward<Callback>(callback)(buffer, buffer_rows, buffer_size, rows_read);
-      previous_buffer_rows = buffer_rows;
       first_stripe = false;
     }
   }

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

@@ -154,6 +154,15 @@ struct ProcessResult {
     to_svg_stream(file);
     file.close();
   }
+
+  void sort_polygons() {
+    polygons.sort([](const Polygon& a, const Polygon& b) {
+      if (a.bounds.min_y != b.bounds.min_y) {
+        return a.bounds.min_y < b.bounds.min_y;
+      }
+      return a.bounds.min_x < b.bounds.min_x;
+    });
+  }
 };
 
 class PolygonFinder {

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

@@ -14,6 +14,9 @@
 
 Merger::Merger(int number_of_threads, const Options& options)
 : Finder(number_of_threads, options) {
+  if (options.contains("versus")) {
+    std::cerr << "[Contrek WARNING] The given options 'versus' will be ignored." << std::endl;
+  }
   if (!this->safe()) {
     std::cerr << "[Contrek WARNING] Processing tile with 'unsafe_mode: true'. "
               << "Incompatible result options might lead to unexpected vector geometry.\n";
@@ -58,7 +61,9 @@ void Merger::add_tile(ProcessResult& result)
 
 ProcessResult* Merger::process_info() {
   this->process_tiles();
-  return(Finder::process_info());
+  ProcessResult* result = Finder::process_info();
+  result->versus = this->versus;
+  return result;
 }
 
 void Merger::translate(ProcessResult& result, int offset) {

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

@@ -20,10 +20,10 @@ VerticalMerger::VerticalMerger(int number_of_threads, const Options& options)
 
 void VerticalMerger::add_tile(ProcessResult& result)
 { transpose(result);
+  adjust(result);
   if (this->tiles_.size() > 0) {
     translate(result, this->current_x);
   }
-  adjust(result);
   Merger::add_tile(result);
 }
 
@@ -50,14 +50,32 @@ void VerticalMerger::transpose(ProcessResult& result) {
 }
 
 void VerticalMerger::adjust(ProcessResult& result) {
+  const int tile_width = result.width;
+  const auto number_of_tiles = this->tiles_.size();
+
   for (auto& polygon : result.polygons) {
-    if (!polygon.outer.empty()) {
-      std::rotate(polygon.outer.begin(), polygon.outer.begin() + 1, polygon.outer.end());
+    const auto& bounds = polygon.bounds;
+    const bool needs_left = number_of_tiles > 0 && bounds.min_x == 0;
+    const bool needs_right = bounds.max_x == tile_width;
+
+    if (!needs_left && !needs_right) {
+      continue;
     }
-    for (auto& sequence : polygon.inner) {
-      if (!sequence.empty()) {
-        std::rotate(sequence.begin(), sequence.begin() + 1, sequence.end());
+
+    auto& sequence = polygon.outer;
+    auto best = sequence.end();
+    for (auto it = sequence.begin(); it != sequence.end(); ++it) {
+      if (it->y != bounds.min_y) {
+        continue;
+      }
+      if (best == sequence.end() ||
+         (result.versus == Node::A ? it->x > best->x : it->x < best->x)) {
+        best = it;
       }
     }
+
+    if (best != sequence.end() && best != sequence.begin()) {
+      std::rotate(sequence.begin(), best, sequence.end());
+    }
   }
 }

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

@@ -6,13 +6,18 @@ module Contrek
       attr_reader :tiles
       prepend Poolable
 
+      IGNORE_OPTIONS = [:versus]
+
       def initialize(options: {})
         @initialize_time = 0
         @current_x = 0
         @tiles = Queue.new
         @whole_tile = nil
         @user_options = options
-        @options = {unsafe_mode: false}.merge(@user_options)
+        if (warn_options = @user_options.keys & IGNORE_OPTIONS).any?
+          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?
           warn "[Contrek WARNING] Processing tile with 'unsafe_mode: true'. Incompatible result options might lead to unexpected vector geometry."
         end

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

@@ -5,10 +5,10 @@ module Contrek
     class VerticalMerger < Merger
       def add_tile(result)
         transpose(result)
+        adjust(result)
         if @tiles.size > 0
           translate(result, @current_x)
         end
-        adjust(result)
         super
       end
 
@@ -22,12 +22,32 @@ module Contrek
 
       private
 
+      # After transposing the polygon, select the correct starting vertex according to its versus.
+      # On the topmost scanline, use the rightmost vertex for counterclockwise polygons and the leftmost
+      # vertex for clockwise polygons.
+      # TODO: is useless the really rotate coords. Probably you can save rotation index here computed
+      #       using later in partition() to get the starting point sequence parts begins
       def adjust(result)
+        versus = result.metadata[:versus]
+        tile_width = result.metadata[:width]
+        number_of_tiles = @tiles.size
+
         result.polygons.each do |polygon|
-          polygon[:outer].rotate!(1)
-          polygon[:inner].each do |sequence|
-            sequence.rotate!(1)
+          bounds = polygon[:bounds]
+          needs_left = number_of_tiles > 0 && bounds[:min_x] == 0
+          needs_right = bounds[:max_x] == tile_width
+          next unless needs_left || needs_right
+          sequence = polygon[:outer]
+          index = nil
+          best_x = nil
+          sequence.each_with_index do |point, i|
+            next unless point[:y] == bounds[:min_y]
+            if index.nil? || ((versus == :a) ? point[:x] > best_x : point[:x] < best_x)
+              index = i
+              best_x = point[:x]
+            end
           end
+          sequence.rotate!(index) if index && index != 0
         end
       end
 

data/lib/contrek/finder/result.rb

@@ -8,6 +8,12 @@ module Contrek
       def points
         polygons
       end
+
+      def sort_polygons!
+        polygons.sort_by! do |polygon|
+          [polygon[:bounds][:min_y], polygon[:bounds][:min_x]]
+        end
+      end
     end
   end
 end

data/lib/contrek/shared/opencv_converter.rb

@@ -0,0 +1,144 @@
+module Contrek
+  module Shared
+    class OpencvConverter
+      CHAIN_DIR = [
+        [3, 4, 5],
+        [2, -1, 6],
+        [1, 0, 7]
+      ].freeze
+
+      CORNER_X = [0, 1, 1, 0].freeze
+      CORNER_Y = [1, 1, 0, 0].freeze
+
+      def contour_to_cell_boundary(contour, rect)
+        raw = []
+        n = contour.size
+
+        return raw if n == 0
+        if n == 1
+          x = contour[0][:x]
+          y = contour[0][:y]
+          return [
+            {x: x, y: y + 1},
+            {x: x + 1, y: y + 1},
+            {x: x + 1, y: y},
+            {x: x, y: y}
+          ]
+        end
+
+        n.times do |i|
+          previous = contour[(i - 1) % n]
+          current = contour[i]
+          next_p = contour[(i + 1) % n]
+
+          incoming = chain_direction(previous, current)
+          outgoing = chain_direction(current, next_p)
+
+          corner = incoming >> 1
+          last_corner = ((outgoing + 1) >> 1) & 3
+
+          loop do
+            raw << {
+              x: current[:x] + CORNER_X[corner],
+              y: current[:y] + CORNER_Y[corner]
+            }
+            break if corner == last_corner
+            corner = (corner + 1) & 3
+          end
+        end
+
+        # build path parts
+        edges = []
+        raw.size.times do |i|
+          a = raw[i]
+          b = raw[(i + 1) % raw.size]
+          next if a == b
+
+          key = [
+            [a[:x], a[:y]],
+            [b[:x], b[:y]]
+          ].sort
+          edges << {a: a, b: b, key: key}
+        end
+
+        counts = Hash.new(0)
+        edges.each do |edge|
+          counts[edge[:key]] += 1
+        end
+
+        kept = {}
+        edges.select! do |edge|
+          key = edge[:key]
+          next false if counts[key].even?
+          next false if kept[key]
+
+          kept[key] = true
+          true
+        end
+        return [] if edges.empty?
+
+        outgoing = Hash.new { |h, k| h[k] = [] }
+        edges.each_with_index do |edge, i|
+          outgoing[[edge[:a][:x], edge[:a][:y]]] << i
+        end
+
+        used = Array.new(edges.size, false)
+        result = []
+        current = 0
+
+        loop do
+          break if used.all?
+          if used[current]
+            current = used.index(false)
+            break unless current
+          end
+
+          edge = edges[current]
+          used[current] = true
+          result << edge[:a]
+          finish = edge[:b]
+          candidates = outgoing[[finish[:x], finish[:y]]]
+          next_edge = candidates.find { |index| !used[index] }
+
+          if next_edge
+            current = next_edge
+          else
+            current = used.index(false)
+            break unless current
+          end
+        end
+        rotate_to_scanline_start(result, rect)
+      end
+
+      def rect_to_bounds(rect)
+        {min_x: rect[:x],
+         max_x: rect[:x] + rect[:width],
+         min_y: rect[:y],
+         max_y: rect[:y] + rect[:height]}
+      end
+
+      private
+
+      def rotate_to_scanline_start(points, rect)
+        return points if points.empty?
+
+        min_y = rect[:y]
+        min_x = points.select { |p| p[:y] == min_y }.map { |p| p[:x] }.min
+        index = points.index { |p| p[:x] == min_x && p[:y] == min_y }
+        (index && index > 0) ? points.rotate(index) : points
+      end
+
+      def chain_direction(from, to)
+        dx = to[:x] - from[:x]
+        dy = to[:y] - from[:y]
+
+        raise ArgumentError, "Zero-length contour step" if dx == 0 && dy == 0
+        if dx.abs > 1 || dy.abs > 1
+          raise ArgumentError, "Non-adjacent contour step"
+        end
+
+        CHAIN_DIR[dx + 1][dy + 1]
+      end
+    end
+  end
+end

data/lib/contrek/version.rb

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

data/lib/contrek.rb

@@ -17,6 +17,7 @@ require "contrek/bitmaps/streaming/sources/ascii"
 require "contrek/bitmaps/streaming/sources/png"
 require "contrek/bitmaps/streaming/sources/tiff"
 require "contrek/shared/result"
+require "contrek/shared/opencv_converter"
 require "contrek/finder/bounds"
 require "contrek/finder/list"
 require "contrek/finder/list_entry"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Emanuele Cesaroni
@@ -333,6 +333,7 @@ files:
 - lib/contrek/reducers/reducer.rb
 - lib/contrek/reducers/uniq_reducer.rb
 - lib/contrek/reducers/visvalingam_reducer.rb
+- lib/contrek/shared/opencv_converter.rb
 - lib/contrek/shared/result.rb
 - lib/contrek/version.rb
 homepage: https://github.com/runout77/contrek