nswtopo 3.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90485c22ed73dd281bbb6abb7dafd9ec919edda7065dd7106b0acd12485acf3
-  data.tar.gz: fc3bae27f7d28243a3e9e27e56c28c8c0a724ea92237c018e4b161c9ad1ee74a
+  metadata.gz: 8f6740cf4e3532418e42aff410453d38a26cbdd2cb087a7ee7d753ca6d252d13
+  data.tar.gz: 6968cbfab11ce7d74f4d75ad53a562d89730a8551ae6baea6c8ea6360a010dc2
 SHA512:
-  metadata.gz: 70779d0482c7d5350f65af71faa1503f3f290125e38bbe16e9017c10332da375e763ac4583907f43e741b612f928563379c32b7ec38652b22ffe2d2d34827519
-  data.tar.gz: d67a0b8e445cfec80c7ccae5d3df98983ec82b5533188e07e232f8dc41f825d70cc98026b5bb566127256eb22d4721e0aa1f697cccd80f98a85ee6cea8fdb006
+  metadata.gz: f250d4a093f83d06c9b606c012a05e35739e6fca2805a0abe95c2129a7bffd0edb530c60d3262ca5716e32bb7d2d7a69e6e4e27756e2f81ce49ba0f9ca34baff
+  data.tar.gz: 20b7ac67eee937b5c273c17029ce441e8912dddd2ad75f3ea58ead8ed54b132f2466a15ac0e2f68d3e38a26de139cd5cd1106478db2d0735b9d852b5c3404fc5

data/bin/nswtopo

@@ -41,8 +41,8 @@ begin
     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
-    log_abort "GDAL 3.4 or greater required"
+  when (GDAL_VERSION.split(/\D+/).take(3).map(&:to_i) <=> [3,8]) < 0
+    log_abort "GDAL 3.8 or greater required"
   end
 
   digits = '\d+(?:_\d+)*'
@@ -220,6 +220,7 @@ 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'"

data/lib/nswtopo/commands/scrape.rb

@@ -29,7 +29,7 @@ module NSWTopo
     queue = Queue.new
     thread = Thread.new do
       while page = queue.pop
