simple-trail 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec7ad04579f7af6e5c6df0517ee1f8ef8ba986f8895ce92e7548fddec91dabe
-  data.tar.gz: 694d57d1ec75c501e48e93acbdaad27d63dda944671323666d045c47031b4e77
+  metadata.gz: 01fc41a9ee4029834332f22d8cc513e8b12e2d8490e91b144cdd10c9b04f8bab
+  data.tar.gz: 841468837b2f944c7825751b6ddee2d174caa2d4bc4b1e4933664969ef7e5b79
 SHA512:
-  metadata.gz: b18740f2f648846202cf58a00f9a1debdae27273cd769bb401b27752d6c6c5b6b6f514445573c57fc3da650fea96827bd75e2146ff5539e8c5c78ca1b4b0861e
-  data.tar.gz: 0d1fe7392d9c8701da42433b52ed498e0a959371d405f3dcc8aa4d632af56df28a2cc305f6ef5c6aa9717ce0719b36cc73663e0635922a1e6ee7ccddf6973904
+  metadata.gz: 46b758ae075b90f1694c4ccb5a48926fefc835f274f0f62014e13f9c792f6c41e306e0fc39d36621f21f700f601f3b4d5652835bbac942891c7c9c1bfbef7406
+  data.tar.gz: e3dbb0f40a6f2b31b81f0e5be17762689ff4fcf08b57618bdcc1210c30d03df8fad70c278a94714551548123301c1ca6109756fce066296d2ba9ef7f1fa9a416

data/lib/simple_trail/parser/extract_points.rb

@@ -9,9 +9,34 @@ module Parser
     end
 
     def read_points
-      segments = @parsed_file.dig(:trk, :trkseg)
-      @points = segments.is_a?(Array) ? segments.map { |seg| seg[:trkpt] }.flatten : segments[:trkpt]
-      @simplified_points = @points.map { |point| point.select { |key, _| [:lon, :lat].include? key } }
+
+      main_node = @parsed_file.fetch(:trk)
+
+      if main_node.is_a?(Array)
+        @simplified_points = []
+        @points = []
+
+        main_node.each do |segment|
+          @simplified_points << simplified_points_selection(segment)
+          @points << segment_points_selection(segment)
+        end
+
+        @simplified_points.flatten!
+        @points.flatten!
+      else
+        segments = main_node.fetch(:trkseg)
+        @points = segments.is_a?(Array) ? segments.map { |seg| seg[:trkpt] }.flatten : segments[:trkpt]
+        @simplified_points = @points.map { |point| point.select { |key, _| [:lon, :lat].include? key } }
+      end
+    end
+
+    def segment_points_selection(segment)
+      segments = segment.fetch(:trkseg)
+      segments.is_a?(Array) ? segments.map { |seg| seg[:trkpt] }.flatten : segments[:trkpt]
+    end
+
+    def simplified_points_selection(segment)
+      segment_points_selection(segment).map { |point| point.select { |key, _| [:lon, :lat].include? key } }
     end
   end
 end

data/lib/simple_trail/parser/validate_gpx.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Parser
+  class ValidateGpx < Base
+    def initialize(filename)
+      @filename = filename
+    end
+
+    def validate_basics?
+      file = File.new(@filename)
+      @parsed_file = XmlHasher.parse(file)[:gpx]
+
+      !@parsed_file.nil?
+    end
+  end
+end

data/lib/simple_trail/parser/validate_gpx_string.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Parser
+  class ValidateGpxString < Base
+    def initialize(file_content)
+      @file_content = file_content
+    end
+
+    def validate_basics?
+      @parsed_file = XmlHasher.parse(@file_content)[:gpx]
+
+      !@parsed_file.nil?
+    end
+  end
+end

data/lib/simple_trail.rb

@@ -7,6 +7,8 @@ require File.expand_path('simple_trail/parser/base', __dir__)
 require File.expand_path('simple_trail/parser/gpx', __dir__)
 require File.expand_path('simple_trail/parser/gpx_string', __dir__)
 require File.expand_path('simple_trail/parser/extract_points', __dir__)
+require File.expand_path('simple_trail/parser/validate_gpx', __dir__)
+require File.expand_path('simple_trail/parser/validate_gpx_string', __dir__)
 require File.expand_path('simple_trail/manipulation/statistics', __dir__)
 require File.expand_path('simple_trail/manipulation/straightener', __dir__)
 require File.expand_path('simple_trail/manipulation/unifier', __dir__)

data/simple-trail.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'simple-trail'
-  s.version     = '0.3.0'
+  s.version     = '0.3.2'
   s.date        = '2020-08-03'
   s.summary     = 'Readind and manipulating GPX and other trail representation file'
   s.description = 'Optimazing and manipulating GPX file data. For my private purposes mostly'