gpx2exif 0.0.2 → 0.0.3

data/README.md

@@ -1,4 +1,4 @@
-gpx2xif
+gpx2exif
 =======
 
 Geotagging
@@ -49,7 +49,21 @@ How to use it
 
   generate_garmin_waypoints -y input_file.yml > output.gpx
 
+4. You can check inter-POI distances using
 
+  generate_garmin_waypoints -y input_file.yml -C
+
+   Distance conflict does not mean something is wrong. POIs can be close to each other so it
+   is a good idea to have your brain turned on ;)
+
+5. You can change inter-POI distances using 'latlon something' distance for distance checking
+   explained line before.
+
+  generate_garmin_waypoints -y samples/sample_yaml_pois.yml -C -t 1
+
+6. You can specify output file if you don't like using >> 'file.gpx'.
+
+  generate_garmin_waypoints -y samples/sample_yaml_pois.yml -o file.gpx
 
 Contributing to gpx2xif
 -------------------------------

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/generate_garmin_waypoints

@@ -4,19 +4,43 @@ require 'rubygems'
 require 'gpx2exif'
 require 'optparse'
 
-options = {}
+options = { }
 OptionParser.new do |opts|
   opts.banner = "Usage: generate_garmin_waypoints [options]"
 
   opts.on("-y", "--yaml FILE", "Add points from yaml file") do |v|
     options[:yaml] = v
   end
+  opts.on("-C", "--check", "Check distance of waypoints") do
+    options[:check] = true
+  end
+  opts.on("-t", "--check_threshold DISTANCE", "Min distance of waypoints") do |v|
+    options[:check_threshold] = v
+  end
+  opts.on("-o", "--output FILE", "Save output to file") do |v|
+    options[:output_file] = v
+  end
 end.parse!
 
 g = GarminUtils::WaypointListGenerator.new
 if options[:yaml]
- g.add_yaml_file(options[:yaml])
+  g.add_yaml_file(options[:yaml])
+end
+if options[:check_threshold]
+  g.check_min_threshold = options[:check_threshold].to_f
 end
 
 # result
-puts xml = g.to_xml
+if options[:check]
+  g.check
+else
+  xml = g.to_xml
+  if options[:output_file]
+    f = File.open(options[:output_file], 'w')
+    f.puts xml
+    f.close
+  else
+    puts xml
+  end
+
+end

data/lib/garmin_utils/waypoint_list_generator.rb

@@ -10,38 +10,57 @@ module GarminUtils
     def initialize
       @pois = Array.new
       @etrex_model = "eTrex 30"
+      @check_min_threshold = 0.01
     end
 
+    attr_accessor :check_min_threshold
+    attr_accessor :etrex_model
+
     def add_yaml_file(y)
       @pois += YAML::load_file(y)
     end
 
     def add(lat, lon, name, cmt = nil, time = nil, ele = nil, sym = nil)
       @pois << {
-              :lat => lat,
-              :lon => lon,
-              :name => name,
-              :cmt => cmt,
-              :time => time,
-              :ele => ele,
-              :sym => sym
+        :lat => lat,
+        :lon => lon,
+        :name => name,
+        :cmt => cmt,
+        :time => time,
+        :ele => ele,
+        :sym => sym
       }
     end
 
+    def check
+      puts "Distance conflicts:"
+
+      sorted = @pois.sort { |p, q| p[:lat] <=> q[:lat] }
+      (1...sorted.size).each do |i|
+        l = (sorted[i-1][:lat] - sorted[i][:lat]) ** 2 +
+          (sorted[i-1][:lon] - sorted[i][:lon]) ** 2
+        l = Math.sqrt(l)
+
+        if l < @check_min_threshold
+          puts "* #{sorted[i-1][:name]} - #{sorted[i][:name]} = #{l}"
+        end
+      end
+    end
+
     def to_xml
       #xml = Builder::XmlMarkup.new(:indent => 2)
       string = ""
       xml = Builder::XmlMarkup.new(:target => string, :indent => 0)
       xml.instruct! :xml, :encoding => "UTF-8", :standalone => 'no'
       xml.gpx(
-              'xmlns' => "http://www.topografix.com/GPX/1/1",
-              'xmlns:gpxx' => "http://www.garmin.com/xmlschemas/GpxExtensions/v3",
-              'xmlns:wptx1' => "http://www.garmin.com/xmlschemas/WaypointExtension/v1",
-              'xmlns:gpxtpx' => "http://www.garmin.com/xmlschemas/TrackPointExtension/v1",
-              'creator' => @etrex_model,
-              '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 http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www8.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/WaypointExtension/v1 http://www8.garmin.com/xmlschemas/WaypointExtensionv1.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd"
+        'xmlns' => "http://www.topografix.com/GPX/1/1",
+        'xmlns:gpxx' => "http://www.garmin.com/xmlschemas/GpxExtensions/v3",
+        'xmlns:wptx1' => "http://www.garmin.com/xmlschemas/WaypointExtension/v1",
+        'xmlns:gpxtpx' => "http://www.garmin.com/xmlschemas/TrackPointExtension/v1",
+        'creator' => @etrex_model,
+        '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 http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www8.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/WaypointExtension/v1 http://www8.garmin.com/xmlschemas/WaypointExtensionv1.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd"
 
 
       ) do |g|
@@ -84,21 +103,24 @@ module GarminUtils
     def self.symbols
       # http://freegeographytools.com/2008/garmin-gps-unit-waypoint-icons-table
       [
-              "Flag, Blue",
-              "Flag, Green",
-              "Flag, Red",
+        "Flag, Blue",
+        "Flag, Green",
+        "Flag, Red",
+
+        "Pin, Blue",
+        "Pin, Green",
+        "Pin, Red",
 
-              "Pin, Blue",
-              "Pin, Green",
-              "Pin, Red",
+        "Block, Blue",
+        "Block, Green",
+        "Block, Red",
 
-              "Block, Blue",
-              "Block, Green",
-              "Block, Red",
+        "Summit",
+        "Trail Head", # other trail parts, not summits
+        "Lodging", # rooms
 
-              "Summit",
-              "Trail Head"
-              # ...
+        "Ground Transportation" # all public ground transportation
+      # ...
 
       ]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpx2exif
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-07 00:00:00.000000000Z
+date: 2012-04-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &23556840 !ruby/object:Gem::Requirement
+  requirement: &16259820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23556840
+  version_requirements: *16259820
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
-  requirement: &23130560 !ruby/object:Gem::Requirement
+  requirement: &16259220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23130560
+  version_requirements: *16259220
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &23129980 !ruby/object:Gem::Requirement
+  requirement: &16258560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23129980
+  version_requirements: *16258560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23129440 !ruby/object:Gem::Requirement
+  requirement: &16257960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *23129440
+  version_requirements: *16257960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23128920 !ruby/object:Gem::Requirement
+  requirement: &16257320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23128920
+  version_requirements: *16257320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23128320 !ruby/object:Gem::Requirement
+  requirement: &16256720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *23128320
+  version_requirements: *16256720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &23127660 !ruby/object:Gem::Requirement
+  requirement: &16256120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23127660
+  version_requirements: *16256120
 description: Mass geotagger using GPX files.
 email: bobikx@poczta.fm
 executables:
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 336724841387735391
+      hash: -92745170139221156
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: