contrek 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fcfc790a324e42855e8b8e816f946da8ea764943a44f4d9999b4cc7a360209d
-  data.tar.gz: 8f0d0f42350fc8236a9c2e5ca974ab11d91a5bcfbdd4a7fdef9cf310bf764306
+  metadata.gz: 14fceba0577a0e8bf3ce358d23099eb7d359dfdaafdbfac3489f853001be47b3
+  data.tar.gz: 4097a012082df7a8c59dd873c2bac9556b0ac5f40699183cb3de1410a9f34a5c
 SHA512:
-  metadata.gz: b7a5c008b6811b36ce143642d6300e89d7975dd0861cfc429880bbd76bf8a4b2eadf6c24351ca6d3de746ddbecaec849b4aed2052e973e34a386a9ae20e4a4a6
-  data.tar.gz: 8ff2d2465df0afcd376255bb575a46581d27888ec5e7293d9971e27f624550dc83e1fb47ca11814cbeb220c0b38c51b7179087361fbab9140ca181a728de706e
+  metadata.gz: ed0bf7cbf8f90b6327b8ad2ca990e0f05a59e664a9ea04a20a164f51ad0640a85275c80ff34b21e66c2611226448c0c9c7fbc7effeb1c4f51c02c3550267fbdd
+  data.tar.gz: 9e9677f9fddbd0746a594a26315eb93773f078ed78035cb2b3b36030036079382e7bea31fc4cbc040d7e7d21f1e8fd158a7609f11d1a71aa257592a963af4eb6

data/CHANGELOG.md

@@ -132,3 +132,6 @@ All notable changes to this project will be documented in this file.
 
 ## [1.3.2] - 2026-06-27
 - **Streaming merger:** A series of optimizations have been implemented at the C++ memory pool level; using a different strategy, these are now freed as soon as possible depending on the source data content and the morphology of the containing polygons. This has allowed for a further reduction in the peak memory indicated in the previous changelog, specifically from 13GB to 4.3GB, on the same image with 20,000,000 polygons.
+
+## [1.3.3] - 2026-06-28
+- **GeoJsonStreamingMerger:** Fixes both Ruby and CPP side.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contrek (1.3.2)
+    contrek (1.3.3)
       chunky_png (~> 1.4)
       concurrent-ruby (~> 1.3.5)
       rice (= 4.5.0)

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

@@ -10,6 +10,7 @@
 #include "Tests.h"
 #include <sys/resource.h>
 #include <string.h>
+#include <unistd.h>
 #include <iostream>
 #include <list>
 #include <map>
@@ -19,7 +20,6 @@
 #include <algorithm>
 #include <cstdio>
 #include <fstream>
-#include <unistd.h>
 
 #include "polygon/finder/PolygonFinder.h"
 #include "polygon/finder/concurrent/ClippedPolygonFinder.h"
@@ -441,7 +441,7 @@ void stream_progressive_png_image(const std::string& filepath, uint32_t stripe_h
     shared_stream.rdbuf()->pubsetbuf(buffer.data(), buffer.size());
 
     SvgStreamingMerger vmerger(0, &varguments, &shared_stream, total_width, total_height);
-    // GeoJsonStreamingMerger vmerger(0, &varguments, &shared_stream, total_width, total_height, 4294901760);
+    // GeoJsonStreamingMerger vmerger(0, &varguments, &shared_stream, 4294901760);
     try {
       size_t row_size = static_cast<size_t>(total_width) * 4;
       int stripe_count = 0;

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

@@ -20,13 +20,13 @@ class GeoJsonStreamingMerger : public StreamingMerger {
  protected:
   void write_header() override {
     if (stream) {
-      *stream << "{\"type\":\"FeatureCollection\",\"features\":[\n";
+      *stream << "{\"type\":\"FeatureCollection\",\"features\":[";
     }
   }
 
   void write_footer() override {
     if (stream) {
-      *stream << "\n]}";
+      *stream << "]}";
     }
   }
   void write_outer_polygon_start() override {}
@@ -38,20 +38,19 @@ class GeoJsonStreamingMerger : public StreamingMerger {
   GeoJsonStreamingMerger(int number_of_threads,
                          std::vector<std::string>* options,
                          std::ofstream* stream_to,
-                         int total_width, int total_height,
                          unsigned int pixel_value)
-      : StreamingMerger(number_of_threads, options, stream_to, total_width, total_height),
+      : StreamingMerger(number_of_threads, options, stream_to),
         target_value(pixel_value) {}
 
   void stream_raw_polygon(const Shape* shape) override {
     if (!stream) return;
     if (!is_first_feature) {
-      *stream << ",\n";
+      *stream << ",";
     }
     is_first_feature = false;
 
-    *stream << "{\"type\":\"Feature\",\"properties\":{\"value\":" << target_value
-            << "},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[ [";
+    *stream << "{\"type\":\"Feature\",\"properties\":{\"PixelVal\":" << target_value
+            << "},\"geometry\":{\"type\":\"Polygon\",\"coordinates\":[[";
     const std::vector<Point>& points = shape->outer_polyline->raw();
     const size_t points_size = points.size();
     if (points_size > 0) {

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

@@ -35,8 +35,10 @@ class Part : public Queueable<Point> {
   bool transmutation_skip = false;
   bool dead_end = false;
   bool mirror = false;
+
  private:
   bool touched_ = false;
+
  public:
   Part* next = nullptr;
   Part* next_seam = nullptr;

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

@@ -15,15 +15,11 @@
 
 StreamingMerger::StreamingMerger(int number_of_threads,
                                  std::vector<std::string>* options,
-                                 std::ofstream* stream_to,
-                                 int total_width, int total_height)
-  : VerticalMerger(number_of_threads, options), stream(stream_to), total_width(total_width), total_height(total_height) {
+                                 std::ofstream* stream_to)
+  : VerticalMerger(number_of_threads, options), stream(stream_to) {
   if (!stream) {
     throw std::invalid_argument("Streaming requires a valid destination output. stream_to cannot be null.");
   }
-  if (total_width <= 0 || total_height <= 0) {
-    throw std::invalid_argument("Streaming requires valid canvas dimensions (width and height must be > 0).");
-  }
 }
 
 void StreamingMerger::add_tile(ProcessResult& result, bool flush)

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

@@ -18,8 +18,6 @@
 class StreamingMerger : public VerticalMerger {
  protected:
   std::ofstream* stream;
-  int total_width;
-  int total_height;
   int moved = 0;
 
   void stream_polygons(Tile* tile, bool flush = false);
@@ -36,8 +34,7 @@ class StreamingMerger : public VerticalMerger {
  public:
   StreamingMerger(int number_of_threads,
                   std::vector<std::string>* options,
-                  std::ofstream* stream_to,
-                  int total_width, int total_height);
+                  std::ofstream* stream_to);
   void add_tile(ProcessResult& result, bool flush = false);
   ProcessResult* process_info() override;
 };

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

@@ -9,10 +9,13 @@
 
 #pragma once
 #include <string>
+#include <vector>
 #include "StreamingMerger.h"
 
 class SvgStreamingMerger : public StreamingMerger {
  private:
+  int total_width;
+  int total_height;
   std::string svg_css() {
       return ".out{fill:none;stroke:red;stroke-width:1;}.in{fill:none;stroke:green;stroke-width:1;}.out:hover{stroke:yellow;}";
   }
@@ -39,5 +42,15 @@ class SvgStreamingMerger : public StreamingMerger {
   }
 
  public:
-  using StreamingMerger::StreamingMerger;
+  SvgStreamingMerger(int number_of_threads,
+                     std::vector<std::string>* options,
+                     std::ofstream* stream_to,
+                     int total_width, int total_height)
+    : StreamingMerger(number_of_threads, options, stream_to),
+      total_width(total_width),
+      total_height(total_height) {
+    if (total_width <= 0 || total_height <= 0) {
+      throw std::invalid_argument("SVG Streaming requires valid canvas dimensions (width and height must be > 0).");
+    }
+  }
 };

data/ext/cpp_polygon_finder/cpp_polygon_finder.cpp

@@ -97,6 +97,7 @@
 #include "PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.cpp"
 #include "PolygonFinder/src/polygon/finder/concurrent/SvgStreamingMerger.h"
+#include "PolygonFinder/src/polygon/finder/concurrent/GeoJsonStreamingMerger.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/ShapePool.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/ShapePool.cpp"
 extern "C" {
@@ -309,7 +310,7 @@ struct OfstreamWrapper {
   std::ofstream& get_stream() { return stream; }
 };
 
-StreamingMerger* create_streaming_merger(Object self,
+SvgStreamingMerger* create_svg_streaming_merger(Object self,
                                          int number_of_threads,
                                          std::vector<std::string>* options,
                                          Object stream_obj,
@@ -319,6 +320,15 @@ StreamingMerger* create_streaming_merger(Object self,
   return new SvgStreamingMerger(number_of_threads, options, &wrapper->get_stream(), total_width, total_height);
 }
 
+GeoJsonStreamingMerger* create_geo_json_streaming_merger(Object self,
+                                         int number_of_threads,
+                                         std::vector<std::string>* options,
+                                         Object stream_obj,
+                                         int pixel_val) {
+  OfstreamWrapper* wrapper = Rice::detail::From_Ruby<OfstreamWrapper*>().convert(stream_obj.value());
+  return new GeoJsonStreamingMerger(number_of_threads, options, &wrapper->get_stream(),pixel_val);
+}
+
 OfstreamWrapper* create_ofstream(Object self, std::string path) {
   return new OfstreamWrapper(path);
 }
@@ -437,7 +447,11 @@ void Init_cpp_polygon_finder() {
       ProcessResult pr = Rice::detail::ruby_result_to_process_result(rb_result);
       self.add_tile(pr, flush);
     });
-    rb_cstreaming_merger.define_singleton_method("new", &create_streaming_merger);
+
+  Data_Type<SvgStreamingMerger> rb_csvgstreaming_merger = define_class<SvgStreamingMerger, StreamingMerger>("CPPSvgStreamingMerger");
+  rb_csvgstreaming_merger.define_singleton_method("new", &create_svg_streaming_merger);
+  Data_Type<GeoJsonStreamingMerger> rb_cgeojsonstreaming_merger = define_class<GeoJsonStreamingMerger, StreamingMerger>("CPPGeoJsonStreamingMerger");
+  rb_cgeojsonstreaming_merger.define_singleton_method("new", &create_geo_json_streaming_merger);
 
   Module mContrek = define_module("Contrek");
   Module mCpp = define_module_under(mContrek, "Cpp");

data/lib/contrek/cpp/cpp_geo_json_concurrent_streaming_merger.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Cpp
+    class CPPGeoJsonConcurrentStreamingMerger < CPPGeoJsonStreamingMerger
+      def self.new(stream_to:, number_of_threads: 0, options: nil, pixel_val: 0)
+        super(number_of_threads, options, stream_to, pixel_val)
+      end
+    end
+  end
+end

data/lib/contrek/cpp/{cpp_concurrent_streaming_merger.rb → cpp_svg_concurrent_streaming_merger.rb}

@@ -2,7 +2,7 @@
 
 module Contrek
   module Cpp
-    class CPPConcurrentStreamingMerger < CPPStreamingMerger
+    class CPPSvgConcurrentStreamingMerger < CPPSvgStreamingMerger
       def self.new(stream_to:, total_width:, total_height:, number_of_threads: 0, options: nil)
         super(number_of_threads, options, stream_to, total_width, total_height)
       end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Concurrent
+    class GeoJsonStreamingMerger < StreamingMerger
+      def initialize(stream_to:, pixel_val:, options: {})
+        @pixel_val = pixel_val
+        super(stream_to:, options:)
+      end
+
+      def write_header
+        @first_feature = true
+        @stream.write("{\"type\":\"FeatureCollection\",\"features\":[")
+      end
+
+      def write_footer
+        @stream.write("]}")
+      end
+
+      def stream_raw_polygon(shape)
+        if @first_feature
+          @first_feature = false
+        else
+          @stream.write(",")
+        end
+        outer_ring = shape.outer_polyline.raw.map { |p| [p[:y], p[:x]] }
+        outer_ring << outer_ring.first if outer_ring.first != outer_ring.last
+        polygon_coordinates = [outer_ring]
+        shape.inner_polylines.map(&:raw).each do |sequence|
+          inner_ring = sequence.map { |p| [p[:y], p[:x]] }
+          inner_ring << inner_ring.first if inner_ring.first != inner_ring.last
+          polygon_coordinates << inner_ring
+        end
+        feature_hash = {
+          type: "Feature",
+          properties: {PixelVal: @pixel_val},
+          geometry: {
+            type: "Polygon",
+            coordinates: polygon_coordinates
+          }
+        }
+        @stream.write(JSON.generate(feature_hash))
+      end
+    end
+  end
+end

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

@@ -3,10 +3,8 @@
 module Contrek
   module Concurrent
     class StreamingMerger < VerticalMerger
-      def initialize(stream_to:, total_width:, total_height:, options: {})
+      def initialize(stream_to:, options: {})
         @stream = stream_to
-        @total_width = total_width
-        @total_height = total_height
         @moved = 0
         super(options: options)
       end
@@ -48,41 +46,21 @@ module Contrek
 
       def stream_raw_polygon(shape)
         outer_pts = shape.outer_polyline.raw.map { |p| "#{p[:y]},#{p[:x]}" }.join(" ")
-        @stream.write(svg_outer_polygon(outer_pts))
+        write_outer_polygon(outer_pts)
         shape.inner_polylines.map(&:raw).each do |sequence|
           inner_pts = sequence.map { |p| "#{p[:y]},#{p[:x]}" }.join(" ")
-          @stream.write(svg_inner_polygon(inner_pts))
+          write_inner_polygon(inner_pts)
         end
       end
 
       def ensure_header
         if @stream.pos == 0
-          @stream.write(svg_header)
+          write_header
         end
       end
 
       def ensure_footer
-        @stream.write(svg_footer)
-      end
-
-      def svg_footer
-        "</svg>"
-      end
-
-      def svg_header
-        "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"#{@total_width}\" height=\"#{@total_height}\"><style>#{svg_css}</style>"
-      end
-
-      def svg_outer_polygon(outer_pts)
-        "<polygon points=\"#{outer_pts}\" class=\"out\"/>"
-      end
-
-      def svg_inner_polygon(inner_pts)
-        "<polygon points=\"#{inner_pts}\" class=\"in\"/>"
-      end
-
-      def svg_css
-        ".out{fill:none;stroke:red;stroke-width:1;}.in{fill:none;stroke:green;stroke-width:1;}.out:hover{stroke:yellow;}"
+        write_footer
       end
     end
   end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Concurrent
+    class SvgStreamingMerger < StreamingMerger
+      def initialize(stream_to:, total_width:, total_height:, options: {})
+        @total_width = total_width
+        @total_height = total_height
+        super(stream_to:, options:)
+      end
+
+      def write_header
+        @stream.write("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"#{@total_width}\" height=\"#{@total_height}\"><style>#{svg_css}</style>")
+      end
+
+      def write_footer
+        @stream.write("</svg>")
+      end
+
+      def write_outer_polygon(outer_pts)
+        @stream.write("<polygon points=\"#{outer_pts}\" class=\"out\"/>")
+      end
+
+      def write_inner_polygon(inner_pts)
+        @stream.write("<polygon points=\"#{inner_pts}\" class=\"in\"/>")
+      end
+
+      private
+
+      def svg_css
+        ".out{fill:none;stroke:red;stroke-width:1;}.in{fill:none;stroke:green;stroke-width:1;}.out:hover{stroke:yellow;}"
+      end
+    end
+  end
+end

data/lib/contrek/version.rb

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

data/lib/contrek.rb

@@ -40,6 +40,8 @@ require "contrek/finder/concurrent/merger"
 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"
@@ -54,7 +56,8 @@ require "contrek/cpp/cpp_concurrent_finder"
 require "contrek/cpp/cpp_concurrent_merger"
 require "contrek/cpp/cpp_concurrent_horizontal_merger"
 require "contrek/cpp/cpp_concurrent_vertical_merger"
-require "contrek/cpp/cpp_concurrent_streaming_merger"
+require "contrek/cpp/cpp_svg_concurrent_streaming_merger"
+require "contrek/cpp/cpp_geo_json_concurrent_streaming_merger"
 require "contrek/cpp/cpp_tempfile"
 require "contrek/cpp/cpp_result"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-27 00:00:00.000000000 Z
+date: 2026-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -257,9 +257,10 @@ files:
 - lib/contrek/cpp/cpp_concurrent_finder.rb
 - lib/contrek/cpp/cpp_concurrent_horizontal_merger.rb
 - lib/contrek/cpp/cpp_concurrent_merger.rb
-- lib/contrek/cpp/cpp_concurrent_streaming_merger.rb
 - lib/contrek/cpp/cpp_concurrent_vertical_merger.rb
+- lib/contrek/cpp/cpp_geo_json_concurrent_streaming_merger.rb
 - lib/contrek/cpp/cpp_result.rb
+- lib/contrek/cpp/cpp_svg_concurrent_streaming_merger.rb
 - lib/contrek/cpp/cpp_tempfile.rb
 - lib/contrek/finder/bounds.rb
 - lib/contrek/finder/concurrent/clipped_polygon_finder.rb
@@ -268,6 +269,7 @@ files:
 - lib/contrek/finder/concurrent/end_point.rb
 - lib/contrek/finder/concurrent/fake_cluster.rb
 - lib/contrek/finder/concurrent/finder.rb
+- lib/contrek/finder/concurrent/geo_json_streaming_merger.rb
 - lib/contrek/finder/concurrent/horizontal_merger.rb
 - lib/contrek/finder/concurrent/hub.rb
 - lib/contrek/finder/concurrent/inner_polyline.rb
@@ -282,6 +284,7 @@ files:
 - lib/contrek/finder/concurrent/sequence.rb
 - lib/contrek/finder/concurrent/shape.rb
 - lib/contrek/finder/concurrent/streaming_merger.rb
+- lib/contrek/finder/concurrent/svg_streaming_merger.rb
 - lib/contrek/finder/concurrent/tile.rb
 - lib/contrek/finder/concurrent/vertical_merger.rb
 - lib/contrek/finder/list.rb