contrek 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e79871127e3d6aff04c8bd1e6ea9765d47542249a188b0cf151ce8a005ea29a
-  data.tar.gz: '055817b3638fcf582584e45e0ffef001305961321f8a05beb5998399b0be7bc6'
+  metadata.gz: 60aa8f5e3cfb43291e3dcce9921d77e84ce289bffd974dca7a4b2ed4c07124c0
+  data.tar.gz: 98ccefa7a9de3fa2ea0922d09c18fa45470ccb6ad0072c0b85d6203f025a7f11
 SHA512:
-  metadata.gz: e3007307485a1ce6902f4f95b452b3ef2622fd2c59a0a27d8ee2564e0d8b512bdf8acc15ad5fac30b472b8d14263800324ac19ad74932eb220366860ad7ec60b
-  data.tar.gz: 38289075bb92eb56229f1206ff595a0ea65d6bcbbf271dcdc035d60ef8b1c7609cbae687367803ff3d2cb39eae9f8fe670fb893afdcff87df77d8c0ce7b1c928
+  metadata.gz: 57731f61f8afc63f459b2fd349cd34e151406943c51628f80d0ac06dd29c360323adead860da8e2f9b9fb4579b6f29987c5a681175db7315d999d78039f4811f
+  data.tar.gz: 8420ba829bd714492b95249c567bdc1be27c8559bd11fbcdaf48ee9d975dc719891db23fd5d2f54d832e4f79f3dc335b1da557a53382f713d3c478094004f3d6

data/CHANGELOG.md

@@ -139,7 +139,7 @@ All notable changes to this project will be documented in this file.
 ## [1.3.4] - 2026-07-19
 - Refactored core topology from a top-left point model to a 4-vertex pixel-cell model, natively eliminating diagonal ambiguities and rewriting part of the stripe-merging algorithm to ensure perfect geometric stitching on shared nodes. Removed Strict Bounds mode. Added a Douglas-Peucker and a custom raster-compression algorithm that shifts top/right pixel boundaries by 1px to ensure flawless surface rendering as bitmap image.
 
-## [1.3.6] - 2026-07-26
+## [1.3.6] - 2026-07-27
 - Removed optionparser.h and the legacy options argument mechanism, replacing them with the new OptionValue.h and Options.h
 - Added polygon compression to the progressive streaming pipeline (StreamingMerger).
 - Added strict validation in progressive streaming. Results passed to add_tile() are now validated to ensure they contain compatible settings (such as versus conventions and compression options).

data/Gemfile.lock

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

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

@@ -43,28 +43,33 @@ ProcessResult* StreamingMerger::process_info() {
 
 void StreamingMerger::stream_polygons(Tile* tile, bool flush) {
   ensure_header();
-  if (int tile_end_x = tile->end_x(); true) {
-    tile->shapes().erase(
-      std::remove_if(tile->shapes().begin(), tile->shapes().end(), [this, flush, tile_end_x](Shape* shape) {
-        if (flush || shape->outer_polyline->max_x() < (tile_end_x - 1)) {
-          this->moved++;
-          Polygon polygon = shape->to_raw_polygon();
-          if (this->options().any_compression()) {
-            std::list<Polygon> polygons;
-            polygons.push_back(polygon);
-            FakeCluster fake_cluster(polygons, this->options());
-            fake_cluster.compress_coords(polygons, this->options());
-            polygon = std::move(polygons.front());
-          }
-          this->stream_raw_polygon(polygon);
-          shape->detach_from_pool();
-          return true;
-        }
-        return false;
-      }),
-      tile->shapes().end());
+
+  const int safe_boundary_x = tile->end_x() - 1;
+  auto& shapes = tile->shapes();
+  std::list<Polygon> polygons_to_stream;
+  shapes.erase(
+    std::remove_if(shapes.begin(), shapes.end(), [this, flush, safe_boundary_x, &polygons_to_stream](Shape* shape) {
+      const bool is_ready = flush || (shape->outer_polyline->max_x() < safe_boundary_x);
+      if (is_ready) {
+        this->moved++;
+        polygons_to_stream.push_back(std::move(shape->to_raw_polygon()));
+        shape->detach_from_pool();
+        return true;
+      }
+      return false;
+    }),
+    shapes.end()
+  );
+  if (this->options().any_compression() && !polygons_to_stream.empty()) {
+    FakeCluster fake_cluster(polygons_to_stream, this->options());
+    fake_cluster.compress_coords(polygons_to_stream, this->options());
+  }
+  for (Polygon& polygon : polygons_to_stream) {
+    this->stream_raw_polygon(std::move(polygon));
   }
+
   stream->flush();
+
   if (flush) {
     ensure_footer();
   }

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/reducers/LinearReducer.cpp

@@ -19,31 +19,32 @@ LinearReducer::LinearReducer(std::vector<Point>& list_of_points)
 }
 
 void LinearReducer::reduce() {
-  if (points.size() < 2) return;
-
-  Point start_p = points[0];
-  Point end_p = points[1];
-  auto dir = seq_dir(start_p, end_p);
+  if (points.size() < 3) return;
 
+  size_t write_idx = 1;
   for (size_t i = 2; i < points.size(); ++i) {
-    Point point = points[i];
-    auto act_seq = seq_dir(end_p, point);
-    if (act_seq == dir) {
-      auto it = std::find_if(points.begin(), points.end(), [&](const Point& p) {  // TODO(ema): optimize...
-        return p.x == end_p.x && p.y == end_p.y;
-      });
-      if (it != points.end()) {
-        size_t removed_idx = std::distance(points.begin(), it);
-        points.erase(it);
-        if (removed_idx <= i) i--;
-      }
+    const Point& start_p = points[write_idx - 1];
+    const Point& end_p   = points[write_idx];
+    const Point& curr_p  = points[i];
+
+    int dx1 = end_p.x - start_p.x;
+    int dy1 = end_p.y - start_p.y;
+
+    int dx2 = curr_p.x - end_p.x;
+    int dy2 = curr_p.y - end_p.y;
+
+    int sx1 = (0 < dx1) - (dx1 < 0);
+    int sy1 = (0 < dy1) - (dy1 < 0);
+
+    int sx2 = (0 < dx2) - (dx2 < 0);
+    int sy2 = (0 < dy2) - (dy2 < 0);
+
+    if (sx1 == sx2 && sy1 == sy2) {
+      points[write_idx] = curr_p;
     } else {
-      dir = act_seq;
+      write_idx++;
+      points[write_idx] = curr_p;
     }
-    end_p = point;
   }
-}
-
-std::array<int, 2> LinearReducer::seq_dir(const Point& a, const Point& b)
-{ return { b.x - a.x, b.y - a.y };
+  points.resize(write_idx + 1);
 }

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/reducers/LinearReducer.h

@@ -16,7 +16,4 @@ class LinearReducer : public Reducer {
  public:
   explicit LinearReducer(std::vector<Point>& list_of_points);
   void reduce();
-
- private:
-  std::array<int, 2> seq_dir(const Point& a, const Point& b);
 };

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

@@ -30,21 +30,26 @@ module Contrek
       def stream_polygons!(tile, flush = false)
         ensure_header
 
+        safe_boundary_x = tile.end_x - 1
+        polygons_to_stream = []
+
         tile.shapes.select! do |shape|
           bounds = shape.outer_polyline.get_bounds
-          if flush || bounds[:max_x] < tile.end_x - 1
+          if flush || bounds[:max_x] < safe_boundary_x
             @moved += 1
             polygon = shape.to_raw_polygon
-            if @options.has_key?(:compress)
-              FakeCluster.new([polygon], @options).compress_coords
-            end
-            stream_raw_polygon(polygon)
+            polygons_to_stream << polygon
             false
           else
             true
           end
         end
-
+        if @options.has_key?(:compress) && polygons_to_stream.any?
+          FakeCluster.new(polygons_to_stream, @options).compress_coords
+        end
+        polygons_to_stream.each do |polygon|
+          stream_raw_polygon(polygon)
+        end
         ensure_footer if flush
       end
 

data/lib/contrek/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-07-27 00:00:00.000000000 Z
+date: 2026-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec