libgd-gis 0.3.2 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54f40ea70b79fc866db311f7ac994ca267483f62de518b2f6f4f5989957f5e6
-  data.tar.gz: c8825bd11685f5a0254bd5fdaa5b654cee53dff608a990ac91bc4bacfcba4f31
+  metadata.gz: ae0d79550ce61b3bebaa90e48f7b57c5dd1f1fca8be67d857e41fd8fec69e75c
+  data.tar.gz: b37ff43e8f0a0dd9112ad256c46e3aa1154975ca737544eae761bec9d074ee32
 SHA512:
-  metadata.gz: 7bf12c61f036e85b93aa1b7617fb2aa63f9c0fb788f3ad53e1bf313259b5847658e3c1c1cf2682227fdc9d542cabf86489cb94d9a79c5cf15949519dfe08be69
-  data.tar.gz: bdc13c7e7aa1e99f4328c3ea69699b4e8f548ea5aeb975b317a81fe136d8dc94b1e64655987f51a0fcf4db0af030ffd8e5a125ae8cd3191a34c8814575cffa0e
+  metadata.gz: 6272498890dd101132b00edcd65d63b023721afa2d18a77bb17919b53d6220927ff5d532803d1c24e726799ac3d7671b648d2979c38725880403d5cd5dc966be
+  data.tar.gz: 65464584707bb1c54bb8401c847a395ba646f94846d5897fe5e6b099c97d812616035d35770d3106860819ce0d318b8980b56c7e067ace39c683ed6a5fa18273

data/lib/gd/gis/layer_points.rb

@@ -50,7 +50,7 @@ module GD
         if icon.is_a?(Array) || icon.nil?
           fill, stroke = icon || [GD::GIS::ColorHelpers.random_rgb, GD::GIS::ColorHelpers.random_rgb]
           @icon = build_default_marker(fill, stroke)
-        elsif icon == "numeric" || icon == "alphabetic"
+        elsif %w[numeric alphabetic].include?(icon)
           @icon = icon
           @font_color = font_color
         else
@@ -65,7 +65,6 @@ module GD
         @r, @g, @b, @a = color
         @a = 0 if @a.nil?
         @count = count
-
       end
 
       # Builds a default circular marker icon.
@@ -100,18 +99,17 @@ module GD
       #
       # @return [void]
       def render!(img, projector)
-
-        case @icon
-          when "numeric"
-              value = @count
-          when "alphabetic"
-              value = (@count + 96).chr
-          else
-            value = "*"
-        end
+        value = case @icon
+                when "numeric"
+                  @count
+                when "alphabetic"
+                  (@count + 96).chr
+                else
+                  "*"
+                end
 
         if @icon.is_a?(GD::Image)
-          w = @icon.width 
+          w = @icon.width
           h = @icon.height
         else
           w = radius_from_text(img, value, font: @font, size: @size) * 2
@@ -127,31 +125,31 @@ module GD
 
           text = @label.call(row)
           next if text.nil? || text.strip.empty?
+
           font_h = @size * 1.1
 
           if @icon == "numeric" || @icon == "alphabetic"
 
             draw_symbol_circle!(
-                    img: img,
-                    x: x,
-                    y: y,
-                    symbol: value,
-                    radius: 12,
-                    bg_color: @color,
-                    font_color: @font_color,
-                    font: @font,
-                    font_size: @size
-                  )
+              img: img,
+              x: x,
+              y: y,
+              symbol: value,
+              bg_color: @color,
+              font_color: @font_color,
+              font: @font,
+              font_size: @size
+            )
           else
             img.copy(@icon, x - (w / 2), y - (h / 2), 0, 0, w, h)
           end
 
           img.text(text,
-                  x: x + (w / 2) + 4,
-                  y: y + (font_h / 2),
-                  size: @size,
-                  color: GD::Color.rgba(@r, @g, @b, @a),
-                  font: @font)
+                   x: x + (w / 2) + 4,
+                   y: y + (font_h / 2),
+                   size: @size,
+                   color: GD::Color.rgba(@r, @g, @b, @a),
+                   font: @font)
         end
       end
 
@@ -159,7 +157,7 @@ module GD
       #
       # - x, y: circle center in pixels
       # - y for text() is BASELINE (not top). We compute baseline to center the text.
-      def draw_symbol_circle!(img:, x:, y:, symbol:, radius:, bg_color:, font_color:, font:, font_size:, angle: 0.0)
+      def draw_symbol_circle!(img:, x:, y:, symbol:, bg_color:, font_color:, font:, font_size:, angle: 0.0)
         diameter = radius_from_text(img, symbol, font: font, size: font_size) * 2
 
         # 1) Bullet background
@@ -203,9 +201,8 @@ module GD
         )
 
         # Use the larger dimension to ensure the text fits
-        (([w, h].max / 2.0).ceil) + padding
+        ([w, h].max / 2.0).ceil + padding
       end
-
     end
   end
 end

data/lib/test.rb

@@ -1,4 +1,3 @@
-def foo
-end
+def foo; end
 
 foo(1, 2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.21
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva