simple-trail 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba06ca65c57e7950b28e45822dcddaa944b6375eb6e8d1ceedaee8031f1e163
-  data.tar.gz: 3b82b1e9d848442630deaa9b09ea4fa02c51dce42cf86a980d1abb823746a82e
+  metadata.gz: 1764e72de880503bf6d9493359b9c5af1ce9e6e41de6521f38664c1523f50aaf
+  data.tar.gz: 35e92389256eccfffd647cec6a24ec48cfb7fd132ed52150b59f1ffcd5f705fc
 SHA512:
-  metadata.gz: 40c43bd89ba95b26820580c88afbd6b327fac9c1edb4ab42a38441703d1d93be7c3f5cf33a9ee9fe99848875030a2de788a55c14db4c8fd7483090f154c7bd72
-  data.tar.gz: 98cd69d440cd930578cea1ebc9b0240f885fa508f62860e7acd75668a89b2e692304e8d5cc90720818b71dcb1bcaa6c5d5ca9abb0892b98c0ea79e3f9b2533c7
+  metadata.gz: f78e80884cb5140bd48ee9705e02eb4110c3af7ef209c16349e231e1906b110e9da3390966e4aa51b6981b23f5957f0804f127f5a31ed0bc6ec51edbb9906d73
+  data.tar.gz: 92eb3802ea53ac97d626fd383eb98cd5c2111d5e29640ca9e3d29bba4fc001f1d4be6c1a8ec25538cb0d40c46f9285c8c385304206682afd173186c7f5f5cc5a

data/README.md

@@ -3,4 +3,17 @@
 .h3 Purpose
 Reading and interpretation on trail files (GPX,...)
 
+.h3 Usage
+
+```
+      @parser = Parser::Gpx.new(@file)
+
+      @parser.read
+      @points = @parser.points
+```
+
+```
+Manipulation::Enricher.new(@points, @enrichment_level, @offset).enrich
+```
+
 Licence: MIT

data/lib/simple_trail/generator/gpx.rb

@@ -9,14 +9,25 @@ module Generator
       @name = name
     end
 
+    def time(xml, timestamp)
+      xml.send(:time, timestamp)
+    end
+
+    def ele(xml, elevation)
+      xml.send(:ele, elevation)
+    end
+
     def gpx
       builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
         xml.gpx(version: '1.0') {
-          xml.name { @name }
           xml.trk {
+            xml.name { @name }
             xml.trkseg {
               @points.map do |point|
-                xml.trkpt(lat: point[:lat], lon: point[:lon])
+                xml.trkpt(lat: point[:lat], lon: point[:lon]) {
+                  time(xml, point[:time]) unless point[:time].nil?
+                  ele(xml, point[:ele]) unless point[:ele].nil?
+                }
               end
             }
           }

data/lib/simple_trail/manipulation/enricher.rb

@@ -4,9 +4,10 @@ module Manipulation
   class Enricher
     attr_reader :enriched_points
 
-    def initialize(points, distance_limit=nil)
+    def initialize(points, distance_limit=nil, offset=0)
       @points = points
       @distance_limit = distance_limit
+      @offset = offset
       @counter = 3
     end
 
@@ -75,13 +76,15 @@ module Manipulation
 
     def add_km_markers
       total_distance = @points[-1][:total_distance].floor - 1
-      total_distance.times do |i|
+      start_v = @offset.ceil
+
+      (start_v..start_v+total_distance).each do |i|
         find_and_enrich_first_occurence(i+1)
       end
     end
 
     def find_and_enrich_first_occurence(i)
-      index = @points.find_index{|point| point[:total_distance] > i}
+      index = @points.find_index{|point| point[:total_distance] + @offset > i}
       @points[index].merge!(label: i)
     end
 

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.2.0'
+  s.version     = '0.2.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'

data/spec/examples/test-xxl.gpx

@@ -98424,4 +98424,4 @@
     </trkpt>
   </trkseg>
 </trk>
-</gpx>
+</gpx>

data/spec/examples/test_no_time_and_ele.gpx

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?><gpx creator="https://mapa-turystyczna.pl" xmlns="http://www.topografix.com/GPX/1/1" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+  <metadata>
+    <link href="https://mapa-turystyczna.pl">
+      <text>mapa-turystyczna.pl</text>
+    </link>
+    <time>2020-06-07T13:17:32Z</time>
+    <bounds maxlat="49.5039739" maxlon="20.0407328" minlat="49.4986602" minlon="20.0366753"/>
+  </metadata>
+  <wpt lat="49.49866" lon="20.040733">
+    <ele>617</ele>
+    <name>Nowy Targ, Kowaniec</name>
+    <link href="https://mapa-turystyczna.pl/node/88">
+      <text>Nowy Targ, Kowaniec</text>
+    </link>
+  </wpt>
+  <wpt lat="49.503974" lon="20.037433">
+    <ele>631</ele>
+    <name>Nowy Targ, Robów</name>
+    <link href="https://mapa-turystyczna.pl/node/4103">
+      <text>Nowy Targ, Robów</text>
+    </link>
+  </wpt>
+
+<trk>
+  <name>Nowy Targ, Kowaniec – Nowy Targ, Robów</name>
+  <link href="https://mapa-turystyczna.pl/route?q=49.4986600,20.0407330;49.5039740,20.0374330">
+    <text>Nowy Targ, Kowaniec – Nowy Targ, Robów</text>
+  </link>
+  <trkseg>
+    <trkpt lat="49.4986602" lon="20.0407328"/>
+      <trkpt lat="49.4986967" lon="20.0404556"/>
+      <trkpt lat="49.4987087" lon="20.0400335"/>
+      <trkpt lat="49.4988349" lon="20.0397599"/>
+      <trkpt lat="49.4989091" lon="20.0396378"/>
+      <trkpt lat="49.499428" lon="20.0394863"/>
+      <trkpt lat="49.4996371" lon="20.0392445"/>
+      <trkpt lat="49.4997661" lon="20.0389653"/>
+      <trkpt lat="49.5002861" lon="20.038577"/>
+      <trkpt lat="49.5007575" lon="20.0380165"/>
+      <trkpt lat="49.5008552" lon="20.0378636"/>
+      <trkpt lat="49.5011271" lon="20.0373244"/>
+      <trkpt lat="49.5013462" lon="20.0370132"/>
+      <trkpt lat="49.5014997" lon="20.0368389"/>
+      <trkpt lat="49.501667" lon="20.0367343"/>
+      <trkpt lat="49.5019824" lon="20.0366753"/>
+      <trkpt lat="49.5023919" lon="20.0367289"/>
+      <trkpt lat="49.5027698" lon="20.0370616"/>
+      <trkpt lat="49.5031206" lon="20.037299"/>
+      <trkpt lat="49.5033425" lon="20.0373218"/>
+      <trkpt lat="49.5035736" lon="20.0373084"/>
+      <trkpt lat="49.5038343" lon="20.0374016"/>
+      <trkpt lat="49.5039739" lon="20.0374335"/>
+  </trkseg>
+</trk>
+</gpx>

data/spec/generator/gpx_spec.rb

@@ -18,4 +18,22 @@ RSpec.describe Generator::Gpx do
     expect(output.match(/#{random_point[:lon]}/)).not_to be_nil
     expect(output.match(/#{random_point[:lat]}/)).not_to be_nil
   end
+
+  it 'generates output when no time' do
+    parser = Parser::Gpx.new('./spec/examples/test_no_time_and_ele.gpx')
+    parser.read
+
+    points = parser.points
+
+    service = described_class.new(points: points)
+    expect{service.gpx}.not_to raise_error
+    output = service.output
+    expect(output).not_to be_nil
+
+    random_point = points.sample
+    expect(output.match(/#{random_point[:lon]}/)).not_to be_nil
+    expect(output.match(/#{random_point[:lat]}/)).not_to be_nil
+    expect(output.match(/time/)).to be_nil
+    expect(output.match(/ele/)).to be_nil
+  end
 end

data/spec/manipulation/enricher_spec.rb

@@ -36,4 +36,29 @@ RSpec.describe Manipulation::Enricher do
     expect(enrichement_logic.enriched_points.count).not_to eq point_count
     expect(enrichement_logic.enriched_points.all?{|point| !point[:ele].nil?}).to be(true)
   end
+
+  it 'adds labels' do
+    parser = Parser::Gpx.new('./spec/examples/gss20-full-official.gpx')
+    parser.read
+
+    enrichement_logic = described_class.new(parser.points, 0.1)
+    enrichement_logic.enrich
+
+    labels = enrichement_logic.enriched_points.map{|h| h[:label]}.compact.uniq
+    expect(labels.size).to eq 506
+    expect(labels.include?('1')).to be(true)
+    expect(labels.include?('535')).to be(false)
+  end
+
+  it 'adds labels with offset' do
+    parser = Parser::Gpx.new('./spec/examples/gss20-full-official.gpx')
+    parser.read
+
+    enrichement_logic = described_class.new(parser.points, 0.1, 50)
+    enrichement_logic.enrich
+    labels = enrichement_logic.enriched_points.map{|h| h[:label]}.compact.uniq
+    expect(labels.size).to eq 506
+    expect(labels.include?('1')).to be(false)
+    expect(labels.include?('535')).to be(true)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-trail
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Staszek Zawadzki
@@ -113,6 +113,7 @@ files:
 - spec/examples/test_7.gpx
 - spec/examples/test_8.gpx
 - spec/examples/test_9.gpx
+- spec/examples/test_no_time_and_ele.gpx
 - spec/examples/test_with_segments.gpx
 - spec/examples/zyleta2021.gpx
 - spec/generator/gpx_spec.rb
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Readind and manipulating GPX and other trail representation file
@@ -163,6 +164,7 @@ test_files:
 - spec/examples/test_7.gpx
 - spec/examples/test_8.gpx
 - spec/examples/test_9.gpx
+- spec/examples/test_no_time_and_ele.gpx
 - spec/examples/test_with_segments.gpx
 - spec/examples/zyleta2021.gpx
 - spec/generator/gpx_spec.rb