geojson2image 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d57d980e7f20c09aff8e48a7d87719d8479c46e408434be90572d0906a88a6e
-  data.tar.gz: e2161ec9208b0bdbbcf5894b22c58cfe304060c67ac5108816e4bf21ac0b0e80
+  metadata.gz: c5f4d8a2517650fec48a157253308edc3012cddef9cfd53013dc111d6aec65c7
+  data.tar.gz: a092b7c91a0fb1323049b72e8c1068b5d6b456a190402beb33d95732db0737df
 SHA512:
-  metadata.gz: 7bc18885348912a802dc18ecf1e01a846069da43256662ec1b8280e120b189caff4fa9b565c32c57270d1646275653a856197874ab900ba5e3f46cfd68831e41
-  data.tar.gz: 1bc17400680e42e23bd805cfff2b935ca36c9be6fd98188ede76a16851f35b50dd4b728803af08ee36657797a6c6d93fd7f6bd1cb7caa39b6f7f94a41391b188
+  metadata.gz: 79400af28d504d48cd56ad9fd1c3b3e3f2b43fe6324b6cf876b776379cc99d15cfcf80fcc8b95dd573371c4bede7c2a6728d99de48a90118c167ae1cbb9c76f0
+  data.tar.gz: 568e84a410e00ee3f8fc04d0488e17071f5259ce71f3d197cb7982f7efdcc5d892c58460e946c60e5dadfa0f080d9a0dfc50d049b31e07838fa5dbb673311abd

data/README.md

@@ -32,10 +32,10 @@ g2i = Geojson2image::Convert.new(
   width: 500,
   height: 500,
   padding: 50,
-  background_color: "#ffffff",
-  fill_color: "#008000",
-  stroke_color: "#006400",
-  output: "output.jpg"
+  background: "#ffffff",
+  fill: "#008000",
+  stroke: "#006400",
+  output: "output.png"
 )
 g2i.to_image
 ```
@@ -55,8 +55,8 @@ feature. Example:
 
 ```json
 "properties": {
-  "fill_color": "#008000",
-  "stroke_color": "#006400"
+  "fill": "#008000",
+  "stroke": "#006400"
 },
 ```
 **Example Output**

data/lib/geojson2image.rb

@@ -5,25 +5,25 @@ require "chunky_png"
 module Geojson2image
   class Convert
 
-    def initialize(json: nil, width: nil, height: nil,  padding: nil,
-      background_color: nil, fill_color: nil, stroke_color: nil,
+    def initialize(json: nil, width: nil, height: nil, padding: nil,
+      background: nil, fill: nil, stroke: nil,
       output: nil)
       begin
         @parsed_json = Oj.load(json)
         @width = width || 500
         @height = height || 500
         @padding = padding || 50
-        @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"
+        @background = (background.nil? ? ChunkyPNG::Color::WHITE : ChunkyPNG::Color.from_hex(background))
+        @fill = (fill.nil? ? ChunkyPNG::Color::TRANSPARENT : ChunkyPNG::Color.from_hex(fill))
+        @stroke = (stroke.nil? ? ChunkyPNG::Color::BLACK : ChunkyPNG::Color.from_hex(stroke))
+        @output = output || "output.png"
         @min_xy = [-1, -1]
         @max_xy = [-1, -1]
         @coordinates = []
         @width_padding = 0
         @height_padding = 0
         @global_ratio = 0
-        @png = ChunkyPNG::Image.new(@width, @height, @background_color)
+        @png = ChunkyPNG::Image.new(@width, @height, @background)
       rescue Oj::ParseError
         puts "GeoJSON parse error"
       end
@@ -146,16 +146,16 @@ module Geojson2image
         end
 
       when 'Point'
-        tmp_stroke_color = @stroke_color
+        tmp_stroke = @stroke
         if !properties.nil?
-          if properties.key?('stroke_color') && !properties['stroke_color'].nil?
-            tmp_stroke_color = ChunkyPNG::Color.from_hex(properties['stroke_color'])
+          if properties.key?('stroke') && !properties['stroke'].nil?
+            tmp_stroke = ChunkyPNG::Color.from_hex(properties['stroke'])
           end
         end
 
         point = json['coordinates']
         new_point = transform_point(point)
-        @png.compose_pixel(new_point[0], new_point[1], tmp_stroke_color)
+        @png.compose_pixel(new_point[0], new_point[1], tmp_stroke)
 
       when 'MultiPoint'
         json['coordinates'].each do |coordinate|
@@ -167,10 +167,10 @@ module Geojson2image
         end
 
       when 'LineString'
-        tmp_stroke_color = @stroke_color
+        tmp_stroke = @stroke
         if !properties.nil?
-          if properties.key?('stroke_color') && !properties['stroke_color'].nil?
-            tmp_stroke_color = ChunkyPNG::Color.from_hex(properties['stroke_color'])
+          if properties.key?('stroke') && !properties['stroke'].nil?
+            tmp_stroke = ChunkyPNG::Color.from_hex(properties['stroke'])
           end
         end
 
@@ -179,7 +179,7 @@ module Geojson2image
         json['coordinates'].each do |point|
           new_point = transform_point(point)
           if !last_point.nil?
-            @png.line(last_point[0], last_point[1], new_point[0], new_point[1], tmp_stroke_color)
+            @png.line(last_point[0], last_point[1], new_point[0], new_point[1], tmp_stroke)
           end
           last_point = new_point
         end
@@ -194,14 +194,14 @@ module Geojson2image
         end
 
       when 'Polygon'
-        tmp_fill_color = @fill_color
-        tmp_stroke_color = @stroke_color
+        tmp_fill = @fill
+        tmp_stroke = @stroke
         if !properties.nil?
-          if properties.key?('fill_color') && !properties['fill_color'].nil?
-            tmp_fill_color = ChunkyPNG::Color.from_hex(properties['fill_color'])
+          if properties.key?('fill') && !properties['fill'].nil?
+            tmp_fill = ChunkyPNG::Color.from_hex(properties['fill'])
           end
-          if properties.key?('stroke_color') && !properties['stroke_color'].nil?
-            tmp_stroke_color = ChunkyPNG::Color.from_hex(properties['stroke_color'])
+          if properties.key?('stroke') && !properties['stroke'].nil?
+            tmp_stroke = ChunkyPNG::Color.from_hex(properties['stroke'])
           end
         end
 
@@ -217,7 +217,7 @@ module Geojson2image
           end
 
           points = ChunkyPNG::Vector.multiple_from_string(border_points.join(", "))
-          @png.polygon(points, tmp_stroke_color, tmp_fill_color)
+          @png.polygon(points, tmp_stroke, tmp_fill)
         end
 
       when 'MultiPolygon'

data/lib/geojson2image/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geojson2image
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Bryce Johnston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj