map_print 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc0124c6e8b0ca5bae918c8306ff3057f8d400e
-  data.tar.gz: 0c47173c8d8a2079d54a6775ee738f3f9a50a233
+  metadata.gz: cc968d11e40e86fdaa3559d6093c39f994f9ae41
+  data.tar.gz: 9659ed13e55f82993d8e386715ea2cfb42f25d79
 SHA512:
-  metadata.gz: 2a3fc9ee3d584924d37ac49a68319a9827f9c4b3a00718c5f77d81ee969b0ddacec7ba30626fca03fb04e527c68ee206c2cf3cc0fd5f0d4ff2a16f5c129f17da
-  data.tar.gz: 36f8e4882219e98149d3750d778e25292d277198a13b21c5e4b0f6c39d50486627105d2bba0bdfe1a6dc63967fb6dfee58892b3b854632f3f37df37dbbac1c26
+  metadata.gz: 88d26aaac1871cdc2402c2977d28abe57e6394a34c4a0e0b4eb6fca0866bd086d2eac8393fae1ec457a03e2a593343e771b06fde41badba10694370001732479
+  data.tar.gz: bca0ee97779b4917a6e972353f4ceeff84a8678485a5435c26d91c2058f0edb252b78fd7d8d81c5b414da1388c111efd693ed43344c456dc14527d0ae999f40f

data/Gemfile.lock

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

data/lib/map_print/pdf_handler.rb

@@ -33,14 +33,27 @@ module MapPrint
     private
     def print_map
       map_image = @context.print_layers
-      map_image = @context.print_geojson(MiniMagick::Image.new(map_image.path))
 
-      size = @context.map[:size] || {}
-      size[:width] ||= map_image.width
-      size[:height] ||= map_image.height
+      size = @context.map[:size]
+      geometry = ''
+      if size && (size[:width] || size[:height])
+        geometry += size[:width].to_s if size[:width]
+        geometry += 'x'
+        geometry += size[:height].to_s if size[:height]
+
+        image = MiniMagick::Image.new(map_image.path)
+        image.combine_options do |c|
+          c.density 300
+          c.resize geometry
+          c.unsharp '1.5x1+0.7+0.02'
+        end
+        image.write map_image.path
+      end
+
+      map_image = @context.print_geojson(MiniMagick::Image.new(map_image.path))
 
       position = @context.map[:position] || {}
-      @pdf.image map_image.path, at: [position[:x] || 0, @pdf.bounds.top - (position[:y] || 0)], fit: size.values
+      @pdf.image map_image.path, at: [position[:x] || 0, @pdf.bounds.top - (position[:y] || 0)]
     end
 
     def print_image(image_path, position)

data/lib/map_print/png_handler.rb

@@ -34,7 +34,6 @@ module MapPrint
 
     def print_map
       map_image = @context.print_layers
-      map_image = @context.print_geojson(MiniMagick::Image.new(map_image.path))
 
       size = @context.map[:size]
       geometry = ''
@@ -42,9 +41,19 @@ module MapPrint
         geometry += size[:width].to_s if size[:width]
         geometry += 'x'
         geometry += size[:height].to_s if size[:height]
+
+        image = MiniMagick::Image.new(map_image.path)
+        image.combine_options do |c|
+          c.density 300
+          c.resize geometry
+          c.unsharp '1.5x1+0.7+0.02'
+        end
+        image.write map_image.path
       end
 
-      overlay_image(map_image, @context.map[:position], geometry)
+      map_image = @context.print_geojson(MiniMagick::Image.new(map_image.path))
+
+      overlay_image(map_image, @context.map[:position])
     end
 
     private

data/lib/map_print/version.rb

@@ -1,3 +1,3 @@
 module MapPrint
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: map_print
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andreas Fast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler