natour 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d45e360af42e65ff67db55ff6e9814013e0a884ceb5b601ceec10731312181
-  data.tar.gz: f495db38dbdef792422945c891ddf830850a812513663e6cffd72fd4757f1b97
+  metadata.gz: 59d15bbec4750fd92158c6cbff64a201bad92792600a03a0f430e0c77ddcbea0
+  data.tar.gz: 1b6dedc5f83f66173d77a176d2d20815b4055e2b93c98ecd6d6b26117219c03f
 SHA512:
-  metadata.gz: 2a520888a91305d5cd924d133d1356bc1021b0cf75c2ad7753e577e1a7455afbb610991c080a88ca5dc3e4c0bdc9895e36d518694a9e0b8faa6d27bfe0552ba8
-  data.tar.gz: eb6ca2cbc565dfd79e2ea06413a00a9362996cd45aca70b601e06fca58e6acae5d1bd47f2bbf0d8962f6b1a03922f3477446eca019d5648a1b4ad0334a509938
+  metadata.gz: 7dd61ac963164d480e626414bef161e1f1a702d26a2ff71e733a796610b18b7942a5f6ce400329a7c9b3f0566ea501d20f7926285d923d85a4eda4835331f14f
+  data.tar.gz: 1ad29625fc06e4f738c7e7127d3381aa701ec033618c9d2a5c1b7167b56b1890f3ba4c8035a8bfe4f6dba33ddf5a3d6b842f0650a1da22c19b04b149c51c5977

data/CHANGELOG.adoc

@@ -6,6 +6,21 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.9.0 - 2022-10-08
+
+=== Added
+
+- Support colors for GPS tracks, waypoints and routes (`natour map create` command only).
+
+=== Changed
+
+- Omit empty columns of species lists in AsciiDoc output.
+
+=== Fixed
+
+- Fix inconsistent handling of file errors in the command line interface.
+- Fix the creation of map images.
+
 == 0.8.0 - 2022-04-22
 
 === Added

data/README.adoc

@@ -119,6 +119,7 @@ The configuration is built by loading https://yaml.org/[YAML^] files in hierarch
     :out_dir: null
     :out_file: null
     :overwrite: false
+    :gps_colors: []
     :map_layers: []
     :image_size: [1200, 900]
 ----

data/bin/natour

@@ -35,7 +35,7 @@ class NatourCmd < Clamp::Command
           map_layers: map_layers || config[:map_layers],
           adoc_author: adoc_author || config[:adoc_author]
         )
-      rescue Errno::EEXIST, Errno::ENOENT, Errno::EACCES, Errno::EINVAL => e
+      rescue Errno::EEXIST, Errno::ENOENT, Errno::EACCES, Errno::EISDIR, Errno::EINVAL => e
         message, _, path = Natour::ErrnoUtils.split_message(e)
         abort("ERROR: #{message} '#{path}'")
       end
@@ -66,7 +66,7 @@ class NatourCmd < Clamp::Command
           draft_backend: draft_backend || config[:draft_backend],
           image_maxdim: image_maxdim || config[:image_maxdim]
         )
-      rescue Errno::EEXIST, Errno::ENOENT, Errno::EACCES, Errno::EISDIR => e
+      rescue Errno::EEXIST, Errno::ENOENT, Errno::EACCES, Errno::EISDIR, Errno::EINVAL => e
         message, _, path = Natour::ErrnoUtils.split_message(e)
         abort("ERROR: #{message} '#{path}'")
       end
@@ -86,6 +86,7 @@ class NatourCmd < Clamp::Command
       option(%w[-d --out-dir], 'DIR', 'Output directory')
       option(%w[-f --out-file], 'FILE', 'Output filename')
       option(%W[--\[no-\]overwrite], :flag, 'Overwrite existing files')
+      option(%w[--gps-colors], 'COLORS', 'Colors for elements from GPS files') { |s| s.split(',') }
       option(%w[--map-layers], 'LAYERS', 'Add additional layers to map images') { |s| s.split(',') }
       option(%w[--image-size], 'WIDTH,HEIGHT', 'Image size') do |s|
         s.split(',', 2).map { |v| Integer(v) }
@@ -101,11 +102,12 @@ class NatourCmd < Clamp::Command
             filename,
             overwrite: Natour::BooleanUtils.to_boolean(overwrite?, default_value: config[:overwrite]),
             gps_files: paths,
+            gps_colors: gps_colors || config[:gps_colors],
             map_layers: map_layers || config[:map_layers],
             image_size: image_size || config[:image_size]
           )
         end
-      rescue Errno::EEXIST, Errno::ENOENT, Errno::EACCES => e
+      rescue Errno::EEXIST, Errno::ENOENT, Errno::EACCES, Errno::EISDIR, Errno::EINVAL => e
         message, _, path = Natour::ErrnoUtils.split_message(e)
         abort("ERROR: #{message} '#{path}'")
       end
@@ -151,6 +153,7 @@ config = Natour::Config.load_file(
         out_dir: nil,
         out_file: nil,
         overwrite: false,
+        gps_colors: [],
         map_layers: [],
         image_size: [1200, 900]
       }

data/lib/natour/asciinurse.rb

@@ -97,14 +97,18 @@ module Natour
           OpenStruct.new(
             group: :plants,
             title: 'Pflanzenarten',
-            headers: ['Wissenschaftlicher Name', 'Deutscher Name'],
-            columns: %i[name name_de]
+            columns: [
+              OpenStruct.new(header: 'Wissenschaftlicher Name', accessor: :name),
+              OpenStruct.new(header: 'Deutscher Name', accessor: :name_de)
+            ]
           ),
           OpenStruct.new(
             group: :birds,
             title: 'Vogelarten',
-            headers: ['Deutscher Name', 'Wissenschaftlicher Name'],
-            columns: %i[name_de name]
+            columns: [
+              OpenStruct.new(header: 'Deutscher Name', accessor: :name_de),
+              OpenStruct.new(header: 'Wissenschaftlicher Name', accessor: :name)
+            ]
           )
         ].each do |info|
           group = groups.fetch(info.group, [])
@@ -115,13 +119,18 @@ module Natour
           group.each do |species_list|
             caption = '.Tabelle {counter:species_lists}'
             caption << ": #{species_list.description}" if species_list.description
+            columns = info.columns.select do |column|
+              species_list.any? { |species| !species.public_send(column.accessor).nil? }
+            end
+            cols = [1] + [5 * info.columns.size / columns.size] * columns.size
             doc << caption
-            doc << '[cols="1,5,5",options=header]'
+            doc << "[cols=\"#{cols.join(',')}\",options=header]"
             doc << '|==='
-            doc << "|Nr.|#{info.headers.join('|')}"
+            doc << "|Nr.|#{columns.map(&:header).join('|')}"
             species_list.each do |species|
               doc <<
-                "|{counter:species_list#{index}}|#{info.columns.map { |method| species.public_send(method) }.join('|')}"
+                "|{counter:species_list#{index}}|#{columns.map { |column| species.public_send(column.accessor) }
+                                                          .join('|')}"
             end
             doc << '|==='
             doc << ''