-        *, status = Open3.capture3 *%W[ogr2ogr #{path} /vsistdin/], *flags, *format_flags, stdin_data: page.to_json
+        *, status = Open3.capture3 *%W[ogr2ogr #{path} /vsistdin?buffer_limit=-1], *flags, *format_flags, stdin_data: page.to_json
         format_flags = %w[-update -append]
         queue.close unless status.success?
       end

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

data/lib/nswtopo/formats.rb

@@ -78,8 +78,8 @@ module NSWTopo
         raster_info = "%i×%i (%.1fMpx) map raster at %s" % [*raster_size, megapixels, ppi_info]
         log_update "chrome: creating #{raster_info}"
 
-        REXML::Document.new(svg_path.read).elements["svg/@viewBox"].value.split.map(&:to_f).last(2).map do |mm|
-          (0...(mm / mm_per_px).ceil).step(TILE).map do |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|

data/lib/nswtopo/gis/dem.rb

@@ -30,7 +30,7 @@ module NSWTopo
 
         indexed_dem_path = temp_dir / "dem.#{index}.tif"
         OS.gdalbuildvrt "-overwrite", "-allow_projection_difference", "-a_srs", projection, "-input_file_list", txt_path, vrt_path
-        OS.gdalwarp "-t_srs", @map.projection, "-tr", @mm_per_px, @mm_per_px, "-r", "bilinear", "-cutline", "GeoJSON:/vsistdin/", "-crop_to_cutline", vrt_path, indexed_dem_path do |stdin|
+        OS.gdalwarp "-t_srs", @map.projection, "-tr", @mm_per_px, @mm_per_px, "-r", "bilinear", "-cutline", "GeoJSON:/vsistdin?buffer_limit=-1", "-crop_to_cutline", vrt_path, indexed_dem_path do |stdin|
           stdin.puts cutline.to_json
         end
         indexed_dem_path
@@ -64,7 +64,7 @@ module NSWTopo
       end
 
       log_update "%s: smoothing DEM raster" % @name
-      OS.gdal_translate "/vsistdin/", blur_path do |stdin|
+      OS.gdal_translate "/vsistdin?buffer_limit=-1", blur_path do |stdin|
         stdin.write xml
       end
     end

data/lib/nswtopo/gis/geojson/collection.rb

@@ -47,7 +47,7 @@ module NSWTopo
 
       def reproject_to(projection)
         return self if self.projection == projection
-        json = OS.ogr2ogr "-t_srs", projection, "-f", "GeoJSON", "-lco", "RFC7946=NO", "/vsistdout/", "GeoJSON:/vsistdin/" do |stdin|
+        json = OS.ogr2ogr "-t_srs", projection, "-f", "GeoJSON", "-lco", "RFC7946=NO", "/vsistdout/", "GeoJSON:/vsistdin?buffer_limit=-1" do |stdin|
           stdin.puts to_json
         end
         Collection.load json, projection: projection
@@ -67,7 +67,7 @@ module NSWTopo
       end
 
       extend Forwardable
-      delegate %i[coordinates properties wkt area] => :first
+      delegate %i[coordinates properties wkt area svg_path_data] => :first
       delegate %i[length] => :@features
 
       def to_json(**extras)
@@ -83,7 +83,7 @@ module NSWTopo
       end
 
       def with_sql(sql, name: @name)
-        json = OS.ogr2ogr *%w[-f GeoJSON -lco RFC7946=NO /vsistdout/ GeoJSON:/vsistdin/ -dialect SQLite -sql], sql do |stdin|
+        json = OS.ogr2ogr *%w[-f GeoJSON -lco RFC7946=NO /vsistdout/ GeoJSON:/vsistdin?buffer_limit=-1 -dialect SQLite -sql], sql do |stdin|
           stdin.puts to_json
         end
         Collection.load(json, projection: @projection).with_name(name)
@@ -123,7 +123,7 @@ module NSWTopo
       end
 
       def clip(polygon)
-        OS.ogr2ogr "-f", "GeoJSON", "-lco", "RFC7946=NO", "-clipsrc", polygon.wkt, "/vsistdout/", "GeoJSON:/vsistdin/" do |stdin|
+        OS.ogr2ogr "-f", "GeoJSON", "-lco", "RFC7946=NO", "-clipsrc", polygon.wkt, "/vsistdout/", "GeoJSON:/vsistdin?buffer_limit=-1" do |stdin|
           stdin.puts to_json
         end.then do |json|
           Collection.load json, projection: @projection

data/lib/nswtopo/layer/arcgis_raster.rb

@@ -26,17 +26,15 @@ module NSWTopo
       end || lods.last
       tile_level, tile_resolution = lod.values_at "level", "resolution"
 
-      target_bbox.coordinates.first.map do |corner|
-        corner - origin
-      end.transpose.map(&:minmax).zip(tile_sizes).map do |bound, tile_size|
-        bound / tile_resolution / tile_size
+      target_bbox.bounds.zip(origin, tile_sizes).map do |(min, max), origin, tile_size|
+        [(min - origin) / tile_resolution / tile_size, (max - origin) / tile_resolution / tile_size]
       end.map do |min, max|
         (min.floor..max.ceil).each_cons(2).to_a
       end.inject(&:product).inject(GeoJSON::Collection.new(projection: service.projection)) do |tiles, (cols, rows)|
         [cols, rows].zip(tile_sizes).map do |indices, tile_size|
           indices.map { |index| index * tile_size * tile_resolution }
         end.transpose.map do |corner|
-          corner + origin
+          corner.zip(origin).map(&:sum)
         end.transpose.then do |bounds|
           ring = bounds.inject(&:product).values_at(0,2,3,1,0)
           ullr = bounds.inject(&:product).values_at(1,2).flatten

data/lib/nswtopo/layer/contour.rb

@@ -42,7 +42,7 @@ module NSWTopo
     end
 
     def check_geos!
-      json = OS.ogr2ogr "-dialect", "SQLite", "-sql", "SELECT geos_version() AS version", "-f", "GeoJSON", "-lco", "RFC7946=NO", "/vsistdout/", "/vsistdin/" do |stdin|
+      json = OS.ogr2ogr "-dialect", "SQLite", "-sql", "SELECT geos_version() AS version", "-f", "GeoJSON", "-lco", "RFC7946=NO", "/vsistdout/", "GeoJSON:/vsistdin?buffer_limit=-1" do |stdin|
         stdin.write GeoJSON::Collection.new.to_json
       end
       raise unless version = JSON.parse(json).dig("features", 0, "properties", "version")
@@ -107,7 +107,7 @@ module NSWTopo
         end
 
         contours.each_slice(100).inject(nil) do |update, features|
-          OS.ogr2ogr "-a_srs", @map.projection, "-nln", "contour", *update, "-simplify", @simplify, *db_flags, db_path, "GeoJSON:/vsistdin/" do |stdin|
+          OS.ogr2ogr "-a_srs", @map.projection, "-nln", "contour", *update, "-simplify", @simplify, *db_flags, db_path, "GeoJSON:/vsistdin?buffer_limit=-1" do |stdin|
             stdin.write contours.with_features(features).to_json
           end
           %w[-update -append]

data/lib/nswtopo/layer/raster.rb

@@ -3,7 +3,7 @@ module NSWTopo
     using Helpers
     def create
       Dir.mktmppath do |temp_dir|
-        args = ["-t_srs", @map.projection, "-r", "bilinear", "-cutline", "GeoJSON:/vsistdin/", "-te", *@map.te, "-of", "GTiff", "-co", "TILED=YES"]
+        args = ["-t_srs", @map.projection, "-r", "bilinear", "-cutline", "GeoJSON:/vsistdin?buffer_limit=-1", "-te", *@map.te, "-of", "GTiff", "-co", "TILED=YES"]
         args += ["-tr", @mm_per_px, @mm_per_px] if Numeric === @mm_per_px
         OS.gdalwarp *args, get_raster(temp_dir), "/vsistdout/" do |stdin|
           stdin.puts @map.cutline.to_json
@@ -31,7 +31,7 @@ module NSWTopo
         end.then do |(width, height), (_, mm_per_px, *)|
           image.add_attributes "width" => width, "height" => height, "transform" => "scale(#{mm_per_px})"
         end
-        OS.gdal_translate "-of", "PNG", "-co", "ZLEVEL=9", "/vsistdin/", "/vsistdout/" do |stdin|
+        OS.gdal_translate "-of", "PNG", "-co", "ZLEVEL=9", "/vsistdin?buffer_limit=-1", "/vsistdout/" do |stdin|
           stdin.binmode.write tif
         end.then do |png|
           image.add_attributes "href" => "data:image/png;base64,#{Base64.encode64 png}", "image-rendering" => "optimizeQuality"
@@ -40,7 +40,7 @@ module NSWTopo
     end
 
     def to_s
-      OS.gdalinfo "-json", "/vsistdin/" do |stdin|
+      OS.gdalinfo "-json", "/vsistdin?buffer_limit=-1" do |stdin|
         stdin.binmode.write @map.read(filename)
       end.then do |json|
         JSON.parse(json).values_at "size", "geoTransform"

data/lib/nswtopo/layer/relief.rb

@@ -50,7 +50,7 @@ module NSWTopo
         end.inject(&:merge)
 
         log_update "%s: calculating DEM" % @name
-        OS.gdal_grid "-a", "linear:radius=0:nodata=-9999", "-zfield", "elevation", "-ot", "Float32", "-txe", *bounds[0], "-tye", *bounds[1], "-outsize", *outsize, "/vsistdin/", dem_path do |stdin|
+        OS.gdal_grid "-a", "linear:radius=0:nodata=-9999", "-zfield", "elevation", "-ot", "Float32", "-txe", *bounds[0], "-tye", *bounds[1], "-outsize", *outsize, "GeoJSON:/vsistdin?buffer_limit=-1", dem_path do |stdin|
           stdin.puts collection.to_json
         end
 
@@ -64,7 +64,7 @@ module NSWTopo
       begin
         log_update "%s: generating shaded relief" % @name
         OS.gdaldem *%W[hillshade -q -compute_edges -s #{@map.scale / 1000.0} -z #{@factor} -az #{@azimuth} -#{@method}], dem_path, raw_path
-        OS.gdalwarp "-t_srs", @map.projection, "-cutline", "GeoJSON:/vsistdin/", "-crop_to_cutline", raw_path, tif_path do |stdin|
+        OS.gdalwarp "-t_srs", @map.projection, "-cutline", "GeoJSON:/vsistdin?buffer_limit=-1", "-crop_to_cutline", raw_path, tif_path do |stdin|
           stdin.puts cutline.to_json
         end
       rescue OS::Error

data/lib/nswtopo/layer/vegetation.rb

@@ -64,7 +64,7 @@ module NSWTopo
         tif_path = temp_dir / "source.tif"
         vrt_path = temp_dir / "source.vrt"
 
-        args = ["-t_srs", @map.projection, "-r", "nearest", "-cutline", "GeoJSON:/vsistdin/", "-crop_to_cutline"]
+        args = ["-t_srs", @map.projection, "-r", "nearest", "-cutline", "GeoJSON:/vsistdin?buffer_limit=-1", "-crop_to_cutline"]
         args += ["-tr", @mm_per_px, @mm_per_px] if @mm_per_px
         OS.gdalwarp *args, *vrt_paths, tif_path do |stdin|
           stdin.puts @map.cutline.to_json

data/lib/nswtopo/map.rb

@@ -16,12 +16,18 @@ module NSWTopo
     extend Forwardable
     delegate %i[write mtime read uptodate?] => :@archive
 
-    def self.init(archive, scale: 25000, rotation: 0.0, bounds: nil, coords: nil, dimensions: nil, margins: nil, **neatline_options)
+    def self.init(archive, scale: 25000, rotation: 0.0, bounds: nil, coords: nil, neatline: nil, dimensions: nil, margins: nil, **neatline_options)
       points = case
       when dimensions && margins
         raise "can't specify both margins and map dimensions"
+      when dimensions && neatline
+        raise "can't specify both neatline and map dimensions"
+      when bounds && neatline
+        raise "can't specify both bounds and neatline"
+      when coords && neatline
+        raise "can't specify both neatline and map coordinates"
       when coords && bounds
-        raise "can't specify both bounds file and map coordinates"
+        raise "can't specify both bounds and map coordinates"
       when coords
         GeoJSON.multipoint(coords)
       when bounds
@@ -29,6 +35,10 @@ module NSWTopo
           margins ||= [15, 15] unless dimensions || gps.polygons.any?
           raise "no features found in %s" % bounds if gps.none?
         end
+      when neatline
+        neatline = GPS.load(neatline)
+        raise "neatline must be a single polygon" unless neatline.polygon?
+        neatline
       else
         raise "no bounds file or map coordinates specified"
       end.dissolve_points
@@ -73,8 +83,12 @@ module NSWTopo
         raise "not enough information to calculate map size – check bounds file, or specify map dimensions or margins"
       end
 
-      ring = [0, 0].zip(dimensions).inject(&:product).values_at(0,2,3,1,0)
-      neatline = GeoJSON.polygon [ring], projection: projection, name: "neatline"
+      if neatline
+        neatline = neatline.reproject_to projection
+      else
+        ring = [0, 0].zip(dimensions).inject(&:product).values_at(0,2,3,1,0)
+        neatline = GeoJSON.polygon [ring], projection: projection, name: "neatline"
+      end
 
       neatline_options.each do |key, value|
         case key

data/lib/nswtopo/version.rb

@@ -24,6 +24,6 @@ module NSWTopo
     end
   end
 
-  VERSION     = Version["nswtopo 3.1"]
+  VERSION     = Version["nswtopo 3.1.2"]
   MIN_VERSION = Version["nswtopo 3.0"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nswtopo
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: 3.1.2
 platform: ruby
 authors:
 - Matthew Hollingworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-11-25 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- GDAL >= v3.4
+- GDAL >= v3.8
 - Google Chrome >= v112
 rubygems_version: 3.3.26
 signing_key: