nswtopo 3.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 505b2d8c4c44965fcad1403d1c2a266f7ce22f64225e97d6be2e7b2057ad2791
-  data.tar.gz: 9ba473cddff584981acaee0efe47b8fe8095681792da886f08a3979e8f9807b4
+  metadata.gz: cbc36bc0fcdc3467aad475f9ff3757bab270bba4fe81e7bed3c34b0c34a3b4f2
+  data.tar.gz: fb02ea3f103222c9424bbe9f1c750caa608f73e4e5815687f40c1a383f6fa8d9
 SHA512:
-  metadata.gz: dfccb5d8112650a894378967d6d67fe42b5a303ce3140bfd6ced96ca74472f96df2303fe15d69b3da710277e62eba38e8307be374b4cef7e730253fce6c10f1e
-  data.tar.gz: b707d3f3a619f7001ea2f3a5dbcf8f0ac603ce080f49cd44b614b385bab8a080f922c629172cefb63b13ab1e27e79bb538a887abb88a56ea2648cb8950a69a10
+  metadata.gz: 06a794c2eaa6949d4754c62408d6d3358ee1d84c9dcfb10a2ab90ec9833b3916a84f5873f06657b5bca4e328765848d53ff1dafb150a58e42cd15085808e1e43
+  data.tar.gz: 83325ab407ea8a7fcc6675cfcb747a8d1f08932d228dbdcb18fa8dec48d328a38690dcbb0766be975f03d7b872caf6e60ef0706a5429713c8a86b09df16cecaa

data/lib/nswtopo/chrome.rb

@@ -177,9 +177,14 @@ module NSWTopo
       raise Error
     end
 
-    def print_to_pdf(pdf_path)
+    def print_to_pdf(pdf_path, &block)
       data = command("Page.printToPDF", timeout: nil, preferCSSPageSize: true).fetch("data")
-      pdf_path.binwrite Base64.decode64(data)
+      pdf = Base64.decode64 data
+      if defined? HexaPDF
+        HexaPDF::Document.new(io: StringIO.new(pdf)).tap(&block).write(pdf_path.to_s)
+      else
+        pdf_path.binwrite(pdf)
+      end
     rescue KeyError
       raise Error
     end

data/lib/nswtopo/formats/pdf.rb

@@ -10,7 +10,7 @@ module NSWTopo
 
           REXML::Document.new(svg_path.read).tap do |xml|
             xml.elements["svg"].tap do |svg|
-              style = "@media print { @page { margin: 0; size: %s %s; } }"
+              style = "@media print { @page { margin: 0 0 -1mm 0; size: %s %s; } }"
               svg.add_element("style").text = style % svg.attributes.values_at("width", "height")
             end
 
@@ -83,11 +83,40 @@ module NSWTopo
             svg_path.write xml
           end
 
-          FileUtils.rm pdf_path if pdf_path.exist?
           log_update "chrome: rendering PDF"
-
           Chrome.with_browser("file://#{svg_path}") do |browser|
-            browser.print_to_pdf pdf_path
+            browser.print_to_pdf(pdf_path) do |doc|
+              bbox = [0, 0, *dimensions.times(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)
+              end.flatten
+              pcsm = [25.4/72, 0, 0, 0, 25.4/72, 0, 0, 0, 1, 0, 0, 0]
+
+              doc.pages.first[:VP] = [doc.add({
+                Type: :Viewport,
+                BBox: bbox,
+                Measure: doc.add({
+                  Type: :Measure,
+                  Subtype: :GEO,
+                  Bounds: bounds,
+                  GCS: doc.add({
+                    Type: :PROJCS,
+                    WKT: projection.wkt2
+                  }),
+                  GPTS: gpts,
+                  LPTS: lpts,
+                  PCSM: pcsm
+                })
+              })]
+
+              doc.trailer.info[:Creator] = "nswtopo"
+              doc.version = "1.7"
+            end
           end
         end
       end

data/lib/nswtopo/map.rb

@@ -130,10 +130,12 @@ module NSWTopo
     def self.from_svg(archive, svg_path)
       xml = REXML::Document.new(svg_path.read)
 
-      creator_tool = xml.elements["svg/metadata/rdf:RDF/rdf:Description[@xmp:CreatorTool]/@xmp:CreatorTool"]&.value
-      version = Version[creator_tool]
-      raise "SVG nswtopo version too old: %s" % svg_path unless version >= MIN_VERSION
-      raise "SVG nswtopo version too new: %s" % svg_path unless version <= VERSION
+      unless false == Config["versioning"]
+        creator_tool = xml.elements["svg/metadata/rdf:RDF/rdf:Description[@xmp:CreatorTool]/@xmp:CreatorTool"]&.value
+        version = Version[creator_tool]
+        raise "SVG nswtopo version too old: %s" % svg_path unless version >= MIN_VERSION
+        raise "SVG nswtopo version too new: %s" % svg_path unless version <= VERSION
+      end
 
       /^0\s+0\s+(?<width>\S+)\s+(?<height>\S+)$/ =~ xml.elements["svg[@viewBox]/@viewBox"]&.value
        width && xml.elements["svg[ @width='#{ width}mm']"] || raise(Version::Error)

data/lib/nswtopo/version.rb

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

data/lib/nswtopo.rb

@@ -19,6 +19,10 @@ require 'forwardable'
 require 'rubygems/package'
 require 'zlib'
 require 'io/nonblock'
+begin
+  require 'hexapdf'
+rescue LoadError
+end
 
 require_relative 'nswtopo/helpers'
 require_relative 'nswtopo/avl_tree'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nswtopo
 version: !ruby/object:Gem::Version
-  version: '3.0'
+  version: 3.0.1
 platform: ruby
 authors:
 - Matthew Hollingworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2023-08-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email: