libgd-gis 0.3.1 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adcbc0b0d92182bc12b431152cb1f79b202786ef999e3571f42c9ec27e999561
-  data.tar.gz: 50cb494d8e9b2fdf94f9ac126c22f14cb39335c4f1d0289df554f88159b5d389
+  metadata.gz: ae0d79550ce61b3bebaa90e48f7b57c5dd1f1fca8be67d857e41fd8fec69e75c
+  data.tar.gz: b37ff43e8f0a0dd9112ad256c46e3aa1154975ca737544eae761bec9d074ee32
 SHA512:
-  metadata.gz: 704ce58b27ab6ea1096390ad63daa926627f8b4d6b2a7613a0517949129d66850bac74f7860d090b4fd3a8aeb2c1ec58148b6cddce35e6e5a5d90d72e866e2e9
-  data.tar.gz: eb62734dbf1d2168918e958ac4a432ea621eb263c9c17e1f36dad7f9f008e9a3e4499eaa3767daad5f8291017c2d316731cab2c3df3873c47c99c251c7d7ba69
+  metadata.gz: 6272498890dd101132b00edcd65d63b023721afa2d18a77bb17919b53d6220927ff5d532803d1c24e726799ac3d7671b648d2979c38725880403d5cd5dc966be
+  data.tar.gz: 65464584707bb1c54bb8401c847a395ba646f94846d5897fe5e6b099c97d812616035d35770d3106860819ce0d318b8980b56c7e067ace39c683ed6a5fa18273

data/lib/gd/gis/layer_points.rb

@@ -38,17 +38,25 @@ module GD
         label: nil,
         font: nil,
         size: 12,
-        color: [0, 0, 0]
+        color: [0, 0, 0],
+        font_color: nil,
+        count: 0
       )
         @data = data
         @lon = lon
         @lat = lat
+        @color = color
 
         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 %w[numeric alphabetic].include?(icon)
+          @icon = icon
+          @font_color = font_color
         else
           @icon = GD::Image.open(icon)
+          @icon.alpha_blending = true
+          @icon.save_alpha = true
         end
 
         @label = label
@@ -56,9 +64,7 @@ module GD
         @size  = size
         @r, @g, @b, @a = color
         @a = 0 if @a.nil?
-
-        @icon.alpha_blending = true
-        @icon.save_alpha = true
+        @count = count
       end
 
       # Builds a default circular marker icon.
@@ -93,8 +99,21 @@ module GD
       #
       # @return [void]
       def render!(img, projector)
-        w = @icon.width
-        h = @icon.height
+        value = case @icon
+                when "numeric"
+                  @count
+                when "alphabetic"
+                  (@count + 96).chr
+                else
+                  "*"
+                end
+
+        if @icon.is_a?(GD::Image)
+          w = @icon.width
+          h = @icon.height
+        else
+          w = radius_from_text(img, value, font: @font, size: @size) * 2
+        end
 
         @data.each do |row|
           lon = @lon.call(row)
@@ -102,10 +121,6 @@ module GD
 
           x, y = projector.call(lon, lat)
 
-          # icono
-          img.copy(@icon, x - (w / 2), y - (h / 2), 0, 0, w, h)
-
-          # etiqueta opcional
           next unless @label && @font
 
           text = @label.call(row)
@@ -113,6 +128,22 @@ module GD
 
           font_h = @size * 1.1
 
+          if @icon == "numeric" || @icon == "alphabetic"
+
+            draw_symbol_circle!(
+              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),
@@ -121,6 +152,57 @@ module GD
                    font: @font)
         end
       end
+
+      # Draws a filled circle (bullet) with a centered numeric label.
+      #
+      # - 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:, 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
+        img.filled_ellipse(x, y, diameter, diameter, bg_color)
+
+        # 2) Measure text in pixels (matches rendering)
+        text = symbol.to_s
+        w, h = img.text_bbox(text, font: font, size: font_size, angle: angle)
+
+        # 3) Compute centered position:
+        # text() uses baseline Y, so:
+        # top_y     = y - h/2
+        # baseline  = top_y + h = y + h/2
+        text_x = (x - (w / 2.0)).round
+        text_y = (y + (h / 2.0)).round
+
+        # 4) Draw number
+        img.text(
+          text,
+          x: text_x,
+          y: text_y,
+          font: font,
+          size: font_size,
+          color: font_color
+        )
+      end
+
+      # Calculates a circle radius that fully contains the rendered text.
+      #
+      # img      : GD::Image
+      # text     : String (number, letters, etc.)
+      # font     : path to .ttf
+      # size     : font size in points
+      # padding  : extra pixels around text (visual breathing room)
+      #
+      def radius_from_text(img, text, font:, size:, padding: 4)
+        w, h = img.text_bbox(
+          text.to_s,
+          font: font,
+          size: size
+        )
+
+        # Use the larger dimension to ensure the text fits
+        ([w, h].max / 2.0).ceil + padding
+      end
     end
   end
 end

data/lib/gd/gis/map.rb

@@ -133,6 +133,7 @@ module GD
 
         @debug = false
         @used_labels = {}
+        @count = 1
       end
 
       # Returns all features belonging to a given semantic layer.
@@ -258,20 +259,20 @@ module GD
                 warn "Style error: missing 'points' section"
               end
 
-              font = points_style[:font] || begin
+              font = @style.points[:font] || begin
                 warn "[libgd-gis] points.font not defined in style, using random system font"
                 GD::GIS::FontHelper.random
               end
 
-              size = points_style[:size] || begin
+              size = @style.points[:size] || begin
                 warn "[libgd-gis] points.font size not defined in style, using random system font size"
                 (6..14).to_a.sample
               end
 
-              raw_color = points_style[:color]
-              color = @style.normalize_color(raw_color)
+              color = @style.points[:color] ? @style.normalize_color(@style.points[:color]) : GD::GIS::ColorHelpers.random_vivid
+              font_color = @style.points[:font_color] ? @style.normalize_color(@style.points[:font_color]) : [250, 250, 250, 0]
 
-              icon  = if points_style.key?(:icon_fill) && points_style.key?(:icon_stroke)
+              icon  = if @style.points.key?(:icon_fill) && @style.points.key?(:icon_stroke)
                         [points_style[:icon_stroke],
                          points_style[:icon_stroke]]
                       end
@@ -285,8 +286,11 @@ module GD
                 label: ->(f) { f.properties["name"] },
                 font:  font,
                 size:  size,
-                color: color
+                color: color,
+                font_color: font_color,
+                count: @count
               )
+              @count += 1
             elsif LINE_GEOMS.include?(geom_type)
               @layers[:minor] << feature
             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.1
+  version: 0.3.21
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva