geojson2image 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f40062001e387eb73050e7ab8e58374b2b6906
-  data.tar.gz: 663faeebb08988d1d2af68b75031e9d4d6b7632f
+  metadata.gz: 33173d33967cf8a5a9bb42290c4c3b6f65dc44fa
+  data.tar.gz: bd0ed61c9c47f5240d61ac389ec08abed9313a9f
 SHA512:
-  metadata.gz: 49dece8d38b249e3e53cf6f4011c60444549b6318a80d5cfbe8151afeaab82df134cddf81dee41a2a26e35459c88b72e96ddbeff7668376c5985c3932ece37df
-  data.tar.gz: ed141b41854390a0b73bdfa41b3a34b62d345e3743886812cee8c8d8ad8c0bdce2444e4570384f0bd3ab0a7eb8637289481bbfe91fad51bb09fcc9a41346cf2d
+  metadata.gz: 2f0bfc47273445945432cb3a903ad5c6e91d9e6987f4c5823c051870215efe781a15e7ec2f93fed7ef2d8d6b7874ddd8ec489f57354486cd7d0e60043de6e5a0
+  data.tar.gz: 4c005b627609e0c84feaed9314b5047d14fbabadccdc92661ed12b3ee894120c135614624626e1b3f5c7da18f46992d8dc8b7cf6ea30fe890b9d47d5dac01963

data/.gitignore

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

data/README.md

@@ -6,7 +6,7 @@
 
 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, and properties from the GeoJSON are not being parsed. 
+Currently, MultiPolygon and Polygon GeoJSON types should output images properly. Other GeoJSON types have not been thoroughly tested.
 
 ## Installation
 
@@ -46,9 +46,22 @@ g2i.to_image
 ### Example Output
 ![Example Output](example/example_output.jpg?raw=true "Example Output")
 
-### Color Options
+### Stroke and Fill Color Options
 
-ImageMagick Color Names Reference: https://www.imagemagick.org/script/color.php
+These options can be globally set when initializing a
+new Geojson2image::Convert object, or you can override them by adding properties to
+your GeoJSON that include the desired stroke and fill options per feature. Example:
+
+```json
+"properties": {
+  "fill_color": "rgba(0, 158, 40, 0.3)",
+  "stroke_color": "rgb(0, 107, 27)",
+  "stoke_width": "3",
+},
+```
+
+Valid color values are defined in the ImageMagick Color Names Reference:
+https://www.imagemagick.org/script/color.php
 
 ## Development
 

data/lib/geojson2image/version.rb

@@ -1,3 +1,3 @@
 module Geojson2image
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/geojson2image.rb

@@ -84,7 +84,7 @@ module Geojson2image
         end
 
       else
-        puts "get_boundary invalid GeoJSON parse error"
+        puts "get_points - invalid GeoJSON parse error"
       end
     end
 
@@ -92,8 +92,8 @@ module Geojson2image
       quarter_pi = Math::PI / 4.0
 
       @coordinates.each_with_index do |point,i|
-        lon = @coordinates[i][0].to_f * Math::PI / 180
-        lat = @coordinates[i][1].to_f * Math::PI / 180
+        lon = @coordinates[i][0] * Math::PI / 180
+        lat = @coordinates[i][1] * Math::PI / 180
 
         @coordinates[i][0] = lon
         @coordinates[i][1] = Math.log(Math.tan(quarter_pi + 0.5 * lat))
@@ -128,7 +128,7 @@ module Geojson2image
       return xy
     end
 
-    def draw(json)
+    def draw(json, properties = nil)
       case json['type']
       when 'GeometryCollection'
         json['geometries'].each do |geometry|
@@ -142,7 +142,11 @@ module Geojson2image
         end
 
       when 'Feature'
-        draw(json['geometry'])
+        if json.key?('properties')
+          draw(json['geometry'], json['properties'])
+        else
+          draw(json['geometry'])
+        end
 
       when 'Point'
         point = json['coordinates']
@@ -160,6 +164,18 @@ module Geojson2image
         end
 
       when 'LineString'
+        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'])
+          end
+        end
+
         last_point = null
 
         json['coordinates'].each do |point|
@@ -181,6 +197,18 @@ module Geojson2image
         end
 
       when 'Polygon'
+        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'])
+          end
+        end
+
         json['coordinates'].each do |linestrings|
           border_points = []
           if linestrings[0] != linestrings[linestrings.count - 1]
@@ -206,7 +234,7 @@ module Geojson2image
         end
 
       else
-        puts "draw invalid GeoJSON parse error - #{json['type']}"
+        puts "draw - invalid GeoJSON parse error - #{json['type']}"
       end
     end
 
@@ -236,7 +264,7 @@ module Geojson2image
       draw(@parsed_json)
 
       @convert << @output
-      cmd_string = @convert.call
+      @convert.call
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geojson2image
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bryce Johnston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj