libgd-gis 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adcbc0b0d92182bc12b431152cb1f79b202786ef999e3571f42c9ec27e999561
-  data.tar.gz: 50cb494d8e9b2fdf94f9ac126c22f14cb39335c4f1d0289df554f88159b5d389
+  metadata.gz: 853349ea776badb5542429302596948e10214ccd5dd3eb75c31e075bfde0e45e
+  data.tar.gz: 51a6d88d8f49e6e14a363c68fbd9a0837aae91aef028b456f4df20865831fce8
 SHA512:
-  metadata.gz: 704ce58b27ab6ea1096390ad63daa926627f8b4d6b2a7613a0517949129d66850bac74f7860d090b4fd3a8aeb2c1ec58148b6cddce35e6e5a5d90d72e866e2e9
-  data.tar.gz: eb62734dbf1d2168918e958ac4a432ea621eb263c9c17e1f36dad7f9f008e9a3e4499eaa3767daad5f8291017c2d316731cab2c3df3873c47c99c251c7d7ba69
+  metadata.gz: e3430de5b4a01574ccb741d0948de4458b07cae11e196835282c71c88edf2e69f3f6a53f5d35cdaa3195423f0e9bf845324919b233f3aeec68af5719da752173
+  data.tar.gz: e2a9b4e8149839b5b9d7b834757e304979a81e3879a4332f97159e75236be79ea4c4e179a54ed3efd94231c24d290edc83812793b2962ffdbd40ae12549bf40a

data/lib/gd/gis/layer_points.rb

@@ -38,27 +38,35 @@ module GD
         label: nil,
         font: nil,
         size: 12,
-        color: [0, 0, 0]
+        color: [0, 0, 0],
+        font_color: nil,
+        symbol: 0
       )
         @data = data
         @lon = lon
         @lat = lat
+        @color = color
+        @font_color = font_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 symbol].include?(icon)
+          @icon = icon
         else
           @icon = GD::Image.open(icon)
+          @icon.alpha_blending = true
+          @icon.save_alpha = true
         end
 
         @label = label
         @font  = font
         @size  = size
+
         @r, @g, @b, @a = color
         @a = 0 if @a.nil?
 
-        @icon.alpha_blending = true
-        @icon.save_alpha = true
+        @symbol = symbol
       end
 
       # Builds a default circular marker icon.
@@ -93,8 +101,23 @@ module GD
       #
       # @return [void]
       def render!(img, projector)
-        w = @icon.width
-        h = @icon.height
+        value = case @icon
+                when "numeric"
+                  @symbol
+                when "alphabetic"
+                  (@symbol + 96).chr
+                when "symbol"
+                  @symbol
+                else
+                  @icon
+                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 +125,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,14 +132,80 @@ module GD
 
           font_h = @size * 1.1
 
+          if @icon == "numeric" || @icon == "alphabetic" || @icon == "symbol"
+            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),
                    size: @size,
-                   color: GD::Color.rgba(@r, @g, @b, @a),
+                   color: @font_color,
                    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,
+                symbol: @count
               )
+              @count += 1
             elsif LINE_GEOMS.include?(geom_type)
               @layers[:minor] << feature
             end
@@ -294,6 +298,96 @@ module GD
         end
       end
 
+      # Adds a single point (marker) to the map.
+      #
+      # This is a convenience helper for the most common use case: rendering
+      # one point with an optional label and icon, without having to build
+      # a full collection or manually configure a PointsLayer.
+      #
+      # Internally, this method wraps the given coordinates into a one-element
+      # data collection and delegates rendering to {GD::GIS::PointsLayer},
+      # preserving the same rendering behavior and options.
+      #
+      # This method is intended for annotations, markers, alerts, cities,
+      # or any scenario where only one point needs to be rendered.
+      #
+      # @param lon [Numeric]
+      #   Longitude of the point.
+      # @param lat [Numeric]
+      #   Latitude of the point.
+      # @param label [String, nil]
+      #   Optional text label rendered next to the point.
+      # @param icon [String, Array<GD::Color>, nil]
+      #   Marker representation. Can be:
+      #   - a path to an image file
+      #   - :numeric or :alphabetic symbol styles
+      #   - an array of [fill, stroke] colors
+      #   - nil to generate a default marker
+      # @param font [String, nil]
+      #   Font path used to render the label or symbol.
+      # @param size [Integer]
+      #   Font size in pixels (default: 12).
+      # @param color [Array<Integer>]
+      #   Label or symbol background color as an RGB(A) array.
+      # @param font_color [GD::Color, nil]
+      #   Text color for numeric or alphabetic symbols.
+      #
+      # @return [void]
+      #
+      # @example Render a simple point
+      #   map.add_point(
+      #     lon: -58.3816,
+      #     lat: -34.6037
+      #   )
+      #
+      # @example Point with label
+      #   map.add_point(
+      #     lon: -58.3816,
+      #     lat: -34.6037,
+      #     label: "Buenos Aires"
+      #   )
+      #
+      # @example Point with numeric marker
+      #   map.add_point(
+      #     lon: -58.3816,
+      #     lat: -34.6037,
+      #     icon: "numeric",
+      #     label: "1",
+      #     font: "/usr/share/fonts/DejaVuSans.ttf"
+      #   )
+      #
+
+      def add_point(
+        lon:,
+        lat:,
+        label: nil,
+        icon: nil,
+        font: nil,
+        size: nil,
+        color: nil,
+        font_color: nil,
+        symbol: nil
+      )
+        row = {
+          lon: lon,
+          lat: lat,
+          label: label
+        }
+
+        @points_layers << GD::GIS::PointsLayer.new(
+          [row],
+          lon: -> r { r[:lon] },
+          lat: -> r { r[:lat] },
+          icon: icon || @style.point[:icon],
+          label: label ? -> r { r[:label] } : nil,
+          font: font || @style.point[:font],
+          size: size || @style.point[:size],
+          color: color || @style.point[:color],
+          font_color: font_color || @style.point[:font_color],
+          symbol: symbol
+        )
+      end
+
       # Adds a generic points overlay layer.
       #
       # @param data [Enumerable]

data/lib/gd/gis/style.rb

@@ -17,6 +17,9 @@ module GD
       # @return [Hash] global styling rules
       attr_reader :global
 
+      # @return [Hash] point styling rules
+      attr_reader :point
+
       # @return [Hash] road styling rules
       attr_reader :roads
 
@@ -45,6 +48,7 @@ module GD
       #   :global, :roads, :rails, :water, :parks, :points, :order, :track
       def initialize(definition)
         @global = definition[:global] || {}
+        @point = definition[:point] || {}
         @roads = definition[:roads] || {}
         @rails = definition[:rails] || {}
         @water = definition[:water] || {}
@@ -79,6 +83,7 @@ module GD
 
         new(
           global: data[:global],
+          point: data[:point],
           roads: data[:roads],
           rails: data[:rail] || data[:rails],
           track: data[:track],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgd-gis
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Germán Alberto Giménez Silva
@@ -57,7 +57,6 @@ files:
 - lib/gd/gis/projection.rb
 - lib/gd/gis/style.rb
 - lib/libgd_gis.rb
-- lib/test.rb
 homepage: https://github.com/ggerman/libgd-gis
 licenses:
 - MIT
@@ -77,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Geospatial raster rendering for Ruby using libgd
 test_files: []

data/lib/test.rb

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