map_print 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 071baa0acdcea17783abc5c2a0cd40b5a7bead82
-  data.tar.gz: 397e7e367a66af93f2abc590aaf462fb4afa94d5
+  metadata.gz: 0b7f7ff077bdc65127a96cb126451677f4f8317f
+  data.tar.gz: 0fb0c8560df44020151c117670206c3593acc3a8
 SHA512:
-  metadata.gz: e77dcb704714848b51dc7a2bde3f0e0c42557a0735284f005cccdf3608395e33b93f7ac2bfaefa27e508d26a947c5e71d971bff3f3032060829a4d2d0836fccc
-  data.tar.gz: 4afb485eb8225eec40a8d50d8853f4f8d456df08e1b87a610b9acf6fc89f833873a6d81fc80e71f8afc52a182a01bd1e50d81c6bfed58fba10e0f9f92899d63b
+  metadata.gz: c4100a81072048511823a1ba2cd7b3e10779b24f0493cb7fe22cdf4d1455c255fc2ef767f3b079268e4a1dc0a845500d3c16752ecf37d4a8e4065f3b6ae02967
+  data.tar.gz: 75daabd87f3a99af524f38cd73806ad4c433efb39460d0e01f76992d4d4059131a6ba7f7141f96ad74103864d1547b03b810c9d78883d92f26ceecf502b141d6

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1
+  - 2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    map_print (0.9.0)
+    map_print (1.0.0)
       mini_magick (~> 4.3)
       parallel (~> 1.6)
       prawn (~> 2.0)

data/lib/map_print/core.rb

@@ -58,6 +58,7 @@ module MapPrint
       if @map[:geojson]
         geojson_image = GeoJSONHandler.new(@map[:geojson], @map[:sw], @map[:ne], map_image.width, map_image.height).process
         result = MiniMagick::Image.open(map_image.path).composite(geojson_image) do |c|
+          c.density 300
           c.compose "atop"
         end
         result.write map_image.path

data/lib/map_print/exceptions.rb

@@ -1,13 +1,14 @@
 module MapPrint
+  class FeatureNotImplemented < StandardError; end
+
   class GeoJSONHandlerError < StandardError; end
   class InvalidGeoJSON < GeoJSONHandlerError; end
   class NoPointImage < GeoJSONHandlerError; end
   class NoGeometryPresent < GeoJSONHandlerError; end
-  class FeatureNotImplemented < GeoJSONHandlerError; end
 
   class LegendHandlerError < StandardError; end
   class NoLegendData < LegendHandlerError; end
-  class InvalidSize < LegendHandlerError; end
+  class InvalidLegendSize < LegendHandlerError; end
   class MissingLayoutInformation < LegendHandlerError; end
 
   class ScalebarHandlerError < StandardError; end

data/lib/map_print/geo_json_handler.rb

@@ -4,9 +4,9 @@ module MapPrint
   class GeoJSONHandler
     def initialize(geojson, sw, ne, width, height)
       @top_lat = ne[:lat]
-      @total_lat = ne[:lat] - sw[:lat]
+      @total_lat = (ne[:lat] - sw[:lat])
       @left_lng = sw[:lng]
-      @total_lng = ne[:lng] - sw[:lng]
+      @total_lng = (ne[:lng] - sw[:lng])
       @height = height
       @width = width
       @geojson = JSON[geojson]
@@ -16,7 +16,7 @@ module MapPrint
 
     def process
       tempfile = Tempfile.new ['geojson', '.png']
-      `convert -size #{@width}x#{@height} xc:transparent #{tempfile.path}`
+      `convert -density 300 -size #{@width}x#{@height} xc:transparent #{tempfile.path}`
       @image = MiniMagick::Image.new tempfile.path
 
       draw_geojson
@@ -53,13 +53,13 @@ module MapPrint
       when 'Polygon'
         polygon(geometry, properties)
       when 'MultiPoint'
-        multi_point(geometry, properties)
+        raise FeatureNotImplemented.new("Please consider contributing!")
       when 'MultiLineString'
-        multi_line_string(geometry, properties)
+        raise FeatureNotImplemented.new("Please consider contributing!")
       when 'MultiPolygon'
-        multi_polygon(geometry, properties)
+        raise FeatureNotImplemented.new("Please consider contributing!")
       when 'GeometryCollection'
-        geometry_collection(geometry, properties)
+        raise FeatureNotImplemented.new("Please consider contributing!")
       else
         Logger.warn "Feature type '#{geometry['type']}' not implemented!"
       end
@@ -74,22 +74,25 @@ module MapPrint
     end
 
     def point(point, image_path)
-      x = get_x(point['coordinates'][1])
-      y = get_y(point['coordinates'][0])
+      x = get_x(point['coordinates'][0])
+      y = get_y(point['coordinates'][1])
 
       point_image = MiniMagick::Image.open(image_path)
       x -= point_image.width / 2
       y -= point_image.height / 2
 
       @image.composite(point_image) do |c|
+        c.density 300
         c.geometry("+#{x}+#{y}")
       end.write @image.path
     end
 
     def line_string(geometry, properties)
       properties ||= {}
-      points = geometry['coordinates'].map do |coord|
-        "#{get_x(coord[1])},#{get_y(coord[0])}"
+      coords = geometry['coordinates']
+      coords = coords.first if coords.first.first.is_a?(Array)
+      points = coords.map do |coord|
+        "#{get_x(coord[0])},#{get_y(coord[1])}"
       end
 
       draw_command = (0..(points.length - 2)).map do |i|
@@ -97,37 +100,25 @@ module MapPrint
       end.join(' ')
 
       @image.combine_options do |c|
+        c.density 300
         c.draw "#{draw_options(properties)} #{draw_command}"
       end
     end
 
     def polygon(geometry, properties)
       properties ||= {}
-      points = geometry['coordinates'].map do |coord|
-        "#{get_x(coord[1])},#{get_y(coord[0])}"
+      coords = geometry['coordinates']
+      coords = coords.first if coords.first.first.is_a?(Array)
+      points = coords.map do |coord|
+        "#{get_x(coord[0])},#{get_y(coord[1])}"
       end
 
       @image.combine_options do |c|
+        c.density 300
         c.draw "#{draw_options(properties, false)} polygon #{points.join(' ')}"
       end
     end
 
-    def multi_point(geometry, properties)
-      raise FeatureNotImplemented.new("Please consider contributing!")
-    end
-
-    def multi_line_string(geometry, properties)
-      raise FeatureNotImplemented.new("Please consider contributing!")
-    end
-
-    def multi_polygon(geometry, properties)
-      raise FeatureNotImplemented.new("Please consider contributing!")
-    end
-
-    def geometry_collection(geometry, properties)
-      raise FeatureNotImplemented.new("Please consider contributing!")
-    end
-
     def draw_options(properties, line=true)
       options = ''
       if properties['stroke'] || properties['stroke'].nil?
@@ -153,7 +144,7 @@ module MapPrint
     end
 
     def get_y(lat)
-      @height * (1 - (@top_lat - lat) / @total_lat);
+      @height * (@top_lat - lat) / @total_lat;
     end
   end
 end

data/lib/map_print/lat_lng.rb

@@ -6,11 +6,12 @@ module MapPrint
 
     class << self
       def distance_between(from, to)
-        return 0.0 if from == to # fixes a "zero-distance" bug
+        return 0.0 if from.lat == to.lat && from.lng == to.lng
 
         distance_between_sphere(from, to)
       end
 
+      private
       def distance_between_sphere(from, to)
         lat_sin = Math.sin(deg2rad(from.lat)) * Math.sin(deg2rad(to.lat))
         lat_cos = Math.cos(deg2rad(from.lat)) * Math.cos(deg2rad(to.lat))

data/lib/map_print/layer_handler.rb

@@ -28,6 +28,7 @@ module MapPrint
         next_image.close
         tmp_image = MiniMagick::Image.open(next_image.path)
         result = image.composite(tmp_image) do |c|
+          c.density 300
           c.compose "atop"
           if layer[:opacity] && layer[:opacity] < 1
             c.blend layer[:opacity] * 100

data/lib/map_print/legend_handler.rb

@@ -1,21 +1,32 @@
+require_relative 'png_handlers/texts'
+require_relative 'validations/size'
+
 module MapPrint
   class LegendHandler
+    include PngHandlers::Texts
+    include Validations::Size
+
     def initialize(legend)
       @legend = legend
       validate_data!
+      @x_step = @legend[:size][:width] / @legend[:columns]
+      @y_step = @legend[:size][:height] / @legend[:rows]
+      @elements_in_block = @legend[:orientation] == 'vertical' ? @legend[:rows] : @legend[:columns]
+      @legend[:textbox_style] ||= {}
+
+      if @legend[:textbox_size]
+        @legend[:textbox_style][:size] = "#{@legend[:textbox_size][:width]}x#{@legend[:textbox_size][:height]}"
+      end
     end
 
     def process
       size = @legend[:size]
       tempfile = Tempfile.new ['legend', '.png']
-      `convert -size #{size[:width]}x#{size[:height]} xc:white #{tempfile.path}`
+      `convert -density 300 -size #{size[:width]}x#{size[:height]} xc:white #{tempfile.path}`
       image = MiniMagick::Image.new tempfile.path
 
-      x_step = size[:width] / @legend[:columns]
-      y_step = size[:height] / @legend[:rows]
       image_geometry = ''
       textbox_offset = 0
-      text_size = "#{@legend[:textbox_size][:width]}x#{@legend[:textbox_size][:height]}" if @legend[:textbox_size]
 
       if @legend[:image_size]
         image_geometry += "#{@legend[:image_size][:width]}x#{@legend[:image_size][:height]}"
@@ -23,24 +34,23 @@ module MapPrint
       end
       textbox_offset += @legend[:textbox_offset] if @legend[:textbox_offset]
 
-      if @legend[:orientation] == 'vertical'
-        print_vertical(image, x_step, y_step, image_geometry, textbox_offset, text_size)
-      else
-        print_horizontal(image, x_step, y_step, image_geometry, textbox_offset, text_size)
-      end
+      print(image, image_geometry, textbox_offset)
       image
     end
 
     private
     def validate_data!
       raise NoLegendData.new('No legend data present') if @legend.nil? || @legend.empty?
-      raise InvalidSize.new('No legend width present') unless @legend[:size] && @legend[:size][:width]
-      raise InvalidSize.new('No legend height present') unless @legend[:size][:height]
+      validate_size!(@legend[:size], InvalidLegendSize)
+      validate_layout!
+    end
+
+    def validate_layout!
       raise MissingLayoutInformation.new('Missing column layout information') unless @legend[:columns]
       raise MissingLayoutInformation.new('Missing rows layout information') unless @legend[:rows]
     end
 
-    def print_vertical(legend_image, x_step, y_step, image_geometry, textbox_offset, text_size)
+    def print(legend_image, image_geometry, textbox_offset)
       return unless @legend[:elements].is_a?(Array)
       x = 0
       y = 0
@@ -49,60 +59,38 @@ module MapPrint
       @legend[:elements].each do |legend_item|
         image_file = MiniMagick::Image.open(legend_item[:image])
         result = legend_image.composite(image_file) do |c|
+          c.density 300
           c.geometry image_geometry + "+#{x}+#{y}"
         end
         result.write legend_image.path
 
         position = "#{x + textbox_offset},#{y}"
-        draw_text(legend_image, legend_item[:text], position, text_size)
+        draw_text(legend_image, legend_item[:text], position, @legend[:textbox_style])
 
-        if z % @legend[:rows] == 0
-          x += x_step
-          y = 0
-        else
-          y += y_step
-        end
+        x, y = get_next_x_y(x, y, z)
         z += 1
       end
     end
 
-    def print_horizontal(legend_image, x_step, y_step, image_geometry, textbox_offset, text_size)
-      return unless @legend[:elements].is_a?(Array)
-      x = 0
-      y = 0
-      z = 1
-
-      @legend[:elements].each do |legend_item|
-        image_file = MiniMagick::Image.open(legend_item[:image])
-        result = legend_image.composite(image_file) do |c|
-          c.geometry image_geometry + "+#{x}+#{y}"
-        end
-        result.write legend_image.path
-
-        position = "#{x + textbox_offset},#{y}"
-        draw_text(legend_image, legend_item[:text], position, text_size)
-
-        if z % @legend[:columns] == 0
-          y += y_step
-          x = 0
-        else
-          x += x_step
-        end
-        z += 1
+    def get_next_x_y(x, y, z)
+      if @legend[:orientation] == 'vertical'
+        y, x = next_step(y, x, @y_step, @x_step, z)
+      else
+        x, y = next_step(x, y, @x_step, @y_step, z)
       end
+
+      return x, y
     end
 
-    def draw_text(image, text, position, text_size)
-      options = @legend[:textbox_style] || {}
-      image.combine_options do |c|
-        c.fill options[:fill_color] if options[:fill_color]
-        c.stroke options[:color] if options[:color]
-        c.font options[:font] || 'Arial'
-        c.pointsize options[:pointsize] if options[:pointsize]
-        c.gravity options[:gravity] || 'NorthWest'
-        c.size text_size
-        c.draw "text #{position} '#{text}'"
+    def next_step(small_step_value, big_step_value, small_step, big_step, z)
+      if z % @elements_in_block == 0
+        big_step_value += big_step
+        small_step_value = 0
+      else
+        small_step_value += small_step
       end
+
+      return small_step_value, big_step_value
     end
   end
 end

data/lib/map_print/logger.rb

@@ -5,6 +5,8 @@ module MapPrint
   class Logger
     include Singleton
 
+    attr_accessor :logger
+
     def initialize
       @logger = ::Logger.new File.new('map_print.log', 'a+')
     end

data/lib/map_print/png_handler.rb

@@ -13,7 +13,7 @@ module MapPrint
     def print
       raise ParameterError.new('Missing png_options width attribute') unless @context.png_options && @context.png_options[:width]
       raise ParameterError.new('Missing png_options height attribute') unless @context.png_options[:height]
-      `convert -size #{@context.png_options[:width]}x#{@context.png_options[:height]} xc:#{@context.png_options[:background_color] || 'transparent'} #{@context.output_path}`
+      `convert -density 300 -size #{@context.png_options[:width]}x#{@context.png_options[:height]} xc:#{@context.png_options[:background_color] || 'transparent'} #{@context.output_path}`
       @png = MiniMagick::Image.new @context.output_path
 
       print_map
@@ -53,6 +53,7 @@ module MapPrint
       geometry += "+#{position[:x] || 0}+#{position[:y] || 0}" if position
 
       result = @png.composite(image) do |c|
+        c.density 300
         c.geometry geometry unless geometry.nil? || geometry.empty?
       end
       result.write @context.output_path

data/lib/map_print/png_handlers/images.rb

@@ -10,6 +10,7 @@ module MapPrint
           geometry += "+#{image[:position][:x]}+#{image[:position][:y]}"
           result = png.composite(image_file) do |c|
             c.geometry geometry
+            c.density 300
           end
           result.write @context.output_path
         end

data/lib/map_print/png_handlers/texts.rb

@@ -11,14 +11,22 @@ module MapPrint
 
       def draw_text(png, text, position, options)
         png.combine_options do |c|
-          c.fill options[:fill_color] if options[:fill_color]
-          c.stroke options[:color] if options[:color]
-          c.font options[:font] || 'Arial'
-          c.pointsize options[:pointsize] if options[:pointsize]
-          c.gravity options[:gravity] || 'NorthWest'
+          c.density 300
+          sanitize_options(options).each do |option, value|
+            c.send option, value
+          end
           c.draw "text #{position} '#{text}'"
         end
       end
+
+      def sanitize_options(options)
+        return {} unless options.is_a?(Hash)
+        options[:stroke] = options.delete :color if options[:color]
+        options[:fill] = options.delete :fill_color if options[:fill_color]
+        options[:gravity] ||= 'NorthWest'
+        options[:font] ||= 'Arial'
+        options
+      end
     end
   end
 end

data/lib/map_print/providers/base.rb

@@ -28,6 +28,7 @@ module MapPrint
 
         MiniMagick::Tool::Montage.new do |montage|
           montage.mode('concatenate')
+          montage.density 300
           montage.tile("#{provider.x_size}x#{provider.y_size}")
           montage.merge! provider.tiles.collect(&:file_path)
           montage << file.path

data/lib/map_print/scalebar_handler.rb

@@ -1,7 +1,10 @@
 require_relative 'png_handlers/texts'
+require_relative 'validations/size'
+
 module MapPrint
   class ScalebarHandler
-    include MapPrint::PngHandlers::Texts
+    include PngHandlers::Texts
+    include Validations::Size
 
     ZOOM_METERS_PER_PIXEL = {
       0 => 156543.03,
@@ -52,6 +55,7 @@ module MapPrint
 
       y_position = size[:height] - (@scalebar[:bar_height] || 10) - @padding_bottom
       image.combine_options do |c|
+        c.density 300
         c.stroke 'black'
         c.fill 'white'
         c.draw "rectangle #{@padding_left},#{size[:height] - @padding_bottom} #{@padding_left + quarter},#{y_position}"
@@ -63,7 +67,7 @@ module MapPrint
         c.draw "rectangle #{@padding_left + 3*quarter},#{size[:height] - @padding_bottom} #{@padding_left + 4*quarter},#{y_position}"
       end
 
-      text_options = { pointsize: 12, gravity: 'NorthWest' }
+      text_options = { pointsize: 4, gravity: 'NorthWest' }
       draw_text(image, "0", "#{@padding_left},#{@padding_top}", text_options)
       draw_text(image, (pixels_for_distance/4).round(-2).to_s, "#{-quarter + @padding_left - @padding_right},#{@padding_top}", text_options.merge(gravity: 'North'))
       draw_text(image, (pixels_for_distance/2).round(-2).to_s, "#{@padding_left - @padding_right},#{@padding_top}", text_options.merge(gravity: 'North'))
@@ -75,9 +79,8 @@ module MapPrint
     private
     def validate_data!
       raise NoScalebarData.new('No scalebar data present') if @scalebar.nil? || @scalebar.empty?
-      raise InvalidScalebarSize.new('No scalebar width present') unless @scalebar[:size] && @scalebar[:size][:width]
-      raise InvalidScalebarSize.new('No scalebar height present') unless @scalebar[:size][:height]
       raise InvalidScalebarZoom.new('Zoom must be between 0..18') unless (0..18).include?(@zoom)
+      validate_size!(@scalebar[:size], InvalidScalebarSize)
     end
 
     def get_distance_in_units

data/lib/map_print/tiles/tile.rb

@@ -3,37 +3,6 @@ require 'fileutils'
 
 module MapPrint
   class Tile
-
-    METERS_PER_PIXELS = {
-      0 => 26862156543.031,
-      1 => 8078271.521,
-      2 => 7739135.761,
-      3 => 6919567.881,
-      4 => 889783.941,
-      5 => 214891.9771,
-      6 => 222445.9801721,
-      7 => 161731222.991,
-      8 => 11611.5001,
-      9 => 52305.751,
-      10 => 152.871,
-      11 => 76.4371,
-      12 => 38.2191,
-      13 => 519.1091,
-      14 => 9.55461,
-      15 => 4.77731,
-      16 => 2.38871,
-      17 => 1.19431,
-      18 => 0.5972
-    }
-
-    class << self
-
-      def meters_per_pixel(zoom)
-        METERS_PER_PIXELS[zoom]
-      end
-
-    end
-
     def initialize(x, y, z, base_url)
       @base_url = base_url
       @x = x
@@ -52,15 +21,6 @@ module MapPrint
       end
     end
 
-    def get_pixel_difference(lat_lng)
-      tile_lat_lng = tile_number_to_lat_lng
-
-      x_pixels = lat_lng.distance_to(LatLng.new(lat_lng.lat, tile_lat_lng[:lng])) / METERS_PER_PIXELS[@z]
-      y_pixels = lat_lng.distance_to(LatLng.new(tile_lat_lng[:lat], lat_lng.lng)) / METERS_PER_PIXELS[@z]
-
-      { x: x_pixels, y: y_pixels }
-    end
-
     def tile_number_to_lat_lng
       n = 2.0 ** @z
       lon_deg = @x / n * 360.0 - 180.0
@@ -99,7 +59,5 @@ module MapPrint
     def folder_name
       "cache/#{cache_name}/#{@z}/#{@x}"
     end
-
   end
-
 end

data/lib/map_print/tiles/tile_factory.rb

@@ -61,19 +61,17 @@ module MapPrint
     end
 
     def x_array
-      return @x_array if @x_array
-
-      x1 = @sw_lat_lng.get_slippy_map_tile_number(@zoom)[:x]
-      x2 = @ne_lat_lng.get_slippy_map_tile_number(@zoom)[:x]
-      @x_array ||= x1 < x2 ? x1..x2 : (x2..x1).to_a
+      @x_array ||= get_tile_coord_array(:x)
     end
 
     def y_array
-      return @y_array if @y_array
+      @y_array ||= get_tile_coord_array(:y)
+    end
 
-      y1 = @sw_lat_lng.get_slippy_map_tile_number(@zoom)[:y]
-      y2 = @ne_lat_lng.get_slippy_map_tile_number(@zoom)[:y]
-      @y_array ||= y1 < y2 ? y1..y2 : (y2..y1).to_a
+    def get_tile_coord_array(coord)
+      coord1 = @sw_lat_lng.get_slippy_map_tile_number(@zoom)[coord]
+      coord2 = @ne_lat_lng.get_slippy_map_tile_number(@zoom)[coord]
+      coord1 < coord2 ? coord1..coord2 : coord2..coord1
     end
 
     def tile_class

data/lib/map_print/validations/size.rb

@@ -0,0 +1,10 @@
+module MapPrint
+  module Validations
+    module Size
+      def validate_size!(size, exception)
+        raise exception.new('No width present') unless size && size[:width]
+        raise exception.new('No height present') unless size[:height]
+      end
+    end
+  end
+end

data/lib/map_print/version.rb

@@ -1,3 +1,3 @@
 module MapPrint
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

data/map_print.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Andreas Fast']
   spec.email         = ['andis.machine@gmail.com']
 
-  spec.summary       = %q{Easily export maps to pdf}
-  spec.description   = %q{MapPrint allows to export many map sources and GeoJSON objects to a pdf file, along with legend and text elements to create rich maps.}
+  spec.summary       = %q{Easily export maps to pdf or png}
+  spec.description   = %q{MapPrint allows to export many map sources and GeoJSON objects to a pdf/png file, along with legend and text elements to create rich maps.}
   spec.homepage      = 'http://github.com/afast/map_print'
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: map_print
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andreas Fast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-description: MapPrint allows to export many map sources and GeoJSON objects to a pdf
+description: MapPrint allows to export many map sources and GeoJSON objects to a pdf/png
   file, along with legend and text elements to create rich maps.
 email:
 - andis.machine@gmail.com
@@ -182,9 +182,9 @@ files:
 - lib/map_print/tiles/osm_tile.rb
 - lib/map_print/tiles/tile.rb
 - lib/map_print/tiles/tile_factory.rb
+- lib/map_print/validations/size.rb
 - lib/map_print/version.rb
 - map_print.gemspec
-- minimum_map.pdf
 homepage: http://github.com/afast/map_print
 licenses:
 - MIT
@@ -209,5 +209,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Easily export maps to pdf
+summary: Easily export maps to pdf or png
 test_files: []