map_print 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b403565fd160476de9c6c7bc64b96f87168c0709
-  data.tar.gz: 2acbf3eea43cc28719c4d50270de1ad244fb4b37
+  metadata.gz: 73eaf58e1ffe788eac9f34f197ba18e682548f15
+  data.tar.gz: 3746ee55d0e44f920ce4db99259bf544451abf2e
 SHA512:
-  metadata.gz: 96ae6bc8c7a4d0b81539616ce93b8c0cd13f1288b70e7fa20d9f24de5f6207d24665bd651a534d592d73b8e04441d92b8a6e9053716e8fb642c5df8b7b2af246
-  data.tar.gz: 1a347d350da58f79f5336f13ab07efbea01ca0e28be37233a947d26ac670479e112e355db05daacb1c85fa664d690532c49611126959d522edac6d3f6a47a6d8
+  metadata.gz: 9a44c54c8f966d3253229399532f431f04b1e56c1d5489af27799075700db9dd2677de5b8f292d50f56f89016aa70fade5fd743cc242207d393b8b512e1e04a2
+  data.tar.gz: 838a40807d303bda6cf4d11fc361959909d1c115e83167512a9b728831f176ac14ae04ea449bc2e543c76edfa4f28910437876bc5f25163c845c914a68046eda

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    map_print (0.1.0)
+    map_print (0.2.1)
       geo-distance (~> 0.1)
       mini_magick (~> 4.3)
-      parallel (~> 1.6.1)
+      parallel (~> 1.6)
       prawn (~> 2.0)
       prawn-fast-png (~> 0.2.3)
-      thor
+      thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -48,6 +48,11 @@ BASIC_MAP = {
       page_size: 'A4', # A0-10, B0-10, C0-10
       page_layout: :portrait # :portrait, :landscape
     },
+    png_options: {
+      width: 800,
+      height: 1000,
+      background_color: '#ffffff'
+    },
     map: {
       sw: { # required
         lat: -35.026862,
@@ -101,19 +106,23 @@ BASIC_MAP = {
         }]
       }'
     },
-    images: [ # not supported yet
+    images: [
       {
         path: './file.png',
         position: {x: 50, y: 50 },
-        size: {width: 50, height: 50},
-        options: {}
+        options: {
+          fit: {
+            width: 25,
+            height: 25
+          }
+        }
       }
     ],
-    texts: [ # not supported yet
+    texts: [
       {
         text: "some text",
         position: {x: 50, y: 50 },
-        size: {width: 50, height: 50},
+        box_size: {width: 50, height: 50},
         options: {}
       }
     ],

data/lib/map_print/core.rb

@@ -6,14 +6,14 @@ require_relative 'providers/bing'
 require_relative 'providers/open_street_map'
 require_relative 'layer_handler'
 require_relative 'scalebar_handler'
-require_relative 'image_handler'
-require_relative 'text_handler'
 require_relative 'legend_handler'
 require_relative 'geo_json_handler'
+require_relative 'pdf_handler'
+require_relative 'png_handler'
 
 module MapPrint
   class Core
-    attr_accessor :map, :images, :texts, :legend, :scalebar
+    attr_accessor :map, :images, :texts, :legend, :scalebar, :pdf_options, :png_options, :output_path
 
     PROVIDERS = {
       'bing' => MapPrint::Providers::Bing,
@@ -23,6 +23,7 @@ module MapPrint
     def initialize(args)
       @format = args[:format]
       @pdf_options = args[:pdf_options]
+      @png_options = args[:png_options]
       @map = args[:map]
       @images = args[:images]
       @texts = args[:texts]
@@ -34,62 +35,17 @@ module MapPrint
       @output_path = output_path
 
       if @format == 'pdf'
-        print_pdf
+        handler = PdfHandler.new(self)
       elsif @format == 'png'
-        print_png
+        handler = PngHandler.new(self)
       else
         raise "Unsupported format: #{@format}"
       end
-    end
-
-    private
-    def print_pdf
-      pdf = init_pdf
-      map_image = print_layers
-      map_image = print_geojson(MiniMagick::Image.new(map_image.path))
-
-      FileUtils.cp map_image.path, './map.png' if defined?(DEBUG)
 
-      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)
-      print_legend_on_pdf(pdf)
-
-      pdf.render_file(@output_path)
+      handler.print
       @output_path
     end
 
-    def print_png
-      map_image = print_layers
-      map_image = print_geojson(MiniMagick::Image.new(map_image.path))
-
-      print_images_on_png(map_image)
-      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
-
-    def init_file
-      @file = File.open @output_path, 'wb'
-    end
-
-    def init_pdf
-      Prawn::Document.new @pdf_options || {}
-    end
-
     def print_layers
       file = LayerHandler.new(@map[:layers], @map[:sw], @map[:ne], @map[:zoom]).process
 
@@ -110,24 +66,12 @@ module MapPrint
       map_image
     end
 
-    def print_images_on_pdf(pdf)
-    end
-
-    def print_texts_on_pdf(pdf)
-    end
-
     def print_scalebar
     end
 
     def print_legend_on_pdf(pdf)
     end
 
-    def print_images_on_png(png)
-    end
-
-    def print_texts_on_png(png)
-    end
-
     def print_legend_on_png(png)
     end
   end

data/lib/map_print/pdf_handler.rb

@@ -0,0 +1,34 @@
+require_relative 'pdf_handlers/texts'
+require_relative 'pdf_handlers/images'
+
+module MapPrint
+  class PdfHandler
+    include PdfHandlers::Images
+    include PdfHandlers::Texts
+
+    def initialize(context)
+      @context = context
+    end
+
+    def print
+      @pdf = Prawn::Document.new @context.pdf_options || {}
+
+      print_map
+      print_images(@context.images, @pdf)
+      print_texts(@context.texts, @pdf)
+      # print_legend_on_pdf(@pdf)
+
+      @pdf.render_file(@context.output_path)
+    end
+
+    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
+      @pdf.image map_image.path, at: [@context.map[:position][:x], @pdf.bounds.top - @context.map[:position][:y]], fit: size.values
+    end
+  end
+end

data/lib/map_print/pdf_handlers/images.rb

@@ -0,0 +1,32 @@
+module MapPrint
+  module PdfHandlers
+    module Images
+      def print_images(images, pdf)
+        images.each do |image|
+          if image[:path] =~ /https?:\/\//
+            image_file = open(image[:path])
+          else
+            image_file = image[:path]
+          end
+
+          pdf.image image_file, image_options(image, pdf.bounds.top)
+        end
+      end
+
+      def image_options(image, bounds_top)
+        position = {}
+
+        if image[:position]
+          position[:at] = image[:position].values
+          position[:at][1] = bounds_top - position[:at][1]
+        end
+
+        if image[:options][:fit]
+          position[:fit] = [image[:options][:fit][:width], image[:options][:fit][:height]]
+        end
+
+        image[:options].merge position
+      end
+    end
+  end
+end

data/lib/map_print/pdf_handlers/texts.rb

@@ -0,0 +1,27 @@
+module MapPrint
+  module PdfHandlers
+    module Texts
+      def print_texts(texts, pdf)
+        texts.each do |text|
+          pdf.text_box text[:text], text_options(text)
+        end
+      end
+
+      def text_options(text)
+        box = {}
+
+        if text[:position]
+          box[:at] = text[:position].values
+          box[:at][1] = @pdf.bounds.top - box[:at][1]
+        end
+
+        if text[:box_size]
+          box[:width] = text[:box_size][:width] if text[:box_size][:width]
+          box[:height] = text[:box_size][:height] if text[:box_size][:height]
+        end
+
+        text[:options].merge box
+      end
+    end
+  end
+end

data/lib/map_print/png_handler.rb

@@ -0,0 +1,46 @@
+require_relative 'png_handlers/texts'
+require_relative 'png_handlers/images'
+
+module MapPrint
+  class PngHandler
+    include PngHandlers::Images
+    include PngHandlers::Texts
+
+    def initialize(context)
+      @context = context
+    end
+
+    def print
+      `convert -size #{@context.png_options[:width]}x#{@context.png_options[:height]} xc:#{@context.png_options[:background_color]} #{@context.output_path}`
+      @png = MiniMagick::Image.new @context.output_path
+
+      print_map
+
+      print_images(@context.images, @png)
+      print_texts(@context.texts, @png)
+      # print_legend_on_png
+    end
+
+    def print_map
+      map_image = @context.print_layers
+      map_image = @context.print_geojson(MiniMagick::Image.new(map_image.path))
+
+      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]
+      end
+
+      if @context.map[:position]
+        geometry += "+#{@context.map[:position][:x] || 0}+#{@context.map[:position][:y] || 0}"
+      end
+
+      result = @png.composite(map_image) do |c|
+        c.geometry geometry
+      end
+      result.write @context.output_path
+    end
+  end
+end

data/lib/map_print/png_handlers/images.rb

@@ -0,0 +1,19 @@
+module MapPrint
+  module PngHandlers
+    module Images
+      def print_images(images, png)
+        images.each do |image|
+          image_file = MiniMagick::Image.open(image[:path])
+
+          geometry = ''
+          geometry += "#{image[:options][:fit][:width]}x#{image[:options][:fit][:height]}" if image[:options][:fit]
+          geometry += "+#{image[:position][:x]}+#{image[:position][:y]}"
+          result = png.composite(image_file) do |c|
+            c.geometry geometry
+          end
+          result.write @context.output_path
+        end
+      end
+    end
+  end
+end

data/lib/map_print/png_handlers/texts.rb

@@ -0,0 +1,24 @@
+module MapPrint
+  module PngHandlers
+    module Texts
+      def print_texts(texts, png)
+        texts.each do |text|
+          position = "#{text[:position][:x]},#{text[:position][:y]}"
+
+          draw_text(png, text[:text], position, text[:options])
+        end
+      end
+
+      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.draw "text #{position} '#{text}'"
+        end
+      end
+    end
+  end
+end

data/lib/map_print/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: map_print
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andreas Fast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,17 +162,21 @@ files:
 - lib/map_print.rb
 - lib/map_print/core.rb
 - lib/map_print/geo_json_handler.rb
-- lib/map_print/image_handler.rb
 - lib/map_print/lat_lng.rb
 - lib/map_print/layer_handler.rb
 - lib/map_print/legend_handler.rb
 - lib/map_print/osm/tile.rb
 - lib/map_print/osm/tile_factory.rb
+- lib/map_print/pdf_handler.rb
+- lib/map_print/pdf_handlers/images.rb
+- lib/map_print/pdf_handlers/texts.rb
+- lib/map_print/png_handler.rb
+- lib/map_print/png_handlers/images.rb
+- lib/map_print/png_handlers/texts.rb
 - lib/map_print/providers/base.rb
 - lib/map_print/providers/bing.rb
 - lib/map_print/providers/open_street_map.rb
 - lib/map_print/scalebar_handler.rb
-- lib/map_print/text_handler.rb
 - lib/map_print/tiles/bing_tile.rb
 - lib/map_print/tiles/osm_tile.rb
 - lib/map_print/tiles/tile.rb

data/lib/map_print/image_handler.rb

@@ -1,9 +0,0 @@
-module MapPrint
-  class ImageHandler
-    def initialize(images, file)
-    end
-
-    def process
-    end
-  end
-end

data/lib/map_print/text_handler.rb

@@ -1,9 +0,0 @@
-module MapPrint
-  class TextHandler
-    def initialize(texts, file)
-    end
-
-    def process
-    end
-  end
-end