map_print 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7f7ff077bdc65127a96cb126451677f4f8317f
-  data.tar.gz: 0fb0c8560df44020151c117670206c3593acc3a8
+  metadata.gz: 423a53002a18daf1de1ba8cd5aabdcc9c17fb112
+  data.tar.gz: 49824e15480ccfffd1c89e48573c8e8fb7957ea7
 SHA512:
-  metadata.gz: c4100a81072048511823a1ba2cd7b3e10779b24f0493cb7fe22cdf4d1455c255fc2ef767f3b079268e4a1dc0a845500d3c16752ecf37d4a8e4065f3b6ae02967
-  data.tar.gz: 75daabd87f3a99af524f38cd73806ad4c433efb39460d0e01f76992d4d4059131a6ba7f7141f96ad74103864d1547b03b810c9d78883d92f26ceecf502b141d6
+  metadata.gz: 8ee96b45449be505392177a1a893295e0c844728d48b762f28945c2cda30cb368ea48ce12d81dc30720adc740fa973125c70759fe3061592043b3e8c320ff069
+  data.tar.gz: a3f083c06a7c3781c23362bde338748cadaf53cc9b0e057b212110ad56e2442f0452f88d10b293bb99a8cf972d2d36242b070f93dc1f59a68014b084b560c7f6

data/Gemfile.lock

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

data/lib/map_print/core.rb

@@ -34,6 +34,7 @@ module MapPrint
       raise ParameterError.new("Please indicate the northeast point for the map ({map: {ne: {lat: -29.980172, lng: -52.959305}}})") unless @map[:ne] && @map[:ne][:lat] && @map[:ne][:lng]
       raise ParameterError.new("Please indicate the zoom level for the map ({map: {zoom: 9})") unless @map[:zoom]
       raise ParameterError.new("Please indicate layers to be printed for the map ({map: {layers: [{type: 'osm'}]})") unless @map[:layers].is_a?(Array)
+      Logger.warn 'Found geojson property defined outside map, it must be inside the map property' if @map[:geojson].nil? && args[:geojson]
     end
 
     def print(output_path)

data/lib/map_print/geo_json_handler.rb

@@ -77,14 +77,18 @@ module MapPrint
       x = get_x(point['coordinates'][0])
       y = get_y(point['coordinates'][1])
 
-      point_image = MiniMagick::Image.open(image_path)
-      x -= point_image.width / 2
-      y -= point_image.height / 2
-
-      @image.composite(point_image) do |c|
-        c.density 300
-        c.geometry("+#{x}+#{y}")
-      end.write @image.path
+      if 0 <= x && x <= @width && 0 <= y && y <= @height
+        point_image = MiniMagick::Image.open(image_path)
+        x -= point_image.width / 2
+        y -= point_image.height / 2
+
+        @image.composite(point_image) do |c|
+          c.density 300
+          c.geometry("+#{x}+#{y}")
+        end.write @image.path
+      else
+        Logger.warn "Point #{image_path} is outside the map's boundaries!\n#{point.inspect}"
+      end
     end
 
     def line_string(geometry, properties)
@@ -92,7 +96,12 @@ module MapPrint
       coords = geometry['coordinates']
       coords = coords.first if coords.first.first.is_a?(Array)
       points = coords.map do |coord|
-        "#{get_x(coord[0])},#{get_y(coord[1])}"
+        x = get_x(coord[0])
+        y = get_y(coord[1])
+        if 0 <= x && x <= @width && 0 <= y && y <= @height
+          Logger.warn "Line coordinate outside map's boundaries!\ngeometry: #{geometry.inspect}\nproperties: #{properties.inspect}"
+        end
+        "#{x},#{y}"
       end
 
       draw_command = (0..(points.length - 2)).map do |i|
@@ -110,7 +119,12 @@ module MapPrint
       coords = geometry['coordinates']
       coords = coords.first if coords.first.first.is_a?(Array)
       points = coords.map do |coord|
-        "#{get_x(coord[0])},#{get_y(coord[1])}"
+        x = get_x(coord[0])
+        y = get_y(coord[1])
+        if 0 <= x && x <= @width && 0 <= y && y <= @height
+          Logger.warn "Polygon coordinate outside map's boundaries!\ngeometry: #{geometry.inspect}\nproperties: #{properties.inspect}"
+        end
+        "#{x},#{y}"
       end
 
       @image.combine_options do |c|

data/lib/map_print/version.rb

@@ -1,3 +1,3 @@
 module MapPrint
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: map_print
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andreas Fast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler