geojson2image 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 869a6ee505c2bfc4d2e11f74058260f1f04f2ad6
-  data.tar.gz: 61ca037b25096bbe65f48ee08f4e871d5a1f3dba
+SHA256:
+  metadata.gz: 4d57d980e7f20c09aff8e48a7d87719d8479c46e408434be90572d0906a88a6e
+  data.tar.gz: e2161ec9208b0bdbbcf5894b22c58cfe304060c67ac5108816e4bf21ac0b0e80
 SHA512:
-  metadata.gz: a555567cfbf41468cfb5b00ba0de420522b5fb9eaed393dbfa9527a9a4732a17b1b3cd226458a816688d175286a9b4d58598d930dec6506abe71cba4daaa2257
-  data.tar.gz: 918a91049e936dc9eb1f7d41fa652465c68640de2a4155b8db1b2e4c3e96b5b6d42f5f7f0158825215bf791bb8efad6ddb336b652db25ec17d2d3a2f879ad50b
+  metadata.gz: 7bc18885348912a802dc18ecf1e01a846069da43256662ec1b8280e120b189caff4fa9b565c32c57270d1646275653a856197874ab900ba5e3f46cfd68831e41
+  data.tar.gz: 1bc17400680e42e23bd805cfff2b935ca36c9be6fd98188ede76a16851f35b50dd4b728803af08ee36657797a6c6d93fd7f6bd1cb7caa39b6f7f94a41391b188

data/.gitignore

@@ -10,4 +10,5 @@
 /*.png
 /*.jpg
 /*.gif
+/*.json
 /example/*.json

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.5.0
 before_install: gem install bundler -v 1.13.7

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Bryce Johnston
+Copyright (c) 2018 Bryce Johnston
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,13 +4,11 @@
 
 [gem]: https://rubygems.org/gems/geojson2image
 
-Ruby library for generating images from GeoJSON.
-
-Currently, MultiPolygon and Polygon GeoJSON types should output images properly. Other GeoJSON types have not been thoroughly tested.
+Ruby library for generating images from GeoJSON using the [ChunkyPNG library](https://github.com/wvanbergen/chunky_png).
 
 ## Installation
 
-You will need [ImageMagick](http://imagemagick.org/) installed. Then Add this line to your application's Gemfile:
+Add this line to your application's Gemfile:
 
 ```ruby
 gem 'geojson2image'
@@ -34,10 +32,9 @@ g2i = Geojson2image::Convert.new(
   width: 500,
   height: 500,
   padding: 50,
-  background_color: 'white',
-  fill_color: 'rgba(0, 158, 40, 0.3)',
-  stroke_color: 'rgb(0, 107, 27)',
-  stroke_width: 3,
+  background_color: "#ffffff",
+  fill_color: "#008000",
+  stroke_color: "#006400",
   output: "output.jpg"
 )
 g2i.to_image
@@ -49,8 +46,7 @@ g2i.to_image
 
 ### Stroke and Fill Color Options
 
-Valid color values are defined in the ImageMagick Color Names Reference:
-https://www.imagemagick.org/script/color.php
+Accepts hex color format
 
 Stroke and fill color options can be globally set when initializing a
 new Geojson2image::Convert object, or you can override them by adding
@@ -59,9 +55,8 @@ feature. Example:
 
 ```json
 "properties": {
-  "fill_color": "rgba(0, 158, 40, 0.3)",
-  "stroke_color": "rgb(0, 107, 27)",
-  "stoke_width": "3",
+  "fill_color": "#008000",
+  "stroke_color": "#006400"
 },
 ```
 **Example Output**
@@ -76,7 +71,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/CropQuest/geojson2image.
+Bug reports and pull requests are welcome on GitHub at https://github.com/beaorn/geojson2image.
 
 
 ## License

data/geojson2image.gemspec

@@ -7,11 +7,11 @@ Gem::Specification.new do |spec|
   spec.name          = "geojson2image"
   spec.version       = Geojson2image::VERSION
   spec.authors       = ["Bryce Johnston"]
-  spec.email         = ["bryce@agdeveloper.com"]
+  spec.email         = ["bryce@beaorn.com"]
 
   spec.summary       = %q{Ruby library for generating images from GeoJSON}
   spec.description   = %q{Ruby library for generating images from GeoJSON}
-  spec.homepage      = "https://github.com/CropQuest/geojson2image"
+  spec.homepage      = "https://github.com/beaorn/geojson2image"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "oj", "~> 3.0"
-  spec.add_dependency "mini_magick", "~> 4.6"
+  spec.add_dependency "oj", "~> 3.6"
+  spec.add_dependency "chunky_png", "~> 1.3"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/geojson2image.rb

@@ -1,25 +1,21 @@
 require "geojson2image/version"
 require "oj"
-require "mini_magick"
+require "chunky_png"
 
 module Geojson2image
   class Convert
-    attr_accessor :parsed_json, :width, :height, :background_color,
-    :border_color, :border_width, :padding, :output, :min_xy, :max_xy,
-    :coordinates, :width_padding, :height_padding, :global_ratio
 
     def initialize(json: nil, width: nil, height: nil,  padding: nil,
       background_color: nil, fill_color: nil, stroke_color: nil,
-      stroke_width: nil, output: nil)
+      output: nil)
       begin
         @parsed_json = Oj.load(json)
         @width = width || 500
         @height = height || 500
         @padding = padding || 50
-        @background_color = background_color || 'white'
-        @fill_color = fill_color || 'white'
-        @stroke_color = stroke_color || 'black'
-        @stroke_width = stroke_width || 3
+        @background_color = (background_color.nil? ? ChunkyPNG::Color::WHITE : ChunkyPNG::Color.from_hex(background_color))
+        @fill_color = (fill_color.nil? ? ChunkyPNG::Color::TRANSPARENT : ChunkyPNG::Color.from_hex(fill_color))
+        @stroke_color = (stroke_color.nil? ? ChunkyPNG::Color::BLACK : ChunkyPNG::Color.from_hex(stroke_color))
         @output = output || "output.jpg"
         @min_xy = [-1, -1]
         @max_xy = [-1, -1]
@@ -27,6 +23,7 @@ module Geojson2image
         @width_padding = 0
         @height_padding = 0
         @global_ratio = 0
+        @png = ChunkyPNG::Image.new(@width, @height, @background_color)
       rescue Oj::ParseError
         puts "GeoJSON parse error"
       end
@@ -98,16 +95,16 @@ module Geojson2image
         @coordinates[i][0] = lon
         @coordinates[i][1] = Math.log(Math.tan(quarter_pi + 0.5 * lat))
 
-        @min_xy[0] = (min_xy[0] == -1 ? @coordinates[i][0] : [min_xy[0], @coordinates[i][0]].min)
-        @min_xy[1] = (min_xy[1] == -1 ? @coordinates[i][1] : [min_xy[1], @coordinates[i][1]].min)
+        @min_xy[0] = (@min_xy[0] == -1 ? @coordinates[i][0] : [@min_xy[0], @coordinates[i][0]].min)
+        @min_xy[1] = (@min_xy[1] == -1 ? @coordinates[i][1] : [@min_xy[1], @coordinates[i][1]].min)
       end
 
       @coordinates.each_with_index do |point,i|
         @coordinates[i][0] = @coordinates[i][0] - @min_xy[0]
         @coordinates[i][1] = @coordinates[i][1] - @min_xy[1]
 
-        @max_xy[0] = (max_xy[0] == -1 ? @coordinates[i][0] : [max_xy[0], @coordinates[i][0]].max)
-        @max_xy[1] = (max_xy[1] == -1 ? @coordinates[i][1] : [max_xy[1], @coordinates[i][1]].max)
+        @max_xy[0] = (@max_xy[0] == -1 ? @coordinates[i][0] : [@max_xy[0], @coordinates[i][0]].max)
+        @max_xy[1] = (@max_xy[1] == -1 ? @coordinates[i][1] : [@max_xy[1], @coordinates[i][1]].max)
       end
     end
 
@@ -149,10 +146,16 @@ module Geojson2image
         end
 
       when 'Point'
+        tmp_stroke_color = @stroke_color
+        if !properties.nil?
+          if properties.key?('stroke_color') && !properties['stroke_color'].nil?
+            tmp_stroke_color = ChunkyPNG::Color.from_hex(properties['stroke_color'])
+          end
+        end
+
         point = json['coordinates']
         new_point = transform_point(point)
-        draw_point = "color #{new_point[0]},#{new_point[1]} point"
-        @convert.draw(draw_point)
+        @png.compose_pixel(new_point[0], new_point[1], tmp_stroke_color)
 
       when 'MultiPoint'
         json['coordinates'].each do |coordinate|
@@ -164,15 +167,10 @@ module Geojson2image
         end
 
       when 'LineString'
+        tmp_stroke_color = @stroke_color
         if !properties.nil?
-          if properties.key?('fill_color')
-            @convert.fill(properties['fill_color'])
-          end
-          if properties.key?('stroke_color')
-            @convert.stroke(properties['stroke_color'])
-          end
-          if properties.key?('stroke_width')
-            @convert.strokewidth(properties['stroke_width'])
+          if properties.key?('stroke_color') && !properties['stroke_color'].nil?
+            tmp_stroke_color = ChunkyPNG::Color.from_hex(properties['stroke_color'])
           end
         end
 
@@ -181,8 +179,7 @@ module Geojson2image
         json['coordinates'].each do |point|
           new_point = transform_point(point)
           if !last_point.nil?
-            polyline = "polyline #{last_point[0]},#{last_point[1]}, #{new_point[0]},#{new_point[1]}"
-            @convert.draw(polyline)
+            @png.line(last_point[0], last_point[1], new_point[0], new_point[1], tmp_stroke_color)
           end
           last_point = new_point
         end
@@ -197,15 +194,14 @@ module Geojson2image
         end
 
       when 'Polygon'
+        tmp_fill_color = @fill_color
+        tmp_stroke_color = @stroke_color
         if !properties.nil?
           if properties.key?('fill_color') && !properties['fill_color'].nil?
-            @convert.fill(properties['fill_color'])
+            tmp_fill_color = ChunkyPNG::Color.from_hex(properties['fill_color'])
           end
           if properties.key?('stroke_color') && !properties['stroke_color'].nil?
-            @convert.stroke(properties['stroke_color'])
-          end
-          if properties.key?('stroke_width') && !properties['stroke_width'].nil?
-            @convert.strokewidth(properties['stroke_width'])
+            tmp_stroke_color = ChunkyPNG::Color.from_hex(properties['stroke_color'])
           end
         end
 
@@ -220,8 +216,8 @@ module Geojson2image
             border_points << "#{new_point[0]},#{new_point[1]}"
           end
 
-          border = "polygon " + border_points.join(", ")
-          @convert.draw(border)
+          points = ChunkyPNG::Vector.multiple_from_string(border_points.join(", "))
+          @png.polygon(points, tmp_stroke_color, tmp_fill_color)
         end
 
       when 'MultiPolygon'
@@ -239,13 +235,6 @@ module Geojson2image
     end
 
     def to_image
-      @convert = MiniMagick::Tool::Convert.new
-      @convert.size("#{@width}x#{@height}")
-      @convert.xc(@background_color)
-      @convert.fill(@fill_color)
-      @convert.stroke(@stroke_color)
-      @convert.strokewidth(@stroke_width)
-
       get_points(@parsed_json)
       get_boundary
 
@@ -262,9 +251,7 @@ module Geojson2image
       @height_padding = (@height - (@global_ratio * @max_xy[1])) / 2
 
       draw(@parsed_json)
-
-      @convert << @output
-      @convert.call
+      @png.save(@output)
     end
 
   end

data/lib/geojson2image/version.rb

@@ -1,3 +1,3 @@
 module Geojson2image
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geojson2image
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Bryce Johnston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '3.0'
 description: Ruby library for generating images from GeoJSON
 email:
-- bryce@agdeveloper.com
+- bryce@beaorn.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -101,7 +101,7 @@ files:
 - geojson2image.gemspec
 - lib/geojson2image.rb
 - lib/geojson2image/version.rb
-homepage: https://github.com/CropQuest/geojson2image
+homepage: https://github.com/beaorn/geojson2image
 licenses:
 - MIT
 metadata: {}
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby library for generating images from GeoJSON