contrek 1.3.1 → 1.3.3

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

@@ -5,7 +5,7 @@ module Contrek
     class Cluster
       attr_reader :tiles, :hub, :finder
 
-      def initialize(finder:, height:, start_x:, end_x:)
+      def initialize(finder:, height:)
         @finder = finder
         @tiles = []
         @hub = Hub.new(height:)
@@ -57,23 +57,24 @@ module Contrek
               new_inners = shape.inner_polylines
               new_inner_polylines = []
               tot_inner += Benchmark.measure do
-                new_inner_polylines = cursor.join_inners!(new_outer, treemap)
+                new_inner_polylines = cursor.join_inners!(treemap)
                 new_inners += new_inner_polylines
                 if treemap
                   new_inner_polylines.each do |inner_polyline|
-                    inner_polyline.sequence.compute_vertical_bounds!
+                    inner_polyline.compute_vertical_bounds!
                     all_new_inner_polylines += new_inner_polylines
                   end
                 end
                 new_inners += cursor.orphan_inners
               end.real
+              shape.clear_inner!
 
               polyline = Polyline.new(tile: tile, polygon: new_outer.to_a)
               inserting_new_shape = Shape.init_by(polyline, new_inners)
               new_shapes << inserting_new_shape
               polyline.shape = inserting_new_shape
 
-              new_inner_polylines.each { |inner_polyline| inner_polyline.sequence.shape = inserting_new_shape }
+              new_inner_polylines.each { |inner_polyline| inner_polyline.shape = inserting_new_shape }
 
               if treemap
                 cursor.shapes_sequence.each do |merged_shape|
@@ -115,7 +116,7 @@ module Contrek
       private
 
       def assign_ancestry(shape, inner_polyline)
-        shape.set_parent_shape(inner_polyline.sequence.shape)
+        shape.set_parent_shape(inner_polyline.shape)
         shape.parent_inner_polyline = inner_polyline
         shape.fixed = true
       end

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

@@ -40,7 +40,7 @@ module Contrek
         outer_joined_polyline
       end
 
-      def join_inners!(outer_seq, treemap)
+      def join_inners!(treemap)
         return_inner_polylines = []
         shape_index = 0
 
@@ -174,6 +174,7 @@ module Contrek
                   if !dest_part.polyline.on?(Polyline::TRACKED_OUTER)
                     @shapes_sequence << shape
                     @orphan_inners += shape.inner_polylines
+                    shape.clear_inner!
                   end
                   dest_part.polyline.turn_on(Polyline::TRACKED_OUTER)
                   if !dest_part.touched

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

@@ -114,18 +114,7 @@ module Contrek
             return
           end
           if (twin_tile = arriving_tiles.find { |b| (b.start_x == (tile.end_x - 1)) || ((b.end_x - 1) == tile.start_x) })
-
-            if twin_tile.start_x == (tile.end_x - 1)
-              start_x = tile.start_x
-              end_x = twin_tile.end_x
-            else
-              start_x = twin_tile.start_x
-              end_x = tile.end_x
-            end
-
-            # puts "start = #{start_x} end = #{end_x}"
-
-            cluster = Cluster.new(finder: self, height: height, start_x:, end_x:)
+            cluster = Cluster.new(finder: self, height: height)
             if twin_tile.start_x == (tile.end_x - 1)
               cluster.add(tile)
               cluster.add(twin_tile)

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/inner_polyline.rb

@@ -3,37 +3,20 @@
 module Contrek
   module Concurrent
     class InnerPolyline
-      attr_reader :sequence
+      attr_reader :raw, :vertical_bounds
+      attr_accessor :shape
 
       def initialize(shape: nil, raw_coordinates: [], sequence: nil)
-        @raw = raw_coordinates if raw_coordinates
-        @sequence = sequence if sequence
-        @shape = shape
-      end
-
-      def raw
-        @sequence ? @sequence.to_a : @raw
-      end
-
-      def vertical_bounds
-        if @sequence
-          @sequence.vertical_bounds
+        if sequence
+          @shape = sequence.shape
+          @raw = sequence.to_a
         else
-          raw_vertical_bounds
+          @shape = shape
+          @raw = raw_coordinates
         end
       end
 
-      def shape
-        if @sequence
-          @sequence.shape
-        else
-          @shape
-        end
-      end
-
-      private
-
-      def raw_vertical_bounds
+      def compute_vertical_bounds!
         @vertical_bounds ||= begin
           min_y = Float::INFINITY
           max_y = 0

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

@@ -3,13 +3,9 @@
 module Contrek
   module Concurrent
     class Sequence
-      attr_accessor :vertical_bounds, :shape
+      attr_accessor :shape
       prepend Queueable
 
-      def initialize
-        @vertical_bounds = nil
-      end
-
       def is_not_vertical
         return false if size < 2
         x0 = head.payload[:x]
@@ -21,18 +17,6 @@ module Contrek
         false
       end
 
-      def compute_vertical_bounds!
-        return if size == 0
-        min_y = Float::INFINITY
-        max_y = 0
-        get_vector_cache.each do |pos|
-          y = pos[:y]
-          min_y = y if y < min_y
-          max_y = y if y > max_y
-        end
-        @vertical_bounds = {min: min_y, max: max_y}
-      end
-
       def get_vector_cache
         @vector_cache ||= to_a
       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.1"
+  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.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Emanuele Cesaroni
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-20 00:00:00.000000000 Z
+date: 2026-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -188,6 +188,7 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/FakeCluster.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Finder.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Finder.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/GeoJsonStreamingMerger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Hub.cpp
@@ -218,6 +219,8 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/ShapePool.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/SubPool.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/SvgStreamingMerger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Tile.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Tile.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/VerticalMerger.cpp
@@ -254,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
@@ -265,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
@@ -279,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
@@ -307,7 +313,7 @@ metadata:
   homepage_uri: https://github.com/runout77/contrek
   documentation_uri: https://github.com/runout77/contrek#readme
   changelog_uri: https://github.com/runout77/contrek/blob/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -323,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Fast PNG contour tracing and shape detection for Ruby
 test_files: []