gpx2exif 0.2.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5c57a7184d4a6c5a92e236813aaac15520bfac1d
+  data.tar.gz: b75af062cb4ca3cd443f0cacdb34d322f8c07b9f
+SHA512:
+  metadata.gz: 6e0978ea19d9ced64f58cc8d8adece6cf8b2930fb1d798484293d6fa99fbcec5bcacfa324ef9376b72c05a62b6fe4dad46362094c2e18b493a546f6d93c0c0ea
+  data.tar.gz: d45af749bd7beae9b406b5dcaac6717bb161ed75806213a8a30b735c120be2c99185bb34ffeccaffe34aa9dc98949920d7825bcc922f080067bdcc3925cb289b

data/Gemfile

@@ -4,6 +4,7 @@ gem 'mini_exiftool'
 gem 'rmagick'
 gem 'chunky_png'
 gem 'gpx_utils'
+gem 'geokit'
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -1,69 +1,75 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
-    chunky_png (1.2.9)
+    chunky_png (1.3.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    docile (1.1.1)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    docile (1.1.3)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    geokit (1.8.4)
+      multi_json (>= 1.3.2)
     git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
     gpx_utils (0.0.1)
       builder
       nokogiri
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    jeweler (1.8.8)
+    hashie (2.1.1)
+    highline (1.6.21)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    mini_exiftool (2.3.0)
-    multi_json (1.8.2)
+    mini_exiftool (2.4.1)
+    mini_portile (0.5.3)
+    multi_json (1.9.2)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multipart-post (2.0.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
+    rake (10.3.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     rmagick (2.13.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    thread_safe (0.3.3)
 
 PLATFORMS
   ruby
@@ -71,6 +77,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   chunky_png
+  geokit
   gpx_utils
   jeweler
   mini_exiftool

data/README.md

@@ -112,6 +112,6 @@ Contributing to gpx2xif
 Copyright
 ---------
 
-Copyright (c) 2012 Aleksander Kwiatkowski. See LICENSE.txt for
+Copyright (c) 2012-2014 Aleksander Kwiatkowski, Craig Taverner. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -20,9 +20,9 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{Mass geotagger using GPX files}
   gem.description = %Q{Mass geotagger using GPX files.}
   gem.email = "bobikx@poczta.fm"
-  gem.authors = ["Aleksander Kwiatkowski"]
+  gem.authors = ["Aleksander Kwiatkowski", "Craig Taverner"]
   # dependencies defined in Gemfile
-  gem.executables = ['geotag_all_images', 'geotag_simulate', 'gpx2png']
+  gem.executables = ['geotag', 'geotag_all_images', 'geotag_simulate', 'gpx2png']
 
   gem.files = FileList[
     "[A-Z]*", "{bin,generators,lib,test}/**/*"
@@ -49,4 +49,11 @@ desc "Run RSpec with code coverage"
 task :coverage do
   `rake spec COVERAGE=true`
   #`open coverage/index.html`
-end
+end
+
+desc "Make temp directory for image output"
+task :make_temp do
+  FileUtils.mkdir_p "samples/tmp"
+end
+
+task :spec => :make_temp

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/bin/geotag

@@ -0,0 +1,157 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'gpx2exif'
+require 'gpx2png/osm'
+require 'gpx2png/ump'
+require 'optparse'
+require 'geotagger/geotagger'
+
+options = { }
+OptionParser.new do |opts|
+  opts.banner = "Usage: geotag [options] [files]"
+
+  opts.on("-d", "--[no-]debug", "Debug mode") do |v|
+    options[:debug] = v
+  end
+  opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-m", "--[no-]simulate", "Run geotagging as simulation") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-a", "--[no-]autofind", "Run geotagging using all GPX and JPG files found from current path") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-g", "--gpx FILE", "Input GPX file") do |v|
+    options[:gpx] = v
+  end
+  opts.on("-T", "--start-time DATETIME", "Time of first image for images without timestamps") do |v|
+    options[:start_time] = v
+  end
+  opts.on("-G", "--time-gap MILLIS", "Time gap in milliseconds between images for images without timestamps") do |v|
+    options[:time_gap] = v.to_f
+  end
+  opts.on("-t", "--timeoffset OFFSET", "Timeoffset between GPX and EXIF") do |v|
+    options[:time_offset] = v.to_i
+  end
+  opts.on("-p", "--pattern FILEPAT", "Input image file pattern") do |v|
+    options[:pattern] = v
+  end
+  opts.on("-z", "--zoom ZOOM", "Set zoom") do |v|
+    options[:zoom] = v
+  end
+  opts.on("-s", "--size WIDTHxHEIGHT", "Set output map image size") do |v|
+    options[:size] = v
+  end
+  opts.on("-e", "--scale SCALE:XFACTOR:YFACTOR", "Scale dataset for closeup view") do |v|
+    s,x,y = v.split(/\:/)
+    options[:scale] = {
+      :scale => [[s.to_f,0.00001].max,1000].min,
+      :shift_x => x,
+      :shift_y => (y || x)
+    }
+  end
+  opts.on("-x", "--gpx-tags TAGS", "Comma separated list of key=value tags to add to EXIF") do |v|
+    options[:exif_tags] ||= {}
+    v.split(/\,+/).each do |pair|
+      key,value = pair.split(/\s*\=\s*/)
+      options[:exif_tags][key] = value
+    end
+    puts "Setting extra EXIF tags: #{options[:exif_tags].inspect}"
+  end
+  opts.on("-o", "--output FILE", "Output map image file") do |v|
+    options[:output_file] = v
+  end
+  opts.on("-u", "--ump", "Use UMP tiles rather than OSM for output map background") do
+    options[:ump] = true
+  end
+end.parse!
+
+if options[:debug]
+  puts options.inspect
+  puts ARGV.inspect
+end
+
+unless options[:gpx]
+  puts "Input GPX file needed"
+  @fail = true
+end
+if options[:output_file]
+  options[:size] ||= "600x600"
+  options[:zoom] ||= 1.0
+end
+if options[:output_file].nil? && options[:pattern].nil? && ARGV.length == 0
+  puts "Need at least one file, or a file pattern, or an output image"
+  @fail = true
+end
+
+if @fail
+  exit 0
+end
+
+$track_importer = nil
+
+if ARGV.length > 0 || options[:pattern] || options[:autofind]
+  g = Geotagger::Geotagger.new(options.merge(files: ARGV))
+  $track_importer = g.ti
+  if options[:autofind]
+    g.add_all_files(options[:time_offset].to_i)
+  end
+  if options[:gpx]
+    g.add_gpx_file(options[:gpx])
+  end
+  if options[:pattern]
+    g.add_pattern(options[:pattern])
+  end
+  if ARGV.length > 0
+    ARGV.each{|file| g.add_image(file)}
+  end
+  if options[:start_time]
+    g.fix_times
+  end
+  g.match_up
+  if options[:simulate]
+    g.simulate
+  else
+    g.save!
+  end
+end
+
+if options[:output_file]
+  g = $track_importer
+  unless g
+    g = Geotagger::TrackImporter.new
+    g.add_file(options[:gpx])
+  end
+
+  if options[:ump]
+    e = Gpx2png::Ump.new
+  else
+    e = Gpx2png::Osm.new
+  end
+  e.coords = g.coords
+  g.auto_marker do |marker|
+    e.add_marker marker
+  end
+
+  if options[:scale]
+    e.scale_options = options[:scale]
+  end
+
+  if options[:size]
+    # constant size
+    options[:size] =~ /(\d+)x(\d+)/
+    e.fixed_size($1.to_i, $1.to_i)
+  else
+    # constant zoom
+    e.zoom = options[:zoom].to_i
+    e.renderer_options = {crop_enabled: true}
+  end
+
+  e.save(options[:output_file])
+end
+
+# testing
+# ruby -Ilib bin/geotag -g spec/fixtures/sample.gpx -s 400x400 -o samples/tmp/cli_test.png -u
+

data/bin/gpx2png

@@ -40,6 +40,26 @@ if options[:zoom].nil? and options[:size].nil?
   @fail = true
 end
 
+module GpxUtils
+  class TrackImporter
+    def self.make_label point
+      "#{point[:time].strftime('%H:%M:%S')}: (#{point[:lat]}, #{point[:lon]})"
+    end
+    def auto_marker
+      puts "Track starts: #{self.class.make_label self.coords[0]}"
+      puts "Track ends: #{self.class.make_label self.coords[-1]}"
+
+      (0..(self.coords.length/20)).each do |i|
+        index = i * 20
+        point = self.coords[index]
+        label = self.class.make_label point
+        yield({lat: point[:lat], lon: point[:lon], label: label})
+      end
+      
+    end
+  end
+end
+
 unless @fail
   g = GpxUtils::TrackImporter.new
   g.add_file(options[:gpx])
@@ -50,6 +70,9 @@ unless @fail
     e = Gpx2png::Osm.new
   end
   e.coords = g.coords
+  g.auto_marker do |marker|
+    e.add_marker marker
+  end
 
   if options[:size]
     # constant size
@@ -65,4 +88,4 @@ unless @fail
 end
 
 # testing
-# ruby -Ilib bin/gpx2png -g spec/fixtures/sample.gpx -s 400x400 -o samples/tmp/cli_test.png -u
+# ruby -Ilib bin/gpx2png -g spec/fixtures/sample.gpx -s 400x400 -o samples/tmp/cli_test.png -u

data/lib/geotagger/exif_editor.rb

@@ -4,58 +4,75 @@ require 'mini_exiftool'
 $:.unshift(File.dirname(__FILE__))
 
 module Geotagger
-  class ExifEditor
 
-    def initialize(options = {})
-      @images = Array.new
-      @global_time_offset = 0
-      @verbose = options[:verbose]
-    end
+  # Wrapper class for path to image and the EXIF data read (and written)
+  # to the image.
+  class Image
 
-    attr_reader :images
-    attr_accessor :global_time_offset
+    attr_reader :editor, :photo, :attr
 
-    def read_file(path, time_offset = 0)
-      i = {
-        :path => path,
-        :time => get_photo_time(path) + time_offset + @global_time_offset
+    def initialize(editor, path, time_offset = 0)
+      @editor = editor
+      @photo = MiniExiftool.new path
+      @attr = {
+       :path => path,
+       :time => (time = @photo['DateTimeOriginal']) && (time + time_offset + editor.global_time_offset)
       }
-      @images << i
-      puts "Added file #{path}, time #{i[:time]}" if @verbose
     end
 
-    def get_photo_time(path)
-      photo = MiniExiftool.new path
-      photo['DateTimeOriginal']
+    def path
+      self[:path]
+    end
+
+    def time
+      self[:time]
     end
 
-    def set_photo_coords_internal(im)
-      set_photo_coords(im[:path], im[:coord][:lat], im[:coord][:lon], im[:coord][:alt])
+    def [](key)
+      @attr[key]
     end
 
-    def set_photo_coords(path, lat, lon, alt = 0.0)
-      photo = MiniExiftool.new path
+    def []=(key,value)
+      @attr[key] = value
+    end
 
+    def get_photo_time(offset=0)
+      (time = photo['DateTimeOriginal']) && (time + offset)
+    end
+
+    def save!
       # http://en.wikipedia.org/wiki/Geotagging#JPEG_photos
 
+      photo['ProcessingSoftware'] = 'gpx2exif'
+
       photo['GPSVersionID'] = '2 2 0 0'
+      photo['DateTimeOriginal'] = self.time
 
-      photo['GPSLatitude'] = lat
-      photo['GPSLongitude'] = lon
+      photo['GPSLatitude'] = @attr[:coord][:lat]
+      photo['GPSLongitude'] = @attr[:coord][:lon]
 
-      lat_ref = "N"
-      lon_ref = "E"
-      lat_ref = "S" if lat < 0.0
-      lon_ref = "W" if lon < 0.0
+      lat_ref = (@attr[:coord][:lat] < 0.0) ? "S" : "N"
+      lon_ref = (@attr[:coord][:lon] < 0.0) ? "W" : "E"
 
       photo['GPSLatitudeRef'] = lat_ref
       photo['GPSLongitudeRef'] = lon_ref
 
-      photo['GPSAltitude'] = alt
-      photo.save
+      photo['GPSAltitude'] = @attr[:coord][:alt]
+      photo['Orientation'] = 1	# 1 means normal upright landscape mode
+      photo['GPSImgDirectionRef'] = 'T'	# T=true north (as opposed to M=magnetic)
+      photo['GPSImgDirection'] = @attr[:coord][:direction]	# calculated in TrackImporter
+      photo['GPSMapDatum'] = 'WGS-84'	# We assume all GPS data is WGS-84
+
+      (editor.options[:exif_tags]||{}).each do |key,value|
+        photo[key] = value
+      end
+
+      unless photo.save
+        puts "Failed to save exif data to '#{path}': #{photo.errors.inspect}"
+      end
 
       photo2 = MiniExiftool.new path
-      puts " - coord saved lat #{photo2['GPSLatitude']} lon #{photo2['GPSLongitude']}" if @verbose
+      puts " - coord saved lat #{photo2['GPSLatitude']} lon #{photo2['GPSLongitude']}" if editor.verbose
 
       # exiftool -GPSMapDatum="WGS-84" -gps:GPSLatitude="34,57,57"
       # -gps:GPSLatitudeRef="N" -gps:GPSLongitude="83,17,59" -gps:GPSLongitudeRef="W"
@@ -63,5 +80,51 @@ module Geotagger
       # -State="North Carolina" -Country="USA" ~/Desktop/RabunBaldSummit_NC.jpg
     end
 
+    def to_s
+      "Image[#{path}] at '#{time}'"
+    end
+
+  end
+
+  class ExifEditor
+
+    attr_reader :options, :verbose
+
+    def initialize(options = {})
+      @options = options
+      @images = []
+      @image_map = {}
+      @global_time_offset = 0
+      @verbose = options[:verbose]
+    end
+
+    attr_reader :images
+    attr_accessor :global_time_offset
+
+    def fix_times
+      start_time = options[:start_time] && DateTime.parse(options[:start_time]) || DateTime.now
+      puts "Start: #{start_time}"
+      @images.each_with_index do |image,index|
+        if image[:time].nil?
+          timestamp = start_time + ((options[:time_gap] || 1000).to_i * index) / (1000.0 * 24 * 60 * 60)
+          image[:time] = timestamp.to_time
+        end
+        puts "#{index}: #{image.attr.inspect}"
+      end
+    end
+
+    def read_file(path, time_offset = 0)
+      image = Image.new(self,path,time_offset)
+      @images << image
+      @image_map[path] = image
+      puts "Added #{image}" if @verbose
+      image
+    end
+
+    def get_photo_time(path)
+      image = @image_map[path] || read_file(path)
+      image.photo['DateTimeOriginal']
+    end
+
   end
 end

data/lib/geotagger/geotagger.rb

@@ -8,9 +8,11 @@ $:.unshift(File.dirname(__FILE__))
 module Geotagger
   class Geotagger
 
+    attr_reader :options, :ti
+
     def initialize(options = {})
       @verbose = options[:verbose]
-      @ee = ExifEditor.new
+      @ee = ExifEditor.new options
       @ti = TrackImporter.new
       @ti.verbose = @verbose
     end
@@ -39,12 +41,19 @@ module Geotagger
       @ee.read_file(path, time_offset)
     end
 
+    def fix_times
+      @ee.fix_times
+    end
+
     def match_up
+      @ti.determine_directions
       @ee.images.each do |i|
-        puts "* searching for #{i[:path]}, time #{i[:time]}" if @verbose
+        puts "* searching for #{i}" if @verbose
         i[:coord] = @ti.find_by_time(i[:time])
         if i[:coord].nil?
           puts " - not found" if @verbose
+        else
+           @ti.add_image_marker(i)
         end
       end
 
@@ -55,7 +64,7 @@ module Geotagger
       @ee.images.each do |i|
         if not i[:coord].nil?
           puts "! saving for #{i[:path]}" if @verbose
-          @ee.set_photo_coords_internal(i)
+          i.save!
         end
 
       end
@@ -67,4 +76,4 @@ module Geotagger
     end
 
   end
-end
+end

data/lib/geotagger/track_importer.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'nokogiri'
+require 'geokit'
 
 $:.unshift(File.dirname(__FILE__))
 
@@ -17,17 +18,70 @@ module Geotagger
       return false
     end
 
+    def determine_directions(index=0)
+      if @coords.length > 1
+        previous_point = nil
+        @coords.each do |coord|
+          point = Geokit::LatLng.new(coord[:lat], coord[:lon])
+          if previous_point
+            coord[:direction] = previous_point.heading_to(point)
+          end
+          previous_point = point
+        end
+        @coords[0][:direction] = @coords[1][:direction]
+      end
+    end
+
     def find_by_time(time)
-      selected_coords = @coords.select { |c| (c[:time].localtime - time.localtime).abs < THRESHOLD }
-      selected_coords = selected_coords.sort { |a, b| (a[:time].localtime - time.localtime).abs <=> (b[:time].localtime - time.localtime).abs }
-      puts " - found #{selected_coords.size} coords within #{THRESHOLD}s from image time" if @verbose
-      if selected_coords.size > 0
-        puts " - best is #{selected_coords.first[:time].localtime}, time offset #{selected_coords.first[:time].localtime - time.localtime}" if @verbose
-        puts " - lat #{selected_coords.first[:lat]} lon #{selected_coords.first[:lon]}" if @verbose
+      selected_coords = @coords.select do |c|
+        (c[:time].localtime - time.localtime).abs < THRESHOLD
+      end
+      selected_coords = selected_coords.sort do |a, b|
+        (a[:time].localtime - time.localtime).abs <=> (b[:time].localtime - time.localtime).abs
+      end
+      if @verbose
+        puts " - found #{selected_coords.size} coords within #{THRESHOLD}s from image time"
+        if selected_coords.size > 0
+          puts " - best is #{selected_coords.first[:time].localtime}, time offset #{selected_coords.first[:time].localtime - time.localtime}"
+          puts " - lat #{selected_coords.first[:lat]} lon #{selected_coords.first[:lon]}"
+        end
       end
 
       return selected_coords.first
     end
 
+    def self.make_label(point, image=nil)
+      "#{point[:time].strftime('%H:%M:%S')}: (#{point[:lat]}, #{point[:lon]})#{image.nil? ? '' : image[:path]}"
+    end
+
+    def add_image_marker(image)
+      @images ||= []
+      @images << image
+    end
+
+    def auto_marker
+      puts "Track starts: #{self.class.make_label self.coords[0]}"
+      puts "Track ends: #{self.class.make_label self.coords[-1]}"
+
+      coordset = self.coords.map do |coord|
+        image = @images.select {|i| i[:coord] == coord}[0]
+        {coord: coord, image: image}
+      end
+
+      prev_point = nil
+      coordset.each_with_index do |co,index|
+        coord = co[:coord]
+        image = co[:image]
+        puts "Labeling coord:#{coord} with image: #{image}" if image
+        point = Geokit::LatLng.new(coord[:lat], coord[:lon])
+        if prev_point.nil? || (distance = point.distance_from(prev_point, units: :kms) > 0.02)
+          label = self.class.make_label coord, image
+          prev_point = point
+          yield({lat: coord[:lat], lon: coord[:lon], label: label})
+        end
+      end
+      
+    end
+
   end
-end
+end

data/lib/gpx2png/osm.rb

@@ -32,10 +32,11 @@ module Gpx2png
 
     def render
       setup_renderer
-      initial_calculations
+      initial_calculations(@scale_options)
       download_and_join_tiles
     end
 
+    attr_accessor :scale_options
     attr_accessor :renderer_options
 
     # Get proper renderer class
@@ -54,4 +55,4 @@ module Gpx2png
     end
 
   end
-end
+end

data/lib/gpx2png/osm_base.rb

@@ -110,11 +110,36 @@ module Gpx2png
       @fixed_height = _height
     end
 
-    def initial_calculations
-      @lat_min = @coords.collect { |c| c[:lat] }.min
-      @lat_max = @coords.collect { |c| c[:lat] }.max
-      @lon_min = @coords.collect { |c| c[:lon] }.min
-      @lon_max = @coords.collect { |c| c[:lon] }.max
+    def min_coords_or(key,val)
+      val || @coords.collect { |c| c[key] }.min
+    end
+
+    def max_coords_or(key,val)
+      val || @coords.collect { |c| c[key] }.max
+    end
+
+    def initial_calculations(scale={})
+      scale ||= {}
+      puts "Initializing with scale: #{scale.inspect}"
+      @lat_min = min_coords_or(:lat,scale[:lat_min])
+      @lat_max = max_coords_or(:lat,scale[:lat_max])
+      @lon_min = min_coords_or(:lon,scale[:lon_min])
+      @lon_max = max_coords_or(:lon,scale[:lon_max])
+
+      if scale[:scale].to_f > 0.00001
+        puts "Scaling from: (#{lat_min},#{lon_min})-(#{lat_max},#{lon_max})"
+        dlat = @lat_max - @lat_min
+        dlon = @lon_max - @lon_min
+        dlat2 = dlat * scale[:scale].to_f
+        dlon2 = dlon * scale[:scale].to_f
+        shift_x = dlon2 * scale[:shift_x].to_f
+        shift_y = dlat2 * scale[:shift_y].to_f
+        @lat_max += shift_y - (dlat - dlat2)/2.0
+        @lat_min += shift_y + (dlat - dlat2)/2.0
+        @lon_max += shift_x - (dlon - dlon2)/2.0
+        @lon_max += shift_x + (dlon - dlon2)/2.0
+        puts "Scaled to: (#{lat_min},#{lon_min})-(#{lat_max},#{lon_max})"
+      end
 
       # auto zoom must be here
       # drawing must fit into fixed resolution

data/lib/gpx2png/renderers/rmagick_renderer.rb

@@ -207,4 +207,4 @@ module Gpx2png
     end
 
   end
-end
+end

metadata

@@ -1,147 +1,146 @@
 --- !ruby/object:Gem::Specification
 name: gpx2exif
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Aleksander Kwiatkowski
+- Craig Taverner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gpx_utils
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: geokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mass geotagger using GPX files.
 email: bobikx@poczta.fm
 executables:
+- geotag
 - geotag_all_images
 - geotag_simulate
 - gpx2png
@@ -156,6 +155,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/geotag
 - bin/geotag_all_images
 - bin/geotag_simulate
 - bin/gpx2png
@@ -178,29 +178,25 @@ files:
 homepage: http://github.com/akwiatkowski/gpx2exif
 licenses:
 - LGPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2766757745175557176
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Mass geotagger using GPX files
 test_files: []