map_print 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139b682f39bdac95f76c9c486a146dc16376e0f6
-  data.tar.gz: 6df45284cb99894a860474e60b8443cbe4adf458
+  metadata.gz: b403565fd160476de9c6c7bc64b96f87168c0709
+  data.tar.gz: 2acbf3eea43cc28719c4d50270de1ad244fb4b37
 SHA512:
-  metadata.gz: 5ecda32b632e257d4e79bd22900480796e2bb0f3167de4c5b53661902a923b8508314be59e69b6dd1b23e0a24638cd22f8eca0ae31954c59ada553d7b190ad57
-  data.tar.gz: 298ed01e24f773854d869243140641f33a5982fc640a504a3c3aa958cb9f79bb08d289a3ac77af272bf8ab57f130c45b6e6c10756c893f4903ea025b83965640
+  metadata.gz: 96ae6bc8c7a4d0b81539616ce93b8c0cd13f1288b70e7fa20d9f24de5f6207d24665bd651a534d592d73b8e04441d92b8a6e9053716e8fb642c5df8b7b2af246
+  data.tar.gz: 1a347d350da58f79f5336f13ab07efbea01ca0e28be37233a947d26ac670479e112e355db05daacb1c85fa664d690532c49611126959d522edac6d3f6a47a6d8

data/README.md

@@ -1,5 +1,7 @@
 # MapPrint
 
+[![Gem Version](https://badge.fury.io/rb/map_print.svg)](https://badge.fury.io/rb/map_print)
+
 MapPrint allows for exporting many map sources and GeoJSON to a pdf file. Allowing to specify map element, text/image elements as well as printing a legend with the reference and a scale bar.
 
 ## Installation

data/lib/map_print/core.rb

@@ -50,7 +50,10 @@ module MapPrint
 
       FileUtils.cp map_image.path, './map.png' if defined?(DEBUG)
 
-      pdf.image map_image.path, at: [@map[:position][:x], pdf.bounds.top - @map[:position][:y]]
+      size = @map[:size]
+      size[:width] ||= map_image.width
+      size[:height] ||= map_image.height
+      pdf.image map_image.path, at: [@map[:position][:x], pdf.bounds.top - @map[:position][:y]], fit: size.values
 
       print_images_on_pdf(pdf)
       print_texts_on_pdf(pdf)
@@ -68,6 +71,14 @@ module MapPrint
       print_texts_on_png(map_image)
       print_legend_on_png(map_image)
 
+      size = @map[:size]
+      if size
+        size[:width] ||= map_image.width
+        size[:height] ||= map_image.height
+        puts "Fitting map image (#{map_image.width}x#{map_image.height}) in #{size[:width]}x#{size[:height]}"
+        map_image.colorspace("RGB").resize("#{size[:width]}x#{size[:height]}\>").colorspace("sRGB").unsharp "0x0.75+0.75+0.008"
+      end
+
       FileUtils.cp map_image.path, @output_path
     end
 
@@ -81,17 +92,8 @@ module MapPrint
 
     def print_layers
       file = LayerHandler.new(@map[:layers], @map[:sw], @map[:ne], @map[:zoom]).process
-      size = @map[:size]
-
-      FileUtils.cp file.path, 'layers.png' if defined?DEBUG
 
-      if size
-        image = MiniMagick::Image.new(file.path)
-        size[:width] ||= image.width
-        size[:height] ||= image.height
-        puts "Fitting map image (#{image.width}x#{image.height}) in #{size[:width]}x#{size[:height]}"
-        image.colorspace("RGB").resize("#{size[:width]}x#{size[:height]}\>").colorspace("sRGB").unsharp "0x0.75+0.75+0.008"
-      end
+      FileUtils.cp file.path, 'layers.png' if defined?(DEBUG)
 
       file
     end

data/lib/map_print/version.rb

@@ -1,3 +1,3 @@
 module MapPrint
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: map_print
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andreas Fast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler