nswtopo 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc36bc0fcdc3467aad475f9ff3757bab270bba4fe81e7bed3c34b0c34a3b4f2
-  data.tar.gz: fb02ea3f103222c9424bbe9f1c750caa608f73e4e5815687f40c1a383f6fa8d9
+  metadata.gz: be473c574c562b474c1d4ef9b3a1dfc2c697993b1034990375f1405ebfabf1cb
+  data.tar.gz: 7b230fbd3f2e5164bb6452c10a15cd38424dbeea29c42947f6e36150a5784570
 SHA512:
-  metadata.gz: 06a794c2eaa6949d4754c62408d6d3358ee1d84c9dcfb10a2ab90ec9833b3916a84f5873f06657b5bca4e328765848d53ff1dafb150a58e42cd15085808e1e43
-  data.tar.gz: 83325ab407ea8a7fcc6675cfcb747a8d1f08932d228dbdcb18fa8dec48d328a38690dcbb0766be975f03d7b872caf6e60ef0706a5429713c8a86b09df16cecaa
+  metadata.gz: a925a874ddb9802d539712371e6dd06e28cb4a3fbdcd22d6b96a274131ae3a89244180d926d9f10a785db14ca98e0fdac4842a9766dad24475f3ff9c878e3c68
+  data.tar.gz: 145391125d1035c7bc5dc3b127389acc846277435624e971dcc82033089d784f5f84c0617ff7cc2af35884d750858b13d433185c73acb0fdd0eb363af9077393

data/bin/nswtopo

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2011-2022 Matthew Hollingworth
+# Copyright 2011-2023 Matthew Hollingworth
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -37,8 +37,8 @@ begin
   end
 
   case
-  when (RUBY_VERSION.split(/\D+/).take(3).map(&:to_i) <=> [3,0,4]) < 0
-    log_abort "ruby 3.0.4 or greater required"
+  when (RUBY_VERSION.split(/\D+/).take(3).map(&:to_i) <=> [3,1,4]) < 0
+    log_abort "ruby 3.1.4 or greater required"
   when !Zlib.const_defined?(:GzipFile)
     log_abort "ruby with GZIP_SUPPORT required"
   when (GDAL_VERSION.split(/\D+/).take(3).map(&:to_i) <=> [3,4]) < 0
@@ -56,6 +56,7 @@ begin
   NonNegFloat   = Class.new
   Dimensions    = Class.new
   Inset         = Class.new
+  Radius        = Class.new
   Margins       = Class.new
   CoordList     = Class.new
   Rotation      = Class.new
@@ -90,6 +91,13 @@ begin
     string.split(?,).map(&:to_f).each_slice(4).entries
   end
 
+  OptionParser.accept Radius, /\A#{float}(?:,#{digits})*\z/ do |string|
+    radius, segments = string.split(?,)
+    raise OptionParser::InvalidArgument, string unless radius.to_f.positive?
+    raise OptionParser::InvalidArgument, string if segments && segments.to_i.zero?
+    segments ? [radius.to_f, segments.to_i] : radius.to_f
+  end
+
   OptionParser.accept Margins, /\A#{float}(?:,#{float})?\z/ do |string|
     margins = string.split(?,).map(&:to_f)
     raise OptionParser::InvalidArgument, string if margins.any?(&:negative?)
@@ -111,7 +119,7 @@ begin
   end
 
   OptionParser.accept Colour do |string|
-    string == "none" ? string : Colour.new(string.downcase)
+    string == "none" ? string : Colour.new(string.downcase).to_s
   rescue Colour::Error
     raise OptionParser::InvalidArgument, string
   end
@@ -212,11 +220,13 @@ begin
       parser.on "-b", "--bounds      <bounds.kml>",   Pathname,    "bounds for map as KML or GPX file"
       parser.on "-c", "--coords      <x1,y1,...>",    CoordList,   "bounds for map as one or more WGS84",
                                                                    "longitude/latitude pairs" 
+      parser.on "-n", "--neatline    <neatline.kml>", Pathname,    "neatline for map as KML file"
       parser.on "-d", "--dimensions  <width,height>", Dimensions,  "map dimensions in mm"
       parser.on "-r", "--rotation    <rotation>",     Rotation,    "map rotation angle in clockwise",
                                                                    "degrees, 'auto' or 'magnetic'"
       parser.on "-m", "--margins     <x[,y]>",        Margins,     "map margins in mm"
       parser.on "-i", "--inset       <x1,y1,x2,y2>",  Inset,       "map inset coordinates in mm"
+      parser.on       "--radius      <radius>",       Radius,      "map corner radius in mm"
       parser.on "-o", "--overwrite",                               "overwrite existing map file"
 
     when "info"
@@ -265,6 +275,7 @@ begin
       parser.on       "--stroke-width  <width>",      PositiveFloat, "stroke width in mm (default %s)" % NSWTopo::Contour::DEFAULTS["stroke-width"]
       parser.on       "--fill          <colour>",     Colour,        "label colour (defaults to stroke colour)"
       parser.on "-r", "--resolution    <resolution>", PositiveFloat, "DEM processing resolution in metres"
+      parser.on       "--epsg          <epsg>",       PositiveInt,   "override EPSG projection code for DEM"
 
     when "spot-heights"
       parser.banner = <<~EOF
@@ -279,6 +290,7 @@ begin
       parser.on "-b", "--before      <layer>",                              "insert before specified layer"
       parser.on "-c", "--replace     <layer>",                              "replace specified layer"
       parser.on "-r", "--resolution  <resolution>",     PositiveFloat,      "DEM processing resolution in metres"
+      parser.on       "--epsg        <epsg>",           PositiveInt,        "override EPSG projection code for DEM"
 
     when "relief"
       parser.banner = <<~EOF
@@ -292,6 +304,7 @@ begin
       parser.on "-m", "--method     <igor|combined>", %w[igor combined], "relief shading method (default %s)" % NSWTopo::Relief::DEFAULTS["method"]
       parser.on "-z", "--azimuth    <azimuth>",       Float,             "azimuth in degrees (default %i)" % NSWTopo::Relief::DEFAULTS["azimuth"]
       parser.on "-f", "--factor     <factor>",        PositiveFloat,     "exaggeration factor (default %s)" % NSWTopo::Relief::DEFAULTS["factor"]
+      parser.on       "--epsg       <epsg>",          PositiveInt,       "override EPSG projection code for DEM"
 
     when "grid"
       parser.banner = <<~EOF
@@ -538,4 +551,7 @@ rescue Interrupt
   log_abort "interrupted"
 rescue RuntimeError => error
   log_abort error.message
+rescue StandardError
+  print "\r\e[2K" if $stdout.tty?
+  raise
 end

data/docs/contours.md

@@ -14,6 +14,8 @@ Noise in raw elevation data usually produces unsuitably rough contour lines. Som
 
 DEM tiles are normally processed at their maximumum native resolution. Change this using the `--resolution` option. A reduced resolution (say 5 metres) can markedly improve processing speed for 1- and 2-metre tiles.
 
+Use the `--epsg` option to override the EPSG projection code for the DEM, in case of missing metadata (e.g. ACT 2015 DEM tiles).
+
 # Layer Position
 
 Use an `--after`, `--before` or `--replace` option to insert the contours in an appropriate layer position. You will most likely want to replace an existing contour layer:

data/docs/relief.md

@@ -14,9 +14,8 @@ No configuration is needed to get good results from ELVIS data. Use the followin
 * **resolution**: resolution for the DEM data; a lower value will reduce file size but yields a smoother effect
 * **opacity**: overall layer opacity
 * **altitude**: raking angle of the light from the horizon
-* **azimuth**: azimuth angle of the light, clockwise from north; deviation from the 315° default can be counter-intuitive
-* **sources**: number of light sources to use for multi-directional shading
-* **yellow**: amount of yellow illumination to apply as a fraction of grey shading
 * **factor**: vertical exaggeration factor
 
 Opacity and exaggeration can both be used to adjust the subtly of the shading effect.
+
+Use the `--epsg` option to override the EPSG projection code for the DEM, in case of missing metadata (e.g. ACT 2015 DEM tiles).

data/docs/spot-heights.md

@@ -18,6 +18,8 @@ Use the `--extent` option to set a minimum size in millimetres when searching fo
 
 DEM tiles are normally processed at their maximumum native resolution. Change this using the `--resolution` option. A reduced resolution (say 5 metres) can markedly improve processing speed for 1- and 2-metre tiles.
 
+Use the `--epsg` option to override the EPSG projection code for the DEM, in case of missing metadata (e.g. ACT 2015 DEM tiles).
+
 # Layer Position
 
 Use an `--after`, `--before` or `--replace` option to insert the spot heights in an appropriate layer position. You will most likely want to replace an existing spot heights layer:

data/lib/nswtopo/archive.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   class Archive
+    using Helpers
     extend Safely
     include Enumerable
     Invalid = Class.new RuntimeError
@@ -20,7 +21,7 @@ module NSWTopo
         yield entry unless @entries.key? entry.full_name
       end
       @entries.each do |filename, entry|
-        yield entry if entry
+        yield entry.tap(&:rewind) if entry
       end
     end
 
@@ -71,8 +72,10 @@ module NSWTopo
         end if in_path && false != Config["versioning"]
         Gem::Package::TarReader.new(input) do |tar|
           archive = new(tar).tap(&block)
-          Gem::Package::TarWriter.new(buffer) do |tar|
-            archive.each &tar.method(:add_entry)
+          archive.each do |entry|
+            buffer.write entry.header
+            buffer.write entry.read
+            buffer.write ?\0 while buffer.pos % 512 > 0
           end if archive.changed?
         end
       end

data/lib/nswtopo/chrome.rb

@@ -77,10 +77,13 @@ module NSWTopo
           *, status = Open3.capture2e *%W[taskkill /f /t /pid #{pid}]
           Process.kill "KILL", pid unless status.success?
         else
-          Timeout.timeout(TIMEOUT_KILL, Error) do
-            Process.kill "-USR1", Process.getpgid(pid)
-            Process.wait pid
-          rescue Error
+          Process.kill "-USR1", Process.getpgid(pid)
+          Enumerator.produce(Time.now) do |time|
+            sleep 0.05 and Time.now
+          end.each.with_object(Time.now) do |time, start|
+            break true if Process.wait pid, Process::WNOHANG
+            break false if time - start > TIMEOUT_KILL
+          end or begin
             Process.kill "-KILL", Process.getpgid(pid)
             Process.wait pid
           end
@@ -108,8 +111,8 @@ module NSWTopo
       @id, @data_dir = 0, Dir.mktmpdir("nswtopo_headless_chrome_")
       ObjectSpace.define_finalizer self, Chrome.rmdir(@data_dir)
 
-      args << "--disable-gpu" if Config["gpu"] == false
-      args << "--user-data-dir=#{@data_dir}"
+      args = [*args, "--disable-gpu"] if Config["gpu"] == false
+      args = [*args, "--user-data-dir=#{@data_dir}"]
 
       input, @input, @output, output = *IO.pipe, *IO.pipe
       input.nonblock, output.nonblock = false, false

data/lib/nswtopo/commands/layers.rb

@@ -6,7 +6,7 @@ module NSWTopo
     log_warn "no layers installed" if paths.none?
 
     TreeIndenter.new(paths) do |paths|
-      paths.map do |path|
+      paths.filter_map do |path|
         case
         when path.glob("**/*.yml").any?
           [path.basename.sub_ext(""), path.children.sort]
@@ -14,7 +14,7 @@ module NSWTopo
         when path.extname == ".yml"
           path.basename.sub_ext("")
         end
-      end.compact
+      end
     end.each do |indents, name|
       puts [*indents, name].join
     end

data/lib/nswtopo/config.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   module Config
+    using Helpers
     include Log
     singleton_class.attr_writer :extra_path
 

data/lib/nswtopo/formats/gemf.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   module Formats
+    using Helpers
     def render_gemf(gemf_path, name:, **options, &block)
       Dir.mktmppath do |temp_dir|
         ranges = tiled_web_map(temp_dir, **options, extension: "gemf", &block).sort_by do |tile|

data/lib/nswtopo/formats/kmz.rb

@@ -1,5 +1,7 @@
 module NSWTopo
   module Formats
+    using Helpers
+
     module Kmz
       TILE_SIZE = 512
       EARTH_RADIUS = 6378137.0
@@ -50,21 +52,26 @@ module NSWTopo
       degree_resolution = 180.0 * metre_resolution / Math::PI / Kmz::EARTH_RADIUS
 
       wgs84_bounds = @cutline.reproject_to_wgs84.bounds
-      wgs84_dimensions = wgs84_bounds.transpose.diff / degree_resolution
+      wgs84_dimensions = wgs84_bounds.map do |min, max|
+        (max - min) / degree_resolution
+      end
 
       max_zoom = Math::log2(wgs84_dimensions.max).ceil - Math::log2(Kmz::TILE_SIZE).to_i
       png_path = yield(ppi: ppi)
 
       Dir.mktmppath do |temp_dir|
+        log_update "kmz: resizing image pyramid"
         pyramid = (0..max_zoom).map do |zoom|
           resolution = degree_resolution * 2**(max_zoom - zoom)
-          degrees_per_tile = resolution * Kmz::TILE_SIZE
-
           tif_path = temp_dir / "#{name}.kmz.zoom.#{zoom}.tif"
+          next zoom, resolution, tif_path
+        end.inject(ThreadPool.new, &:<<).each do |zoom, resolution, tif_path|
           OS.gdalwarp "-t_srs", "EPSG:4326", "-tr", resolution, resolution, "-r", "bilinear", "-dstalpha", png_path, tif_path
-
+        end.map do |zoom, resolution, tif_path|
+          degrees_per_tile = resolution * Kmz::TILE_SIZE
           corners = JSON.parse(OS.gdalinfo "-json", tif_path)["cornerCoordinates"]
           top_left = corners["upperLeft"]
+
           counts = corners.values.transpose.map(&:minmax).map do |min, max|
             (max - min) / degrees_per_tile
           end.map(&:ceil)
@@ -76,9 +83,8 @@ module NSWTopo
             tile_bounds.each.with_index.entries
           end.inject(:product).map(&:transpose).map(&:reverse).to_h
 
-          log_update "kmz: resizing image pyramid: %i%%" % (100 * (2**(zoom + 1) - 1) / (2**(max_zoom + 1) - 1))
-          { zoom => [indices_bounds, tif_path] }
-        end.inject({}, &:merge)
+          next zoom, [indices_bounds, tif_path]
+        end.to_h
 
         kmz_dir = temp_dir.join("#{name}.kmz").tap(&:mkpath)
         pyramid.flat_map do |zoom, (indices_bounds, tif_path)|
@@ -117,9 +123,9 @@ module NSWTopo
           end
         end.tap do |tiles|
           log_update "kmz: creating %i tiles" % tiles.length
-        end.each.concurrently do |args|
+        end.inject(ThreadPool.new, &:<<).each do |*args|
           OS.gdal_translate "--config", "GDAL_PAM_ENABLED", "NO", *args
-        end.map(&:last).each.concurrent_groups do |tile_png_paths|
+        end.map(&:last).inject(ThreadPool.new, &:<<).in_groups do |*tile_png_paths|
           dither *tile_png_paths
         rescue Dither::Missing
         end
@@ -129,7 +135,7 @@ module NSWTopo
         xml.add_element("kml", "xmlns" => "http://earth.google.com/kml/2.1").tap do |kml|
           kml.add_element("Document").tap do |document|
             document.add_element("LookAt").tap do |look_at|
-              extents = @dimensions.times(@scale / 1000.0)
+              extents = @dimensions.map { |dimension| dimension * @scale / 1000.0 }
               range_x = extents.first / 2.0 / Math::tan(Kmz::FOV) / Math::cos(Kmz::TILT)
               range_y = extents.last / Math::cos(Kmz::FOV - Kmz::TILT) / 2 / (Math::tan(Kmz::FOV - Kmz::TILT) + Math::sin(Kmz::TILT))
               names_values = [%w[longitude latitude], @centre].transpose

data/lib/nswtopo/formats/mbtiles.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   module Formats
+    using Helpers
     def render_mbtiles(mbtiles_path, name:, **options, &block)
       wgs84_bounds = @cutline.reproject_to_wgs84.bounds
       sql = <<~SQL

data/lib/nswtopo/formats/pdf.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   module Formats
+    using Helpers
     def render_pdf(pdf_path, ppi: nil, background:, **options)
       if ppi
         OS.gdal_translate "-of", "PDF", "-co", "DPI=#{ppi}", "-co", "MARGIN=0", "-co", "CREATOR=nswtopo", "-co", "GEO_ENCODING=ISO32000", yield(ppi: ppi), pdf_path
@@ -86,14 +87,14 @@ module NSWTopo
           log_update "chrome: rendering PDF"
           Chrome.with_browser("file://#{svg_path}") do |browser|
             browser.print_to_pdf(pdf_path) do |doc|
-              bbox = [0, 0, *dimensions.times(72/25.4)]
+              bbox = [0, 0, dimensions[0] * 72 / 25.4, dimensions[1] * 72 / 25.4]
               bounds = cutline.coordinates[0][...-1].map do |coords|
                 coords.zip(dimensions).map { |coord, dimension| coord / dimension }
               end.flatten
               lpts = [0, 0].zip(    [1, 1]).inject(&:product).values_at(0,1,3,2).flatten
               gpts = [0, 0].zip(dimensions).inject(&:product).values_at(0,1,3,2).then do |corners|
-                # corners.map(&:reverse) # ISO 32000-2 specifies this, but not observed in practice
-                GeoJSON.multipoint(corners, projection: projection).reproject_to_wgs84.coordinates.map(&:reverse)
+                # ISO 32000-2 specifies projected coordinates instead of WGS84, but not observed in practice
+                GeoJSON.multipoint(corners, projection: projection).reproject_to_wgs84.coordinates.map(&:to_a).map(&:reverse)
               end.flatten
               pcsm = [25.4/72, 0, 0, 0, 25.4/72, 0, 0, 0, 1, 0, 0, 0]
 

data/lib/nswtopo/formats/svg.rb

@@ -17,14 +17,6 @@ module NSWTopo
   end
 
   module Formats
-    def neatline_path_data
-      @neatline.coordinates.map do |ring|
-        ring.map do |point|
-          point.join(" ")
-        end.join(" L ").prepend("M ").concat(" Z")
-      end.join(" ")
-    end
-
     def render_svg(svg_path, background:, **options)
       if uptodate?("map.svg", "map.yml")
         log_update "nswtopo: reading existing map SVG"
@@ -63,7 +55,7 @@ module NSWTopo
         # add defs for map filters and masks
         defs = svg.add_element("defs", "id" => "map.defs")
         defs.add_element("rect", "id" => "map.rect", "width" => width, "height" => height)
-        defs.add_element("path", "id" => "map.neatline", "d" => neatline_path_data)
+        defs.add_element("path", "id" => "map.neatline", "d" => @neatline.svg_path_data)
         defs.add_element("clipPath", "id" => "map.clip").add_element("use", "href" => "#map.neatline")
 
         # add a filter converting alpha channel to cutout mask
@@ -78,15 +70,15 @@ module NSWTopo
             layer.empty?
           end.each do |layer|
             next if Config["labelling"] == false
-            labels.add layer if Vector === layer
+            labels.add layer if VectorRender === layer
           end.push(labels).each.with_object [[], []] do |layer, (cutouts, knockouts)|
             log_update "compositing: #{layer.name}"
             new_knockouts, knockout = [], "map.mask.knockout.#{knockouts.length+1}"
             layer.render(cutouts: cutouts, knockout: knockout) do |object|
               case object
-              when Labels::Barrier then labels << object
-              when Vector::Cutout then cutouts << object
-              when Vector::Knockout then new_knockouts << object
+              when Labels::ConvexHulls then labels << object
+              when VectorRender::Cutout then cutouts << object
+              when VectorRender::Knockout then new_knockouts << object
               when REXML::Element
                 object.attributes["mask"] ||= "url(#map.mask.knockout.#{knockouts.length})" unless "defs" == object.name
                 yielder << object

data/lib/nswtopo/formats/svgz.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   module Formats
+    using Helpers
     def render_svgz(svgz_path, background:, **options)
       Dir.mktmppath do |temp_dir|
         svg_path = temp_dir / "svgz-map.svg"

data/lib/nswtopo/formats/zip.rb

@@ -1,5 +1,6 @@
 module NSWTopo
   module Formats
+    using Helpers
     def render_zip(zip_path, name:, ppi: PPI, **options)
       Dir.mktmppath do |temp_dir|
         zip_dir = temp_dir.join("zip").tap(&:mkpath)
@@ -8,7 +9,7 @@ module NSWTopo
 
         2.downto(0).map.with_index do |level, index|
           geo_transform = geotransform(ppi: ppi / 2**index)
-          outsize = (@dimensions / geo_transform[1]).map(&:ceil)
+          outsize = @dimensions.map { |dimension| (dimension / geo_transform[1]).ceil }
           case index
           when 0
             thumb_size = outsize.inject(&:<) ? [0, 64] : [64, 0]
@@ -22,7 +23,7 @@ module NSWTopo
           end
           img_path = index.zero? ? png_path : temp_dir / "map.#{level}.png"
           next level, outsize, img_path
-        end.each.concurrently do |level, outsize, img_path|
+        end.inject(ThreadPool.new, &:<<).each do |level, outsize, img_path|
           OS.gdal_translate *%w[-r bicubic -outsize], *outsize, png_path, img_path unless img_path.exist?
         end.flat_map do |level, outsize, img_path|
           outsize.map do |px|
@@ -34,11 +35,11 @@ module NSWTopo
           end
         end.tap do |tiles|
           log_update "zip: creating %i tiles" % tiles.length
-        end.each.concurrently do |args|
+        end.inject(ThreadPool.new, &:<<).each do |*args|
           OS.gdal_translate *args
         end.map(&:last).tap do |tile_paths|
           log_update "zip: optimising %i tiles" % tile_paths.length
-        end.each.concurrent_groups do |tile_paths|
+        end.inject(ThreadPool.new, &:<<).in_groups do |*tile_paths|
           dither *tile_paths
         rescue Dither::Missing
         end

data/lib/nswtopo/formats.rb

@@ -8,10 +8,13 @@ require_relative 'formats/svgz'
 
 module NSWTopo
   module Formats
+    using Helpers
     include Log
+
     PPI = 300
     TILE = 1500
-    ARGS = %w[--force-gpu-mem-available-mb=4096]
+    CHROME_ARGS = %w[--force-gpu-mem-available-mb=4096]
+    CHROME_INSTANCES = (ThreadPool::CORES / 4).clamp(1, 6)
 
     def self.extensions
       instance_methods.grep(/^render_([a-z]+)/) { $1 }
@@ -69,48 +72,44 @@ module NSWTopo
         end
 
         viewport_size = [TILE * mm_per_px] * 2
-        raster_size = (@dimensions / mm_per_px).map(&:ceil)
+        raster_size = @dimensions.map { |dimension| (dimension / mm_per_px).ceil }
         megapixels = raster_size.inject(&:*) / 1024.0 / 1024.0
 
         raster_info = "%i×%i (%.1fMpx) map raster at %s" % [*raster_size, megapixels, ppi_info]
-        chrome_message = "chrome: creating #{raster_info}"
-        log_update chrome_message
+        log_update "chrome: creating #{raster_info}"
 
-        NSWTopo::Chrome.with_browser "file://#{svg_path}", width: TILE, height: TILE, args: ARGS do |browser|
-          svg = browser.query_selector "svg"
-          svg[:width], svg[:height] = nil, nil
-          svg[:viewBox].split.map(&:to_f).last(2).map do |mm|
-            (0...(mm / mm_per_px).ceil).step(TILE).map do |px|
-              [px, px * mm_per_px]
+        raster_size.map do |px|
+          (0...px).step(TILE).map do |px|
+            [px, px * mm_per_px]
+          end
+        end.inject(&:product).map(&:transpose).map do |raster_offset, viewport_offset|
+          next raster_offset, viewport_offset, temp_dir.join("tile.%i.%i.png" % raster_offset)
+        end.inject(ThreadPool.new(CHROME_INSTANCES), &:<<).in_groups do |*grid|
+          NSWTopo::Chrome.with_browser "file://#{svg_path}", width: TILE, height: TILE, args: CHROME_ARGS do |browser|
+            svg = browser.query_selector "svg"
+            svg[:width], svg[:height] = nil, nil
+            grid.each do |raster_offset, viewport_offset, tile_path|
+              svg[:viewBox] = [*viewport_offset, *viewport_size].join(?\s)
+              browser.screenshot tile_path
             end
-          end.inject(&:product).map(&:transpose).tap do |grid|
-            chrome_message += " (tile %i of #{grid.size})"
-          end.map.with_index do |(raster_offset, viewport_offset), index|
-            log_update chrome_message % [index + 1]
-
-            tile_path = temp_dir.join("tile.%i.%i.png" % raster_offset)
-            viewbox = [*viewport_offset, *viewport_size].join(?\s)
-
-            svg[:viewBox] = viewbox
-            browser.screenshot tile_path
-
-            REXML::Document.new(OS.gdal_translate "-of", "VRT", tile_path, "/vsistdout/").tap do |vrt|
-              vrt.elements.each("VRTDataset/VRTRasterBand/SimpleSource/DstRect") do |dst_rect|
-                dst_rect.add_attributes "xOff" => raster_offset[0], "yOff" => raster_offset[1]
-              end
+          end
+        end.map do |raster_offset, viewport_offset, tile_path|
+          REXML::Document.new(OS.gdal_translate "-of", "VRT", tile_path, "/vsistdout/").tap do |vrt|
+            vrt.elements.each("VRTDataset/VRTRasterBand/SimpleSource/DstRect") do |dst_rect|
+              dst_rect.add_attributes "xOff" => raster_offset[0], "yOff" => raster_offset[1]
             end
-          end.inject do |vrt, tile_vrt|
-            vrt.elements["VRTDataset/VRTRasterBand[@band='1']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='1']/SimpleSource"]
-            vrt.elements["VRTDataset/VRTRasterBand[@band='2']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='2']/SimpleSource"]
-            vrt.elements["VRTDataset/VRTRasterBand[@band='3']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='3']/SimpleSource"]
-            vrt.elements["VRTDataset/VRTRasterBand[@band='4']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='4']/SimpleSource"]
-            vrt
-          end.tap do |vrt|
-            vrt.elements.each("VRTDataset/VRTRasterBand/@blockYSize", &:remove)
-            vrt.elements.each("VRTDataset/Metadata", &:remove)
-            vrt.elements["VRTDataset"].add_attributes "rasterXSize" => raster_size[0], "rasterYSize" => raster_size[1]
-            File.write vrt_path, vrt
           end
+        end.inject do |vrt, tile_vrt|
+          vrt.elements["VRTDataset/VRTRasterBand[@band='1']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='1']/SimpleSource"]
+          vrt.elements["VRTDataset/VRTRasterBand[@band='2']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='2']/SimpleSource"]
+          vrt.elements["VRTDataset/VRTRasterBand[@band='3']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='3']/SimpleSource"]
+          vrt.elements["VRTDataset/VRTRasterBand[@band='4']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='4']/SimpleSource"]
+          vrt
+        end.tap do |vrt|
+          vrt.elements.each("VRTDataset/VRTRasterBand/@blockYSize", &:remove)
+          vrt.elements.each("VRTDataset/Metadata", &:remove)
+          vrt.elements["VRTDataset"].add_attributes "rasterXSize" => raster_size[0], "rasterYSize" => raster_size[1]
+          File.write vrt_path, vrt
         end
 
         log_update "nswtopo: finalising #{raster_info}"

data/lib/nswtopo/geometry/r_tree.rb

@@ -1,46 +1,47 @@
 class RTree
+  using Helpers
+
   def initialize(nodes, bounds, object = nil)
     @nodes, @bounds, @object = nodes, bounds, object
   end
 
+  attr_reader :bounds
+
   def overlaps?(bounds, buffer)
     return false if @bounds.empty?
     return true unless bounds
-    bounds.zip(@bounds).all? do |bound1, bound2|
-      bound1.zip(bound2.rotate).each.with_index.all? do |limits, index|
-        limits.rotate(index).inject(&:-) <= buffer
-      end
+    bounds.zip(@bounds).all? do |(min1, max1), (min2, max2)|
+      max1 + buffer >= min2 && max2 + buffer >= min1
     end
   end
 
-  def self.load(bounds_objects, &block)
-    case
-    when block_given? then load bounds_objects.map(&block).zip(bounds_objects)
-    when bounds_objects.one? then RTree.new [], *bounds_objects.first
-    else
-      nodes = bounds_objects.sort_by do |bounds, object|
-        bounds[0].inject(&:+)
-      end.in_two.map do |bounds_objects|
-        bounds_objects.sort_by do |bounds, object|
-          bounds[1].inject(&:+)
-        end.in_two.map do |bounds_objects|
-          load bounds_objects
-        end
-      end.flatten
-      RTree.new nodes, bounds_objects.map(&:first).transpose.map(&:flatten).map(&:minmax)
+  def self.load(objects, &bounds)
+    load! objects.map(&bounds).zip(objects)
+  end
+
+  def self.load!(bounds_objects, range = 0...bounds_objects.length)
+    return RTree.new([], *bounds_objects[range.begin]) if range.one?
+    bounds_objects.median_partition!(range) do |bounds, object|
+      bounds[0].sum
+    end.flat_map do |range|
+      bounds_objects.median_partition!(range) do |bounds, object|
+        bounds[1].sum
+      end
+    end.filter_map do |range|
+      load!(bounds_objects, range) if range.any?
+    end.then do |nodes|
+      RTree.new nodes, nodes.map(&:bounds).transpose.map(&:flatten).map(&:minmax)
     end
   end
 
-  def search(bounds, buffer: 0, searched: Set.new)
+  def search(bounds, buffer = 0)
     Enumerator.new do |yielder|
-      next if searched.include? self
       if overlaps? bounds, buffer
         @nodes.each do |node|
-          node.search(bounds, buffer: buffer, searched: searched).inject(yielder, &:<<)
+          node.search(bounds, buffer).each(&yielder)
         end
         yielder << @object if @nodes.empty?
       end
-      searched << self
     end
   end
 

data/lib/nswtopo/geometry/straight_skeleton/node.rb

@@ -39,11 +39,11 @@ module StraightSkeleton
     def project(travel)
       det = normals.inject(&:cross) if normals.all?
       case
-      when det && det.nonzero?
+      when det&.nonzero?
         x = normals.map { |normal| travel - @travel + normal.dot(point) }
-        [normals[1][1] * x[0] - normals[0][1] * x[1], normals[0][0] * x[1] - normals[1][0] * x[0]] / det
-      when normals[0] then normals[0].times(travel - @travel).plus(point)
-      when normals[1] then normals[1].times(travel - @travel).plus(point)
+        (normals[0].perp * x[1] - normals[1].perp * x[0]) / det
+      when normals[0] then normals[0] * (travel - @travel) + point
+      when normals[1] then normals[1] * (travel - @travel) + point
       end
     end
   end