nswtopo 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be473c574c562b474c1d4ef9b3a1dfc2c697993b1034990375f1405ebfabf1cb
-  data.tar.gz: 7b230fbd3f2e5164bb6452c10a15cd38424dbeea29c42947f6e36150a5784570
+  metadata.gz: 95688c5f09f158d8a3f31f800d05dbf68eb11b01f387c66d22a51d4cfdfd43df
+  data.tar.gz: e545a460b94c4836da02ebcec3af19f97bb2f8e3f9eae0ec811458716ec16249
 SHA512:
-  metadata.gz: a925a874ddb9802d539712371e6dd06e28cb4a3fbdcd22d6b96a274131ae3a89244180d926d9f10a785db14ca98e0fdac4842a9766dad24475f3ff9c878e3c68
-  data.tar.gz: 145391125d1035c7bc5dc3b127389acc846277435624e971dcc82033089d784f5f84c0617ff7cc2af35884d750858b13d433185c73acb0fdd0eb363af9077393
+  metadata.gz: b59a5be38b039fd42f105fb4d855805f070629ad665238db73f294cbfdb9c0cc19df5ae87bf3275f733db3974009598e9af1945eb0be8e92b54ad8c87cc7cf5e
+  data.tar.gz: f32a3ed4e30ee4e488a8953300dc84ab6bae3be7ab2d07b45625fe969b65ad12c87f9f96f277e627470424989d710f7fa0d6a1b793186494df1323a7ed3c9578

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+)*'
@@ -436,7 +436,7 @@ begin
     when "inspect"
       parser.banner = <<~EOF
         *nswtopo* *inspect* - inspect data from an ArcGIS REST endpoint or local data source
-          usage: _nswtopo_ inspect [~options~] <url-or-path>
+          usage: _nswtopo_ _inspect_ [~options~] <url-or-path>
       EOF
       parser.on "-l", "--layer      <layer>",       String,    "name of layer"
       parser.on "-i", "--id         <id>",          Integer,   "id number of layer"

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

@@ -98,12 +98,22 @@ module NSWTopo
             vrt.elements.each("VRTDataset/VRTRasterBand/SimpleSource/DstRect") do |dst_rect|
               dst_rect.add_attributes "xOff" => raster_offset[0], "yOff" => raster_offset[1]
             end
+            vrt.elements["VRTDataset/VRTRasterBand[@band='1']"].deep_clone.then do |band|
+              vrt.elements["VRTDataset"].add_element(band)
+              band.add_attribute("band", 4)
+              band.elements["ColorInterp"].text = "Alpha"
+              band.elements["SimpleSource"]
+            end.then do |source|
+              source.name = "ComplexSource"
+              source.add_element("ScaleRatio").add_text("0")
+              source.add_element("ScaleOffset").add_text("255")
+            end unless vrt.elements["VRTDataset/VRTRasterBand[@band='4']"]
           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.elements["VRTDataset/VRTRasterBand[@band='4']"].add_element tile_vrt.elements["VRTDataset/VRTRasterBand[@band='4']/*[self::SimpleSource|self::ComplexSource]"]
           vrt
         end.tap do |vrt|
           vrt.elements.each("VRTDataset/VRTRasterBand/@blockYSize", &:remove)

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
@@ -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/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/version.rb

@@ -24,6 +24,6 @@ module NSWTopo
     end
   end
 
-  VERSION     = Version["nswtopo 3.1.1"]
+  VERSION     = Version["nswtopo 3.1.3"]
   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.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Matthew Hollingworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2024-10-03 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: