nswtopo 3.0.1 → 3.1.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nswtopo
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Matthew Hollingworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-05 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -59,9 +59,7 @@ files:
 - lib/nswtopo/formats/svgz.rb
 - lib/nswtopo/formats/zip.rb
 - lib/nswtopo/geometry.rb
-- lib/nswtopo/geometry/overlap.rb
 - lib/nswtopo/geometry/r_tree.rb
-- lib/nswtopo/geometry/segment.rb
 - lib/nswtopo/geometry/straight_skeleton.rb
 - lib/nswtopo/geometry/straight_skeleton/collapse.rb
 - lib/nswtopo/geometry/straight_skeleton/interior_node.rb
@@ -70,7 +68,6 @@ files:
 - lib/nswtopo/geometry/straight_skeleton/split.rb
 - lib/nswtopo/geometry/straight_skeleton/vertex.rb
 - lib/nswtopo/geometry/vector.rb
-- lib/nswtopo/geometry/vector_sequence.rb
 - lib/nswtopo/gis.rb
 - lib/nswtopo/gis/arcgis.rb
 - lib/nswtopo/gis/arcgis/connection.rb
@@ -87,6 +84,7 @@ files:
 - lib/nswtopo/gis/geojson/collection.rb
 - lib/nswtopo/gis/geojson/line_string.rb
 - lib/nswtopo/gis/geojson/multi_line_string.rb
+- lib/nswtopo/gis/geojson/multi_point.rb
 - lib/nswtopo/gis/geojson/multi_polygon.rb
 - lib/nswtopo/gis/geojson/point.rb
 - lib/nswtopo/gis/geojson/polygon.rb
@@ -97,12 +95,8 @@ files:
 - lib/nswtopo/gis/shapefile.rb
 - lib/nswtopo/help_formatter.rb
 - lib/nswtopo/helpers.rb
-- lib/nswtopo/helpers/array.rb
 - lib/nswtopo/helpers/colour.rb
-- lib/nswtopo/helpers/concurrently.rb
-- lib/nswtopo/helpers/dir.rb
-- lib/nswtopo/helpers/hash.rb
-- lib/nswtopo/helpers/tar_writer.rb
+- lib/nswtopo/helpers/thread_pool.rb
 - lib/nswtopo/layer.rb
 - lib/nswtopo/layer/arcgis_raster.rb
 - lib/nswtopo/layer/colour_mask.rb
@@ -113,7 +107,10 @@ files:
 - lib/nswtopo/layer/grid.rb
 - lib/nswtopo/layer/import.rb
 - lib/nswtopo/layer/labels.rb
-- lib/nswtopo/layer/labels/barrier.rb
+- lib/nswtopo/layer/labels/barriers.rb
+- lib/nswtopo/layer/labels/convex_hull.rb
+- lib/nswtopo/layer/labels/convex_hulls.rb
+- lib/nswtopo/layer/labels/label.rb
 - lib/nswtopo/layer/mask_render.rb
 - lib/nswtopo/layer/overlay.rb
 - lib/nswtopo/layer/raster.rb
@@ -121,21 +118,22 @@ files:
 - lib/nswtopo/layer/raster_render.rb
 - lib/nswtopo/layer/relief.rb
 - lib/nswtopo/layer/spot.rb
-- lib/nswtopo/layer/vector.rb
-- lib/nswtopo/layer/vector/cutout.rb
-- lib/nswtopo/layer/vector/knockout.rb
+- lib/nswtopo/layer/vector_render.rb
+- lib/nswtopo/layer/vector_render/cutout.rb
+- lib/nswtopo/layer/vector_render/knockout.rb
 - lib/nswtopo/layer/vegetation.rb
 - lib/nswtopo/log.rb
 - lib/nswtopo/map.rb
 - lib/nswtopo/os.rb
 - lib/nswtopo/safely.rb
+- lib/nswtopo/svg.rb
 - lib/nswtopo/tiled_web_map.rb
 - lib/nswtopo/tree_indenter.rb
 - lib/nswtopo/version.rb
 - lib/nswtopo/zip.rb
 homepage: https://github.com/mholling/nswtopo
 licenses:
-- GPL-3.0
+- AGPL-3.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -145,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.4
+      version: 3.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -154,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - GDAL >= v3.4
 - Google Chrome >= v112
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A vector topographic mapping tool

data/lib/nswtopo/geometry/overlap.rb

@@ -1,47 +0,0 @@
-module Overlap
-  def separated_by?(buffer)
-    simplex = [map(&:first).inject(&:minus)]
-    perp = simplex[0].perp
-    loop do
-      return false unless case
-      when simplex.one? then simplex[0].norm
-      when simplex.inject(&:minus).dot(simplex[1]) > 0 then simplex[1].norm
-      when simplex.inject(&:minus).dot(simplex[0]) < 0 then simplex[0].norm
-      else simplex.inject(&:cross).abs / simplex.inject(&:minus).norm
-      end > buffer
-      max = self[0].max_by { |point| perp.cross point }
-      min = self[1].min_by { |point| perp.cross point }
-      support = max.minus min
-      return true unless simplex[0].minus(support).cross(perp) > 0
-      rays = simplex.map { |point| point.minus support }
-      case simplex.length
-      when 1
-        case
-        when rays[0].dot(support) > 0
-          simplex, perp = [support], support.perp
-        when rays[0].cross(support) < 0
-          simplex, perp = [support, *simplex], rays[0]
-        else
-          simplex, perp = [*simplex, support], rays[0].negate
-        end
-      when 2
-        case
-        when rays[0].cross(support) > 0 && rays[0].dot(support) < 0
-          simplex, perp = [simplex[0], support], rays[0].negate
-        when rays[1].cross(support) < 0 && rays[1].dot(support) < 0
-          simplex, perp = [support, simplex[1]], rays[1]
-        when rays[0].cross(support) <= 0 && rays[1].cross(support) >= 0
-          return false
-        else
-          simplex, perp = [support], support.perp
-        end
-      end
-    end
-  end
-
-  def overlap?(buffer)
-    !separated_by?(buffer)
-  end
-end
-
-Array.send :include, Overlap

data/lib/nswtopo/geometry/segment.rb

@@ -1,27 +0,0 @@
-module Segment
-  def segments
-    each_cons(2).entries
-  end
-
-  def ring
-    zip rotate
-  end
-
-  def diff
-    last.minus first
-  end
-
-  def distance
-    diff.norm
-  end
-
-  def along(fraction)
-    self[1].times(fraction).plus self[0].times(1.0 - fraction)
-  end
-
-  def midpoint
-    transpose.map(&:mean)
-  end
-end
-
-Array.send :include, Segment

data/lib/nswtopo/geometry/vector_sequence.rb

@@ -1,180 +0,0 @@
-module VectorSequence
-  def perps
-    ring.map(&:diff).map(&:perp)
-  end
-
-  def signed_area
-    0.5 * ring.map { |p1, p2| p1.cross p2 }.inject(&:+)
-  end
-
-  def clockwise?
-    signed_area < 0
-  end
-  alias hole? clockwise?
-
-  def anticlockwise?
-    signed_area >= 0
-  end
-
-  def centroid
-    ring.map do |p1, p2|
-      (p1.plus p2).times(p1.cross p2)
-    end.inject(&:plus) / (6.0 * signed_area)
-  end
-
-  def convex?
-    ring.map(&:diff).ring.all? do |directions|
-      directions.inject(&:cross) >= 0
-    end
-  end
-
-  def surrounds?(points)
-    points.all? do |point|
-      point.within? self
-    end
-  end
-
-  def convex_hull
-    start = min_by(&:reverse)
-    hull, remaining = uniq.partition { |point| point == start }
-    remaining.sort_by do |point|
-      [point.minus(start).angle, point.minus(start).norm]
-    end.inject(hull) do |memo, p3|
-      while memo.many? do
-        p1, p2 = memo.last(2)
-        (p3.minus p1).cross(p2.minus p1) < 0 ? break : memo.pop
-      end
-      memo << p3
-    end
-  end
-
-  def minimum_bounding_box(*margins)
-    polygon = convex_hull
-    return polygon[0], [0, 0], 0 if polygon.one?
-    indices = [%i[min_by max_by], [0, 1]].inject(:product).map do |min, axis|
-      polygon.map.with_index.send(min) { |point, index| point[axis] }.last
-    end
-    calipers = [[0, -1], [1, 0], [0, 1], [-1, 0]]
-    rotation = 0.0
-    candidates = []
-
-    while rotation < Math::PI / 2
-      edges = indices.map do |index|
-        polygon[(index + 1) % polygon.length].minus polygon[index]
-      end
-      angle, which = [edges, calipers].transpose.map do |edge, caliper|
-        Math::acos caliper.proj(edge).clamp(-1, 1)
-      end.map.with_index.min_by { |angle, index| angle }
-
-      calipers.each { |caliper| caliper.rotate_by!(angle) }
-      rotation += angle
-
-      break if rotation >= Math::PI / 2
-
-      dimensions = [0, 1].map do |offset|
-        polygon[indices[offset + 2]].minus(polygon[indices[offset]]).proj(calipers[offset + 1])
-      end
-
-      centre = polygon.values_at(*indices).map do |point|
-        point.rotate_by(-rotation)
-      end.partition.with_index do |point, index|
-        index.even?
-      end.map.with_index do |pair, index|
-        0.5 * pair.map { |point| point[index] }.inject(:+)
-      end.rotate_by(rotation)
-
-      if rotation < Math::PI / 4
-        candidates << [centre, dimensions, rotation]
-      else
-        candidates << [centre, dimensions.reverse, rotation - Math::PI / 2]
-      end
-
-      indices[which] += 1
-      indices[which] %= polygon.length
-    end
-
-    candidates.min_by do |centre, dimensions, rotation|
-      dimensions.zip(margins).map do |dimension, margin|
-        margin ? dimension + 2 * margin : dimension
-      end.inject(:*)
-    end
-  end
-
-  def path_length
-    segments.map(&:diff).sum(&:norm)
-  end
-
-  def trim(margin)
-    start = [margin, 0].max
-    stop = path_length - start
-    return [] unless start < stop
-    points, total = [], 0
-    segments.each do |segment|
-      distance = segment.distance
-      case
-      when total + distance <= start
-      when total <= start
-        points << segment.along((start - total) / distance)
-        points << segment.along((stop  - total) / distance) if total + distance >= stop
-      else
-        points << segment[0]
-        points << segment.along((stop  - total) / distance) if total + distance >= stop
-      end
-      total += distance
-      break if total >= stop
-    end
-    points
-  end
-
-  def crop(length)
-    trim(0.5 * (path_length - length))
-  end
-
-  def sample_at(interval, along: false, angle: false, offset: nil)
-    Enumerator.new do |yielder|
-      alpha = (0.5 + Float(offset || 0) / interval) % 1.0
-      segments.inject [alpha, 0] do |(alpha, sum), segment|
-        loop do
-          fraction = alpha * interval / segment.distance
-          break unless fraction < 1
-          segment[0] = segment.along(fraction)
-          sum += alpha * interval
-          yielder << case
-          when along then [segment[0], sum]
-          when angle then [segment[0], segment.diff.angle]
-          else segment[0]
-          end
-          alpha = 1.0
-        end
-        [alpha - segment.distance / interval, sum + segment.distance]
-      end
-    end.entries
-  end
-
-  def in_sections(count)
-    segments.each_slice(count).map do |segments|
-      segments.inject do |section, segment|
-        section << segment[1]
-      end
-    end
-  end
-
-  def douglas_peucker(tolerance)
-    chunks, simplified = [self], []
-    while chunk = chunks.pop
-      direction = chunk.last.minus(chunk.first).normalised
-      deltas = chunk.map do |point|
-        point.minus(chunk.first).cross(direction).abs
-      end
-      delta, index = deltas.each.with_index.max_by(&:first)
-      if delta < tolerance
-        simplified.prepend chunk.first
-      else
-        chunks << chunk[0..index] << chunk[index..-1]
-      end
-    end
-    simplified << last
-  end
-end
-
-Array.send :include, VectorSequence

data/lib/nswtopo/helpers/array.rb

@@ -1,19 +0,0 @@
-module ArrayHelpers
-  def median
-    sort[length / 2]
-  end
-
-  def mean
-    empty? ? nil : inject(&:+) / length
-  end
-
-  def many?
-    length > 1
-  end
-
-  def in_two
-    each_slice(1 + [length - 1, 0].max / 2)
-  end
-end
-
-Array.send :include, ArrayHelpers

data/lib/nswtopo/helpers/concurrently.rb

@@ -1,27 +0,0 @@
-module Concurrently
-  CORES = Etc.nprocessors rescue 1
-
-  def concurrently(threads = CORES, &block)
-    elements = Queue.new
-    threads.times.map do
-      Thread.new do
-        while element = elements.pop
-          block.call element
-        end
-      end
-    end.tap do
-      inject(elements, &:<<).close
-    end.each(&:join)
-    self
-  end
-
-  def concurrent_groups(threads = CORES, &block)
-    group_by.with_index do |item, index|
-      index % threads
-    end.values.map do |items|
-      Thread.new(items, &block)
-    end.each(&:join)
-  end
-end
-
-Enumerator.send :include, Concurrently

data/lib/nswtopo/helpers/dir.rb

@@ -1,7 +0,0 @@
-class Dir
-  def self.mktmppath
-    mktmpdir do |path|
-      yield Pathname.new(path)
-    end
-  end
-end

data/lib/nswtopo/helpers/hash.rb

@@ -1,15 +0,0 @@
-module HashHelpers
-  def deep_merge(other)
-    merge(other) do |key, old_value, new_value|
-      Hash === old_value ? Hash === new_value ? old_value.deep_merge(new_value) : new_value : new_value
-    end
-  end
-
-  def deep_merge!(other)
-    merge!(other) do |key, old_value, new_value|
-      Hash === old_value ? Hash === new_value ? old_value.deep_merge!(new_value) : new_value : new_value
-    end
-  end
-end
-
-Hash.send :include, HashHelpers

data/lib/nswtopo/helpers/tar_writer.rb

@@ -1,11 +0,0 @@
-module TarWriterHelpers
-  def add_entry(entry)
-    check_closed
-    @io.write entry.header
-    @io.write entry.read
-    @io.write ?\0 while @io.pos % 512 > 0
-    self
-  end
-end
-
-Gem::Package::TarWriter.send :include, TarWriterHelpers

data/lib/nswtopo/layer/labels/barrier.rb

@@ -1,39 +0,0 @@
-module NSWTopo
-  module Labels
-    class Barrier
-      class Segment
-        def initialize(segment, barrier)
-          @segment, @barrier = segment, barrier
-          @bounds = @segment.transpose.map(&:minmax).map do |min, max|
-            [min - barrier.buffer, max + barrier.buffer]
-          end
-        end
-        attr_reader :barrier, :bounds
-
-        def conflicts_with?(segment, buffer: 0)
-          [@segment, segment].overlap?(@barrier.buffer + buffer)
-        end
-      end
-
-      def initialize(feature, buffer)
-        @feature, @buffer = feature, buffer
-      end
-      attr_reader :buffer
-
-      def segments
-        case @feature
-        when GeoJSON::Point
-          [[@feature.coordinates] * 2]
-        when GeoJSON::LineString
-          @feature.coordinates.segments
-        when GeoJSON::Polygon
-          @feature.coordinates.flat_map do |coordinates|
-            coordinates.segments
-          end
-        end.map do |segment|
-          Segment.new segment, self
-        end
-      end
-    end
-  end
-end