natour 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a465921bd4e696f168be735851b576e1ec95eca0396eb52581801a16d9c75e1
-  data.tar.gz: 5c0fd93836e21d57752a185842c17787894b8c56d1850564240a6f88b514dcb5
+  metadata.gz: eb00323054987bfbb4e15631640c781d2e44f1c1a86dae3d7fafca37ecdfe0d8
+  data.tar.gz: 99cb9c130f9aefaecb5c68684b1e52ccd12628ae2b1d0e4e316a485a304ce761
 SHA512:
-  metadata.gz: d39f3f80ab7bc2ee632d3458d623e8f7bb517c19b2f8c3d3fcc110c15ff8c09c646e52fb59623ca3be7c7f08877e527991c5f2774c41f1f17f4752d8b7a636ff
-  data.tar.gz: d20556324500e26c3d428c6925f0e5ceefad9dfd790f78083e25d38fe28e27756653f5eecb5f9545b978a36a28a761dd9d257fafa8ca1ff0c75b62d9d0670308
+  metadata.gz: 35670a2a3872135b9cad97eac2c27af4205aaea5cf1db6b38c8757589e281061ad6b22b3469e2c4ae0c350701541fdea92170d837ed4e931445f26d2f2bb7aa7
+  data.tar.gz: a784e70dba0803b538a58676f143e38f93b9d252d706ae470bb91bc90caef687c86464179ae2d53d20522595af02e0aadfb1cdc7b89b60f1d36449547e7b7e92

data/CHANGELOG.adoc

@@ -6,6 +6,26 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.2.0 - 2021-01-24
+
+=== Added
+
+- Add this gem's name to the footer of the PDF output
+- Support species lists from https://www.ornitho.ch/[ornitho.ch^] (KML format only)
+- Classify species lists by taxonomic groups (i.e. `SpeciesList.group`)
+
+=== Changed
+
+- Change `SpeciesList.name` to `SpeciesList.title`
+- Return an empty array from `SpeciesList.load_file` if the format is unknown
+- Change the format of the start time in the AsciiDoc output from _12:30_ to _12:30 Uhr_
+- Change the format of the duration in the AsciiDoc output from _1h30_ to _1:30 h_
+
+=== Fixed
+
+- Get the date from images even if the orientation tag is missing
+- Fix typo in help message
+
 == 0.1.0 - 2020-12-04
 
 === Added

data/bin/natour

@@ -27,9 +27,9 @@ option_parser = OptionParser.new do |opts|
   opts.separator(WordWrap.ww(
     'If PATH refers to a directory, one or more reports are created in ' \
     'AsciiDoc format. GPS tracks, images and species lists (Kosmos ' \
-    'Vogelführer, Flora Helvetica, Info Flora Online-Feldbuch) are ' \
-    'included. Images of the map section covered by the GPS tracks are also ' \
-    'created and included. If PATH refers to an AsciiDoc file, it is ' \
+    'Vogelführer, ornitho.ch, Flora Helvetica, Info Flora Online-Feldbuch) ' \
+    'are included. Images of the map section covered by the GPS tracks are ' \
+    'also created and included. If PATH refers to an AsciiDoc file, it is ' \
     'converted to PDF (or any other supported format).'
   ))
   opts.separator('')
@@ -49,7 +49,7 @@ option_parser = OptionParser.new do |opts|
   end
   opts.separator('')
   opts.separator('Creation:')
-  opts.on('--track-formats FORMATS', Array, 'GPS track formats (gpx, fit') do |value|
+  opts.on('--track-formats FORMATS', Array, 'GPS track formats (gpx, fit)') do |value|
     config['track-formats'] = value.map(&:to_sym)
   end
   opts.on('--[no-]map', 'Create map images') do |value|

data/lib/natour.rb

@@ -1,7 +1,7 @@
-require 'natour/cli/convert'
-require 'natour/cli/create'
 require 'natour/helpers/date_parser'
 require 'natour/helpers/suppress_output'
+require 'natour/convert'
+require 'natour/create'
 require 'natour/asciinurse'
 require 'natour/config'
 require 'natour/gps_track'

data/lib/natour/asciinurse.rb

@@ -51,8 +51,8 @@ module Natour
       doc << '[cols="h,3"]'
       doc << '|==='
       doc << "|Datum      |#{gps_track&.date&.strftime('%d.%m.%Y')}"
-      doc << "|Startzeit  |#{gps_track&.start_point&.time&.strftime('%H:%M')}"
-      doc << "|Dauer      |#{gps_track&.duration&.strftime('%thh%M')}"
+      doc << "|Startzeit  |#{gps_track&.start_point&.time&.strftime('%H:%M Uhr')}"
+      doc << "|Dauer      |#{gps_track&.duration&.strftime('%th:%M h')}"
       doc << "|Strecke    |#{distance.call(gps_track)}"
       doc << "|Aufstieg   |#{ascent.call(gps_track)}"
       doc << "|Abstieg    |#{descent.call(gps_track)}"
@@ -104,10 +104,9 @@ module Natour
         doc << ''
         species_lists.each.with_index(1) do |species_list, index|
           info = {
-            kosmos_vogelfuehrer: birds_info,
-            flora_helvetica: plants_info,
-            info_flora: plants_info
-          }[species_list.type]
+            birds: birds_info,
+            plants: plants_info
+          }[species_list.group]
           doc << "=== #{info.title}"
           doc << ''
           doc << '[cols="1,5,5",options=header]'

data/lib/natour/{cli/convert.rb → convert.rb}

@@ -13,7 +13,11 @@ module Natour
       filename,
       backend: backend,
       safe: :unsafe,
-      standalone: true
+      standalone: true,
+      attributes: {
+        'pdf-theme' => 'natour',
+        'pdf-themesdir' => "#{__dir__}/data/themes"
+      }
     )
 
     dir = Pathname(filename).dirname

data/lib/natour/data/themes/natour-theme.yml

@@ -0,0 +1,13 @@
+---
+extends: default
+footer:
+  recto:
+    left:
+      content: 'by natour'
+    right:
+      content: '{page-number}'
+  verso:
+    left:
+      content: $footer_recto_right_content
+    right:
+      content: $footer_recto_left_content

data/lib/natour/image.rb

@@ -11,15 +11,11 @@ module Natour
       image = Vips::Image.new_from_file(path)
       width, height = image.size
       @portrait = width < height
-      orientation = image.get('exif-ifd0-Orientation')
-      @portrait = orientation[/^(\d) \(/, 1].to_i.between?(5, 8)
-      date_time = image.get('exif-ifd0-DateTime')
-      @date_time = Timeliness.parse(
-        date_time[/^(.*?) \(/, 1],
-        format: 'yyyy:mm:dd hh:nn:ss'
-      )
-    rescue Vips::Error => e
-      raise unless e.to_s =~ /exif-ifd0-(Orientation|DateTime)/
+      get_field = ->(name) { image.get(name) if image.get_fields.include?(name) }
+      orientation = get_field.call('exif-ifd0-Orientation')
+      @portrait = orientation[/^(\d) \(/, 1].to_i.between?(5, 8) if orientation
+      date_time = get_field.call('exif-ifd0-DateTime')
+      @date_time = Timeliness.parse(date_time[/^(.*?) \(/, 1], format: 'yyyy:mm:dd hh:nn:ss') if date_time
     end
 
     def portrait?

data/lib/natour/map_geo_admin.rb

@@ -9,7 +9,7 @@ module Natour
   class MapGeoAdmin
     def initialize(port: 0)
       @doc_root = Dir.mktmpdir
-      FileUtils.cp_r("#{__dir__}/js", @doc_root)
+      FileUtils.cp_r("#{__dir__}/data/js", @doc_root)
       event = Concurrent::Event.new
       @server = WEBrick::HTTPServer.new(
         StartCallback: -> { event.set },

data/lib/natour/report.rb

@@ -38,7 +38,7 @@ module Natour
                          .map { |filename| Image.new(filename.to_s) }
                          .sort_by { |image| [image.date_time ? 0 : 1, image.date_time, image.path] }
         species_lists =
-          Pathname.glob('**/*.csv', File::FNM_CASEFOLD)
+          Pathname.glob('**/*.{csv,kml}', File::FNM_CASEFOLD)
                   .map { |filename| SpeciesList.load_file(filename.to_s) }
                   .flatten
                   .sort_by { |species_list| [species_list.type, species_list.date ? 0 : 1, species_list.date] }

data/lib/natour/species_list.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'nokogiri'
 require 'pathname'
 
 module Natour
@@ -6,26 +7,28 @@ module Natour
     attr_reader :path
     attr_reader :date
     attr_reader :type
-    attr_reader :name
+    attr_reader :group
+    attr_reader :title
     attr_reader :description
 
-    def initialize(path, date, type, name, description, items)
+    def initialize(path, date, type, group, title, description, items)
       @path = path
       @date = date
       @type = type
-      @name = name
+      @group = group
+      @title = title
       @description = description
       @items = items
     end
 
     def self.load_file(filename)
-      block = IO.binread(filename, 32)
+      block = IO.binread(filename, 128)
       header = if block.unpack('CC') == [0xff, 0xfe]
                  block[2..-1].force_encoding('utf-16le').encode('utf-8')
                elsif block.unpack('CCC') == [0xef, 0xbb, 0xbf]
                  block[3..-1].force_encoding('utf-8')
                else
-                 block.force_encoding('utf-8')
+                 block
                end
 
       case header
@@ -34,8 +37,18 @@ module Natour
           date = DateParser.parse(Pathname(filename).basename).compact.first
           items = csv.map { |row| Species.new(row[1], row[0]) }
                      .sort_by(&:name_de).uniq
-          [SpeciesList.new(filename, date, :kosmos_vogelfuehrer, nil, nil, items)]
+          [SpeciesList.new(filename, date, :kosmos_vogelfuehrer, :birds, nil, nil, items)]
         end
+      when /^<\?xml.*?www\.ornitho\.ch/m
+        date = DateParser.parse(Pathname(filename).basename).compact.first
+        doc = Nokogiri.XML(File.read(filename, mode: 'r:utf-8'))
+        folder = doc.at('/xmlns:kml/xmlns:Document/xmlns:Folder/xmlns:Folder/xmlns:Folder')
+        name = folder.at('./xmlns:name').text
+        items = folder.xpath('./xmlns:Placemark/xmlns:description')
+                      .map(&:text)
+                      .map { |description| Species.new(*description.scan(/&gt;([^&(]+)&lt;/).flatten.reverse) }
+                      .sort_by(&:name_de).uniq
+        [SpeciesList.new(filename, date, :ornitho_ch, :birds, name, nil, items)]
       when /^Favoriten/
         CSV.open(filename, 'r:bom|utf-8', col_sep: ';', skip_blanks: true) do |csv|
           chunks = csv.reject { |row| row.count == 1 && row[0] != 'Favoriten' }
@@ -51,6 +64,7 @@ module Natour
               filename,
               date,
               :flora_helvetica,
+              :plants,
               name&.gsub(/^(\d{4}-)?\d{2}-\d{2}( |_|-)?/, ''),
               description,
               items
@@ -63,8 +77,10 @@ module Natour
           items = csv.select { |row| row[0] }
                      .map { |row| Species.new(row[11][/^(([^ ]+ [^ ]+)(( aggr\.)|( subsp\. [^ ]+))?)/, 1], nil) }
                      .sort_by(&:name).uniq
-          [SpeciesList.new(filename, date, :info_flora, nil, nil, items)]
+          [SpeciesList.new(filename, date, :info_flora, :plants, nil, nil, items)]
         end
+      else
+        []
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -177,9 +177,13 @@ files:
 - bin/natour
 - lib/natour.rb
 - lib/natour/asciinurse.rb
-- lib/natour/cli/convert.rb
-- lib/natour/cli/create.rb
 - lib/natour/config.rb
+- lib/natour/convert.rb
+- lib/natour/create.rb
+- lib/natour/data/js/bootstrap.min.js
+- lib/natour/data/js/jquery-3.5.1.slim.min.js
+- lib/natour/data/js/loader.js
+- lib/natour/data/themes/natour-theme.yml
 - lib/natour/fit_file.rb
 - lib/natour/gps_track.rb
 - lib/natour/gps_track_point.rb
@@ -187,9 +191,6 @@ files:
 - lib/natour/helpers/date_parser.rb
 - lib/natour/helpers/suppress_output.rb
 - lib/natour/image.rb
-- lib/natour/js/bootstrap.min.js
-- lib/natour/js/jquery-3.5.1.slim.min.js
-- lib/natour/js/loader.js
 - lib/natour/map_geo_admin.rb
 - lib/natour/public_transport.rb
 - lib/natour/report.rb