gpx2exif 0.1.1 → 0.1.3

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
+    builder (3.1.3)
     diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mini_exiftool (1.5.1)
+    mini_exiftool (1.6.0)
     multi_json (1.3.6)
     nokogiri (1.5.5)
     rake (0.9.2.2)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/gpx2png/assets/sample_marker.rb

@@ -0,0 +1,25 @@
+require 'base64'
+
+$:.unshift(File.dirname(__FILE__))
+
+# Sample marker useful for everybody :)
+module Gpx2png
+  class SampleMarker
+
+    STRING = "iVBORw0KGgoAAAANSUhEUgAAACAAAAA8CAYAAAAHbrgUAAAACXBIWXMAAAsT
+AAALEwEAmpwYAAAAB3RJTUUH3AoHCwYNWvFiNgAAAYxJREFUWMPtls9KAzEQ
+xr9d//QkgmjxKPQBVDwJYvEPXoQWfQ7Bm48hKL6AIhT6DIp3QaGC4KEnT0q1
+FxE8db2ksIRJNtlM1oPzg1A2O5v5Js23O4A/mwCuAPQB/KjRV3NNRKQOoAcg
+AzBSv/kxnnsCsMidfNmS2CRklSv5gkdyXUSdQ8Ajkdz2F+Sve6HJ1w2JPgC0
+AUyo0QIwMAjbCBFwqS06AvBpiR8Q8dchAl6Jig4t8W0i/i1EAHXAapb4KcMz
+RlIHAToJp7+LBDwTc/uWeOreS4jAM8IBQ4PwRLlDd8JFiIAtgw2H6jBOq3Gg
+3EHZcNeWIHE8iNRc4jBXmCN1ENAhRLgkygB0OQ5q0+MboI9tLrd8lUj+zWHD
+vBt8Oed8X8yV2IF57qbk1qMhuYvRku14VL8Xqy98L9iFca8QjSOH6o99Fizz
+Zcs410xLCDhltqs3M5btn0VFdIjer4sKWSKqb6BiblTl0V48Razkql/DH3EP
+4CFkgclAAScMawiCIAiCIAiCIAj/nF9mGvLkWeHRewAAAABJRU5ErkJggg=="
+
+    BLOB = Base64.decode64(STRING)
+
+    URL = "http://www.iconspedia.com/icon/map-marker-icon-19842.html"
+  end
+end

data/lib/gpx2png/osm.rb

@@ -13,6 +13,7 @@ module Gpx2png
       super
       @renderer ||= DEFAULT_RENDERER
       @r = nil
+      @markers = Array.new
     end
 
     def save(filename)
@@ -25,6 +26,10 @@ module Gpx2png
       @r.to_png
     end
 
+    def add_marker(p)
+      @markers << p
+    end
+
     def render
       setup_renderer
       initial_calculations

data/lib/gpx2png/osm_base.rb

@@ -242,7 +242,20 @@ module Gpx2png
         )
       end
 
-      #calculate_for_crop
+      # add points
+      @markers.each do |point|
+        lat = point[:lat]
+        lon = point[:lon]
+
+        p = self.class.point_on_image(@zoom, [lat, lon])
+        bitmap_x = (p[:osm_title_coord][0] - @tile_x_range.min) * TILE_WIDTH + p[:pixel_offset][0]
+        bitmap_y = (p[:osm_title_coord][1] - @tile_y_range.min) * TILE_HEIGHT + p[:pixel_offset][1]
+
+        point[:x] = bitmap_x
+        point[:y] = bitmap_y
+
+        @r.markers << point
+      end
     end
 
     # Calculate some numbers for cropping operation

data/lib/gpx2png/renderers/rmagick_renderer.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'RMagick'
+require 'gpx2png/assets/sample_marker'
 
 $:.unshift(File.dirname(__FILE__))
 
@@ -20,16 +21,33 @@ module Gpx2png
       @line.stroke_opacity(@opacity)
       @line.stroke_width(@width)
 
+      @marker_label = Magick::Draw.new
+      @marker_label.text_antialias(@aa)
+      @marker_label.font_family('helvetica')
+      @marker_label.font_style(Magick::NormalStyle)
+      @marker_label.text_align(Magick::LeftAlign)
+      @marker_label.pointsize(12)
+
+      @marker_frame = Magick::Draw.new
+      @marker_frame.stroke_antialias(@aa)
+      @marker_frame.stroke('black')
+      @marker_frame.stroke_opacity(0.3)
+      @marker_frame.fill('white')
+      @marker_frame.fill_opacity(0.3)
+
       @licence_text = Magick::Draw.new
       @licence_text.text_antialias(@aa)
       @licence_text.font_family('helvetica')
       @licence_text.font_style(Magick::NormalStyle)
       @licence_text.text_align(Magick::RightAlign)
       @licence_text.pointsize(12)
+
+      @markers = Array.new
     end
 
     attr_accessor :x, :y
     attr_accessor :licence_string
+    attr_accessor :markers
 
     # Create new (full) image
     def new_image
@@ -97,13 +115,71 @@ module Gpx2png
       @y = @new_y
     end
 
+    # Render only marker images, and perform some calculations
+    def render_markers
+      @markers.each do |p|
+        # using custom marker
+        _blob = p[:blob]
+        # or default
+        _blob = SampleMarker::BLOB if _blob.nil?
+
+        img_tile = Magick::Image.from_blob(_blob)[0]
+        p[:x_after_crop] = p[:x] - @crop_l.to_i
+        p[:y_after_crop] = p[:y] - @crop_t.to_i
+        p[:x_center] = p[:x_after_crop] - img_tile.columns / 2
+        p[:y_center] = p[:y_after_crop] - img_tile.rows / 2
+        p[:x_next_to_image] = p[:x_after_crop] + img_tile.columns
+
+        @image = @image.composite(
+          img_tile,
+          p[:x_center],
+          p[:y_center],
+          Magick::OverCompositeOp
+        )
+      end
+    end
+
+    # Render nice looking labels
+    def render_marker_labels
+      #http://www.simplesystems.org/RMagick/doc/draw.html#get_type_metrics
+      #http://rmagick.rubyforge.org/web2/web2-3.html
+
+      @markers.each do |p|
+        p[:x_label] = p[:x_after_crop] + 10
+        p[:y_label] = p[:y_after_crop] - 15
+
+        tm = @marker_label.get_type_metrics(@image, p[:label])
+        p[:text_width] = tm.width
+        p[:text_height] = tm.height
+        p[:text_padding] = 3
+
+        @marker_frame.rectangle(
+          p[:x_label],
+          p[:y_label],
+          p[:x_label] + p[:text_width] + p[:text_padding] * 2,
+          p[:y_label] + p[:text_height] + p[:text_padding] * 2
+        )
+        # text
+        @marker_label.text(p[:x_label] + p[:text_padding], p[:y_label] + p[:text_padding] + 12, p[:label].to_s + " ")
+      end
+
+      @marker_frame.draw(@image)
+      @marker_label.draw(@image)
+    end
+
     def render
       @line.draw(@image)
+
       # crop after drawing lines, before drawing "legend"
       crop!
+
       # "static" elements
       @licence_text.text(@x - 10, @y - 10, @licence_string)
       @licence_text.draw(@image)
+
+      # draw point images
+      render_markers
+      render_marker_labels
     end
 
     def save(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gpx2exif
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000Z
+date: 2012-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19750200 !ruby/object:Gem::Requirement
+  requirement: &16633900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19750200
+  version_requirements: *16633900
 - !ruby/object:Gem::Dependency
   name: mini_exiftool
-  requirement: &19749640 !ruby/object:Gem::Requirement
+  requirement: &16633240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19749640
+  version_requirements: *16633240
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &19749100 !ruby/object:Gem::Requirement
+  requirement: &16632640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19749100
+  version_requirements: *16632640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19748580 !ruby/object:Gem::Requirement
+  requirement: &16626120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *19748580
+  version_requirements: *16626120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19748100 !ruby/object:Gem::Requirement
+  requirement: &16625620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19748100
+  version_requirements: *16625620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19747620 !ruby/object:Gem::Requirement
+  requirement: &16625080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *19747620
+  version_requirements: *16625080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &19747100 !ruby/object:Gem::Requirement
+  requirement: &16624580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19747100
+  version_requirements: *16624580
 description: Mass geotagger using GPX files.
 email: bobikx@poczta.fm
 executables:
@@ -115,8 +115,8 @@ files:
 - lib/geotagger/geotagger.rb
 - lib/geotagger/track_importer.rb
 - lib/gpx2exif.rb
+- lib/gpx2png/assets/sample_marker.rb
 - lib/gpx2png/base.rb
-- lib/gpx2png/gpx2png.rb
 - lib/gpx2png/osm.rb
 - lib/gpx2png/osm_base.rb
 - lib/gpx2png/renderers/chunky_png_renderer.rb
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3598611687449756095
+      hash: -1136394423762975328
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/gpx2png/gpx2png.rb

@@ -1,210 +0,0 @@
-require 'rubygems'
-require 'chunky_png'
-require 'net/http'
-require "uri"
-
-
-$:.unshift(File.dirname(__FILE__))
-
-module Gpx2png
-  class Gpx2png
-
-    TILE_WIDTH = 256
-    TILE_HEIGHT = 256
-
-    def initialize
-      @coords = Array.new
-      @zoom = 9
-      @color = ChunkyPNG::Color.from_hex('#FF0000')
-    end
-
-    def add(lat, lon)
-      @coords << { lat: lat, lon: lon }
-    end
-
-    attr_accessor :zoom, :color, :coords
-
-    def dev
-      zoom = 15
-      @coords.collect { |c|
-        {
-          url: self.class.url(zoom, [c[:lat], c[:lon]]),
-          tile: self.class.convert(zoom, [c[:lat], c[:lon]]),
-          return: self.class.reverse_convert(zoom,
-                                             self.class.convert(zoom, [c[:lat], c[:lon]])
-          ),
-          point: self.class.point_on_image(zoom, [c[:lat], c[:lon]])
-        }
-      }
-    end
-
-    def to_png(filename)
-      download_and_join_tiles
-      @full_image.save(filename)
-      filename
-    end
-
-    # http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#X_and_Y
-    def self.convert(zoom, coord)
-      lat_deg, lon_deg = coord
-      lat_rad = deg2rad(lat_deg)
-      x = (((lon_deg + 180) / 360) * (2 ** zoom)).floor
-      y = ((1 - Math.log(Math.tan(lat_rad) + 1 / Math.cos(lat_rad)) / Math::PI) /2 * (2 ** zoom)).floor
-
-      return [x, y]
-    end
-
-    def self.url_convert(zoom, coord, server = 'b.')
-      x, y = convert(zoom, coord)
-      url(zoom, [x, y], server)
-    end
-
-    def self.url(zoom, coord, server = 'b.')
-      x, y = coord
-      url = "http://#{server}tile.openstreetmap.org\/#{zoom}\/#{x}\/#{y}.png"
-      return url
-    end
-
-    # top-left corner
-    def self.reverse_convert(zoom, coord)
-      x, y = coord
-      n = 2 ** zoom
-      lon_deg = x.to_f / n.to_f * 360.0 - 180.0
-      lat_deg = rad2deg(Math.atan(Math.sinh(Math::PI * (1.to_f - 2.to_f * y.to_f / n.to_f))))
-      return [lat_deg, lon_deg]
-    end
-
-    # return where you should put point on tile
-    def self.point_on_image(zoom, geo_coord)
-      osm_tile_coord = convert(zoom, geo_coord)
-      top_left_corner = reverse_convert(zoom, osm_tile_coord)
-      bottom_right_corner = reverse_convert(zoom, [
-        osm_tile_coord[0] + 1, osm_tile_coord[1] + 1
-      ])
-
-      # some line y = ax + b math
-
-      x_geo = geo_coord[1]
-      # offset
-      x_offset = x_geo - top_left_corner[1]
-      # scale
-      x_distance = (bottom_right_corner[1] - top_left_corner[1])
-      x = (TILE_WIDTH.to_f * (x_offset / x_distance)).round
-
-      y_geo = geo_coord[0]
-      # offset
-      y_offset = y_geo - top_left_corner[0]
-      # scale
-      y_distance = (bottom_right_corner[0] - top_left_corner[0])
-      y = (TILE_HEIGHT.to_f * (y_offset / y_distance)).round
-
-      return { osm_title_coord: osm_tile_coord, pixel_offset: [x, y] }
-    end
-
-
-    attr_reader :lat_min, :lat_max, :lon_min, :lon_max
-    attr_reader :tile_x_distance, :tile_y_distance
-
-    def download_and_join_tiles
-      @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
-
-      @border_tiles = [
-        self.class.convert(@zoom, [@lat_min, @lon_min]),
-        self.class.convert(@zoom, [@lat_max, @lon_max])
-      ]
-
-      @tile_x_range = (@border_tiles[0][0])..(@border_tiles[1][0])
-      @tile_y_range = (@border_tiles[1][1])..(@border_tiles[0][1])
-
-      # new image
-      @full_image_x = (1 + @tile_x_range.max - @tile_x_range.min) * TILE_WIDTH
-      @full_image_y = (1 + @tile_y_range.max - @tile_y_range.min) * TILE_HEIGHT
-      puts "Output image dimension #{@full_image_x}x#{@full_image_y}"
-      @full_image = ChunkyPNG::Image.new(
-        @full_image_x,
-        @full_image_y,
-        ChunkyPNG::Color::WHITE
-      )
-
-      # {:x, :y, :blob}
-      @images = Array.new
-
-      @tile_x_range.each do |x|
-        @tile_y_range.each do |y|
-          url = self.class.url(@zoom, [x,y])
-
-          # blob time
-          uri = URI.parse(url)
-          response = Net::HTTP.get_response(uri)
-          blob = response.body
-          image = ChunkyPNG::Image.from_blob(blob)
-
-          @images << {
-            url: url,
-            image: image,
-            x: x,
-            y: y
-          }
-
-          # compose image
-          x_offset = (x - @tile_x_range.min) * TILE_WIDTH
-          y_offset = (y - @tile_y_range.min) * TILE_HEIGHT
-          @full_image.compose!(
-            image,
-            x_offset,
-            y_offset
-          )
-          
-          puts "processed #{x - @tile_x_range.min}x#{y - @tile_y_range.min} (max #{@tile_x_range.max - @tile_x_range.min}x#{@tile_y_range.max - @tile_y_range.min})"
-        end
-      end
-
-      # sweet, image is joined
-
-      # add some coords to the map
-      (1...@coords.size).each do |i|
-        lat_from = @coords[i-1][:lat]
-        lon_from = @coords[i-1][:lon]
-
-        lat_to = @coords[i][:lat]
-        lon_to = @coords[i][:lon]
-
-        point_from = self.class.point_on_image(@zoom, [lat_from, lon_from])
-        point_to = self.class.point_on_image(@zoom, [lat_to, lon_to])
-        # { osm_title_coord: osm_tile_coord, pixel_offset: [x, y] }
-
-        # first point
-        bitmap_xa = (point_from[:osm_title_coord][0] - @tile_x_range.min) * TILE_WIDTH + point_from[:pixel_offset][0]
-        bitmap_ya = (point_from[:osm_title_coord][1] - @tile_y_range.min) * TILE_HEIGHT + point_from[:pixel_offset][1]
-        bitmap_xb = (point_to[:osm_title_coord][0] - @tile_x_range.min) * TILE_WIDTH + point_to[:pixel_offset][0]
-        bitmap_yb = (point_to[:osm_title_coord][1] - @tile_y_range.min) * TILE_HEIGHT + point_to[:pixel_offset][1]
-
-        @full_image.line(
-          bitmap_xa, bitmap_ya,
-          bitmap_xb, bitmap_yb,
-          @color
-        )
-
-      end
-    end
-
-    def expand_map
-      # TODO expand min and max ranges
-    end
-
-
-    # Some math stuff
-    def self.rad2deg(rad)
-      return rad * 180.0 / Math::PI
-    end
-
-    def self.deg2rad(deg)
-      return deg * Math::PI / 180.0
-    end
-
-
-  end
-end