simple-trail 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e1ae2c7eae42ebfc12025e5d2aad3694211d63adc83afecd16e8f56ced84dc
-  data.tar.gz: 302d051c4761b2330b504b1b3f6f258078f2affba3e343fa2bd80fc634dfd88e
+  metadata.gz: 4ec7ad04579f7af6e5c6df0517ee1f8ef8ba986f8895ce92e7548fddec91dabe
+  data.tar.gz: 694d57d1ec75c501e48e93acbdaad27d63dda944671323666d045c47031b4e77
 SHA512:
-  metadata.gz: 60389e48d5b20f1ae913fdf2ff45466ca01af63c81476c93d9f8899ae1a43f1b792545f5043782966ec339887494f8a425a28a9229f6dccf5f8c3451220abe36
-  data.tar.gz: 06d43df7c91a0b58f23afd7196583bb1f855adfe2931d606167180dab7cd7d6ef5ffa7b52858aedd72424379efcf9e69bae853e203c901f56cf679ddc453e83e
+  metadata.gz: b18740f2f648846202cf58a00f9a1debdae27273cd769bb401b27752d6c6c5b6b6f514445573c57fc3da650fea96827bd75e2146ff5539e8c5c78ca1b4b0861e
+  data.tar.gz: 0d1fe7392d9c8701da42433b52ed498e0a959371d405f3dcc8aa4d632af56df28a2cc305f6ef5c6aa9717ce0719b36cc73663e0635922a1e6ee7ccddf6973904

data/lib/simple_trail/manipulation/enricher.rb

@@ -75,11 +75,12 @@ module Manipulation
     end
 
     def add_km_markers
-      total_distance = @points[-1][:total_distance].floor - 1
+      total_distance = @points[-1][:total_distance].floor
       start_v = @offset.to_f.ceil
 
       (start_v..start_v+total_distance).each do |i|
-        find_and_enrich_first_occurence(i+1)
+        next if i == @offset.to_f
+        find_and_enrich_first_occurence(i)
       end
     end
 

data/lib/simple_trail/parser/base.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module Parser
+  class Base
+    
+    private
+
+    def extract_points
+      points_reader = ExtractPoints.new(@parsed_file)
+      points_reader.read_points
+      @points = points_reader.points
+      @simplified_points = points_reader.simplified_points
+    end
+
+    def extract_pois
+      @points_of_interests = @parsed_file[:wpt]
+    end
+
+    def extract_data
+      metadata = @parsed_file[:metadata]
+      {
+        name: metadata[:name],
+        author: metadata[:author][:name]
+      }
+    end
+  end
+end

data/lib/simple_trail/parser/extract_points.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Parser
+  class ExtractPoints
+    attr_reader :simplified_points, :points
+
+    def initialize(parsed_file)
+      @parsed_file = parsed_file
+    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 } }
+    end
+  end
+end
+

data/lib/simple_trail/parser/gpx.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Parser
-  class Gpx
+  class Gpx < Base
     attr_reader :simplified_points, :points, :points_of_interests, :parsed_file
 
     def initialize(filename)
@@ -19,25 +19,5 @@ module Parser
     def meta
       @meta ||= extract_data
     end
-
-    private
-
-    def extract_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 } }
-    end
-
-    def extract_pois
-      @points_of_interests = @parsed_file[:wpt]
-    end
-
-    def extract_data
-      metadata = @parsed_file[:metadata]
-      {
-        name: metadata[:name],
-        author: metadata[:author][:name]
-      }
-    end
   end
 end

data/lib/simple_trail/parser/gpx_string.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Parser
+  class GpxString < Base
+    attr_reader :simplified_points, :points, :points_of_interests, :parsed_file
+
+    def initialize(file_content)
+      @file_content = file_content
+    end
+
+    def read
+      @parsed_file = XmlHasher.parse(@file_content)[:gpx]
+      fail unless @parsed_file
+      extract_points
+      extract_pois
+    end
+
+    def meta
+      @meta ||= extract_data
+    end
+  end
+end

data/lib/simple_trail.rb

@@ -3,7 +3,10 @@
 require 'geokit'
 require 'xmlhasher'
 
+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/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,12 +5,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = 'simple-trail'
-  s.version     = '0.2.5'
+  s.version     = '0.3.0'
   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'
   s.authors     = ['Staszek Zawadzki']
   s.email       = 'st.zawadzki@gmail.com'
+  s.homepage    = 'https://github.com/PadawanBreslau/simple-trail'
 
   s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})

data/spec/parser/gpx_string_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Parser::GpxString do
+  it 'reads the file' do
+    gpx_parser = described_class.new(File.new('./spec/examples/test_1.gpx').read)
+    expect { gpx_parser.read }.not_to raise_error
+    expect(gpx_parser.parsed_file).not_to be_nil
+  end
+
+  it 'reads metadata' do
+    gpx_parser = described_class.new(File.new('./spec/examples/test_1.gpx').read)
+    gpx_parser.read
+
+    expect(gpx_parser.meta[:author]).to eq 'choosen'
+    expect(gpx_parser.meta[:name]).to eq '06.06.2020 18:56'
+  end
+
+  it 'reads points simplified/all' do
+    gpx_parser = described_class.new(File.new('./spec/examples/test_1.gpx').read)
+    gpx_parser.read
+    expect(gpx_parser.points.size).to eq 190
+    expect(gpx_parser.points.size).to eq gpx_parser.simplified_points.size
+
+    random_index = rand(gpx_parser.points.size)
+    expect(gpx_parser.points[random_index][:lat]).to eq gpx_parser.simplified_points[random_index][:lat]
+    expect(gpx_parser.points[random_index][:lon]).to eq gpx_parser.simplified_points[random_index][:lon]
+  end
+
+  it 'reads file with segments' do
+    gpx_parser = described_class.new(File.new('./spec/examples/test_with_segments.gpx').read)
+    expect { gpx_parser.read }.not_to raise_error
+
+    expect(gpx_parser.points.size).to eq 355
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-trail
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Staszek Zawadzki
@@ -96,7 +96,10 @@ files:
 - lib/simple_trail/manipulation/statistics.rb
 - lib/simple_trail/manipulation/straightener.rb
 - lib/simple_trail/manipulation/unifier.rb
+- lib/simple_trail/parser/base.rb
+- lib/simple_trail/parser/extract_points.rb
 - lib/simple_trail/parser/gpx.rb
+- lib/simple_trail/parser/gpx_string.rb
 - simple-trail.gemspec
 - spec/examples/gss20-full-official.gpx
 - spec/examples/kbl.gpx
@@ -124,8 +127,9 @@ files:
 - spec/manipulation/unifier_spec.rb
 - spec/parser/gpx_poi_spec.rb
 - spec/parser/gpx_spec.rb
+- spec/parser/gpx_string_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage: https://github.com/PadawanBreslau/simple-trail
 licenses:
 - MIT
 metadata: {}
@@ -175,4 +179,5 @@ test_files:
 - spec/manipulation/unifier_spec.rb
 - spec/parser/gpx_poi_spec.rb
 - spec/parser/gpx_spec.rb
+- spec/parser/gpx_string_spec.rb
 - spec/spec_helper.rb