natour 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b125a5ba293c91fa5efcb56ee32bc6e5ed52c1b8daf82439bcbec6c7b279a29d
-  data.tar.gz: bda03749fc2db89b56adadbb8bfb1522b8e116d294be244f918f9a6142005d07
+  metadata.gz: 8c599b25a1b97e3eb894161d80065d2359a7530371e40335702100b79510b013
+  data.tar.gz: '0892297dde6afb7de1a193d0bfe903ce6810d17b5a10c23bd5d0433b4cbde702'
 SHA512:
-  metadata.gz: c3ddac7902534aec8e14fb546287a45d6fd589c3b4c445b1291bef15d209b7eb9c43484f169ee7e3b9dcac44939b57f4d19d6fae07a261edf6d12499af11d16a
-  data.tar.gz: e1eebd6fa2c8704e25afe48c2120a146d0513f17a55df883d68aad05bbedd08e04173455119abe06ab8ef15894358b650a5590be74435ffd166f27e698c6aef6
+  metadata.gz: ce5fd7ebedd87c7c4dcf529a90878cdeab5dac805362407b9be3becee524aaa3d616d44f62f6bf4d4d8fc694741f607cdff2bb69a134407cbe7d4ac9c70330bf
+  data.tar.gz: 6f92ed19ec2f32eb4933630937ecb2d0fe597e466b6c3057aacfe070f971820d0e03a0dff28eb3d61e1ffea4db6bfd61091da8830c005a7cc8f3a184e450612a

data/CHANGELOG.adoc

@@ -6,6 +6,13 @@ The format is based on https://keepachangelog.com/en/1.0.0/[Keep a Changelog^],
 
 == Unreleased
 
+== 0.6.0 - 2021-11-20
+
+=== Fixed
+
+- Support GPX files containing only mandatory elements (i.e. no extensions)
+- Consider also the image dimensions to determine the orientation, even if the tag is present
+
 == 0.5.0 - 2021-08-16
 
 === Added

data/lib/natour/gps_track.rb

@@ -71,10 +71,14 @@ module Natour
     end
 
     def round_duration(duration, hours: 0, minutes: 0, seconds: 0)
+      return unless duration
+
       Duration.new(round_multiple_of(duration.to_i, (hours * 60 + minutes) * 60 + seconds))
     end
 
     def round_time(time, hours: 0, minutes: 0, seconds: 0)
+      return unless time
+
       Time.at(round_multiple_of(time.to_i, (hours * 60 + minutes) * 60 + seconds))
     end
   end

data/lib/natour/gpx_file.rb

@@ -1,26 +1,29 @@
 require 'nokogiri'
 require 'duration'
-require 'date'
-require 'time'
+require 'timeliness'
 
 module Natour
   class GPXFile < GPSTrack
+    GPX_XMLNS = {
+      'xmlns' => 'http://www.topografix.com/GPX/1/1',
+      'xmlns:gpxtrkx' => 'http://www.garmin.com/xmlschemas/TrackStatsExtension/v1'
+    }.freeze
+
     def initialize(filename)
       @doc = Nokogiri.XML(File.read(filename, mode: 'r:utf-8'))
 
-      date = Date.parse(@doc.at('/xmlns:gpx/xmlns:metadata/xmlns:time').text)
-      stats = @doc.at('/xmlns:gpx/xmlns:trk/xmlns:extensions/gpxtrkx:TrackStatsExtension')
+      stats = @doc.at('/xmlns:gpx/xmlns:trk/xmlns:extensions/gpxtrkx:TrackStatsExtension', GPX_XMLNS)
       if stats
-        ascent = stats.at('./gpxtrkx:Ascent').text.to_i
-        descent = stats.at('./gpxtrkx:Descent').text.to_i
-        distance = stats.at('./gpxtrkx:Distance').text.to_i
-        duration = Duration.new(stats.at('./gpxtrkx:TotalElapsedTime').text.to_i)
+        ascent = stats.at('./gpxtrkx:Ascent', GPX_XMLNS).text.to_i
+        descent = stats.at('./gpxtrkx:Descent', GPX_XMLNS).text.to_i
+        distance = stats.at('./gpxtrkx:Distance', GPX_XMLNS).text.to_i
+        duration = Duration.new(stats.at('./gpxtrkx:TotalElapsedTime', GPX_XMLNS).text.to_i)
       end
 
-      start_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[1]/xmlns:trkpt[1]'))
-      end_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[last()]/xmlns:trkpt[last()]'))
+      start_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[1]/xmlns:trkpt[1]', GPX_XMLNS))
+      end_point = to_track_point(@doc.at('/xmlns:gpx/xmlns:trk/xmlns:trkseg[last()]/xmlns:trkpt[last()]', GPX_XMLNS))
 
-      super(filename, date, ascent, descent, distance, duration, start_point, end_point)
+      super(filename, start_point.time&.to_date, ascent, descent, distance, duration, start_point, end_point)
     end
 
     def to_gpx
@@ -33,8 +36,8 @@ module Natour
       GPSTrackPoint.new(
         trkpt['lat'].to_f,
         trkpt['lon'].to_f,
-        trkpt.at('./xmlns:ele').text.to_f,
-        Time.parse(trkpt.at('./xmlns:time').text)
+        trkpt.at('./xmlns:ele')&.text&.to_f,
+        Timeliness.parse(trkpt.at('./xmlns:time')&.text)
       )
     end
   end

data/lib/natour/image.rb

@@ -11,12 +11,9 @@ module Natour
     def initialize(path, image)
       @path = path
       @image = image
+      @landscape = image.width >= image.height
       orientation = get_field('exif-ifd0-Orientation')
-      @landscape = if orientation
-                     orientation[/^(\d) \(/, 1].to_i.between?(1, 4)
-                   else
-                     image.width >= image.height
-                   end
+      @landscape = !@landscape if orientation && orientation[/^(\d) \(/, 1].to_i.between?(5, 8)
       date_time = get_field('exif-ifd0-DateTime')
       @date_time = Timeliness.parse(date_time[/^(.*?) \(/, 1], format: 'yyyy:mm:dd hh:nn:ss') if date_time
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: natour
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Simon Gysi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor