nswtopo 3.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90485c22ed73dd281bbb6abb7dafd9ec919edda7065dd7106b0acd12485acf3
-  data.tar.gz: fc3bae27f7d28243a3e9e27e56c28c8c0a724ea92237c018e4b161c9ad1ee74a
+  metadata.gz: be473c574c562b474c1d4ef9b3a1dfc2c697993b1034990375f1405ebfabf1cb
+  data.tar.gz: 7b230fbd3f2e5164bb6452c10a15cd38424dbeea29c42947f6e36150a5784570
 SHA512:
-  metadata.gz: 70779d0482c7d5350f65af71faa1503f3f290125e38bbe16e9017c10332da375e763ac4583907f43e741b612f928563379c32b7ec38652b22ffe2d2d34827519
-  data.tar.gz: d67a0b8e445cfec80c7ccae5d3df98983ec82b5533188e07e232f8dc41f825d70cc98026b5bb566127256eb22d4721e0aa1f697cccd80f98a85ee6cea8fdb006
+  metadata.gz: a925a874ddb9802d539712371e6dd06e28cb4a3fbdcd22d6b96a274131ae3a89244180d926d9f10a785db14ca98e0fdac4842a9766dad24475f3ff9c878e3c68
+  data.tar.gz: 145391125d1035c7bc5dc3b127389acc846277435624e971dcc82033089d784f5f84c0617ff7cc2af35884d750858b13d433185c73acb0fdd0eb363af9077393

data/bin/nswtopo

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

@@ -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)

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/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.1"]
   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.1
 platform: ruby
 authors:
 - Matthew Hollingworth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email: