gpx2exif 0.1.0 → 0.1.1

data/README.md

@@ -78,7 +78,7 @@ How to use it
 
 2. Run command.
 
-  gpx2png -g <input GPX file> -s <image size, format: WIDTHxHEIGHT> -o <output PPNG file>
+  gpx2png -g [input GPX file] -s [image size, format: WIDTHxHEIGHT] -o [output PPNG file]
 
   Example:
 
@@ -86,12 +86,14 @@ How to use it
 
 3. You can specify zoom.
 
-  gpx2png -g <input GPX file> -z <zoom, best results if between 9 and 15, max 18> -o <output PPNG file>
+  gpx2png -g [input GPX file] -z [zoom, best results between 9 and 15, max 18] -o [output PPNG file]
 
   Example:
 
   gpx2png -g spec/fixtures/sample.gpx -z 11 -o map.png
 
+4. Adding -u forces using [UMP tiles](http://ump.waw.pl/) .
+
 
 Contributing to gpx2xif
 -------------------------------

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/gpx2png

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'gpx2exif'
 require 'gpx2png/osm'
+require 'gpx2png/ump'
 require 'optparse'
 
 options = { }
@@ -21,6 +22,9 @@ OptionParser.new do |opts|
   opts.on("-o", "--output FILE", "Output image file") do |v|
     options[:output_file] = v
   end
+  opts.on("-u", "--ump", "Use UMP tiles rather than OSM") do
+    options[:ump] = true
+  end
 end.parse!
 
 unless options[:gpx]
@@ -40,7 +44,11 @@ unless @fail
   g = GpxUtils::TrackImporter.new
   g.add_file(options[:gpx])
 
-  e = Gpx2png::Osm.new
+  if options[:ump]
+    e = Gpx2png::Ump.new
+  else
+    e = Gpx2png::Osm.new
+  end
   e.coords = g.coords
 
   if options[:size]
@@ -54,4 +62,7 @@ unless @fail
   end
 
   e.save(options[:output_file])
-end
+end
+
+# testing
+# ruby -Ilib bin/gpx2png -g spec/fixtures/sample.gpx -s 400x400 -o samples/tmp/cli_test.png -u

data/lib/gpx2png/osm.rb

@@ -42,6 +42,7 @@ module Gpx2png
         when :rmagick
           require 'gpx2png/renderers/rmagick_renderer'
           @r = RmagickRenderer.new(@renderer_options)
+          @r.licence_string = self.class.licence_string
         else
           raise ArgumentError
       end

data/lib/gpx2png/osm_base.rb

@@ -276,5 +276,9 @@ module Gpx2png
       # TODO expand min and max ranges
     end
 
+    def self.licence_string
+      "Map data OpenStreetMap (CC-by-SA 2.0)"
+    end
+
   end
 end

data/lib/gpx2png/renderers/rmagick_renderer.rb

@@ -11,7 +11,6 @@ module Gpx2png
       @width = @options[:width] || 3
       @aa = @options[:aa] == true
       @opacity = @options[:opacity] || 1.0
-      @licence_string = "Map data OpenStreetMap (CC-by-SA 2.0)"
       @crop_margin = @options[:crop_margin] || 50
       @crop_enabled = @options[:crop_enabled] == true
 
@@ -26,10 +25,11 @@ module Gpx2png
       @licence_text.font_family('helvetica')
       @licence_text.font_style(Magick::NormalStyle)
       @licence_text.text_align(Magick::RightAlign)
-      @licence_text.pointsize(10)
+      @licence_text.pointsize(12)
     end
 
     attr_accessor :x, :y
+    attr_accessor :licence_string
 
     # Create new (full) image
     def new_image

data/lib/gpx2png/ump.rb

@@ -0,0 +1,21 @@
+require 'rubygems'
+require 'gpx2png/osm'
+
+$:.unshift(File.dirname(__FILE__))
+
+module Gpx2png
+  class Ump < Osm
+
+    # Convert OSM/UMP tile coords to url
+    def self.url(zoom, coord, server = '3.')
+      x, y = coord
+      url = "http://#{server}tiles.ump.waw.pl/ump_tiles/#{zoom}/#{x}/#{y}.png"
+      return url
+    end
+
+    def self.licence_string
+      "Data by UMP-pcPL+SRTM"
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpx2exif
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000Z
+date: 2012-08-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18503860 !ruby/object:Gem::Requirement
+  requirement: &19750200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18503860
+  version_requirements: *19750200
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
-  requirement: &18503360 !ruby/object:Gem::Requirement
+  requirement: &19749640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18503360
+  version_requirements: *19749640
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &18502800 !ruby/object:Gem::Requirement
+  requirement: &19749100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18502800
+  version_requirements: *19749100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18502280 !ruby/object:Gem::Requirement
+  requirement: &19748580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *18502280
+  version_requirements: *19748580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18501740 !ruby/object:Gem::Requirement
+  requirement: &19748100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18501740
+  version_requirements: *19748100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18501240 !ruby/object:Gem::Requirement
+  requirement: &19747620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *18501240
+  version_requirements: *19747620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18500760 !ruby/object:Gem::Requirement
+  requirement: &19747100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18500760
+  version_requirements: *19747100
 description: Mass geotagger using GPX files.
 email: bobikx@poczta.fm
 executables:
@@ -121,6 +121,7 @@ files:
 - lib/gpx2png/osm_base.rb
 - lib/gpx2png/renderers/chunky_png_renderer.rb
 - lib/gpx2png/renderers/rmagick_renderer.rb
+- lib/gpx2png/ump.rb
 - lib/gpx_utils.rb
 - lib/gpx_utils/track_importer.rb
 - lib/gpx_utils/waypoints_exporter.rb
@@ -141,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1457558773610326867
+      hash: -3598611687449756095
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: