libgd-gis 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54f40ea70b79fc866db311f7ac994ca267483f62de518b2f6f4f5989957f5e6
-  data.tar.gz: c8825bd11685f5a0254bd5fdaa5b654cee53dff608a990ac91bc4bacfcba4f31
+  metadata.gz: 853349ea776badb5542429302596948e10214ccd5dd3eb75c31e075bfde0e45e
+  data.tar.gz: 51a6d88d8f49e6e14a363c68fbd9a0837aae91aef028b456f4df20865831fce8
 SHA512:
-  metadata.gz: 7bf12c61f036e85b93aa1b7617fb2aa63f9c0fb788f3ad53e1bf313259b5847658e3c1c1cf2682227fdc9d542cabf86489cb94d9a79c5cf15949519dfe08be69
-  data.tar.gz: bdc13c7e7aa1e99f4328c3ea69699b4e8f548ea5aeb975b317a81fe136d8dc94b1e64655987f51a0fcf4db0af030ffd8e5a125ae8cd3191a34c8814575cffa0e
+  metadata.gz: e3430de5b4a01574ccb741d0948de4458b07cae11e196835282c71c88edf2e69f3f6a53f5d35cdaa3195423f0e9bf845324919b233f3aeec68af5719da752173
+  data.tar.gz: e2a9b4e8149839b5b9d7b834757e304979a81e3879a4332f97159e75236be79ea4c4e179a54ed3efd94231c24d290edc83812793b2962ffdbd40ae12549bf40a

data/lib/gd/gis/layer_points.rb

@@ -40,19 +40,19 @@ module GD
         size: 12,
         color: [0, 0, 0],
         font_color: nil,
-        count: 0
+        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 icon == "numeric" || icon == "alphabetic"
+        elsif %w[numeric alphabetic symbol].include?(icon)
           @icon = icon
-          @font_color = font_color
         else
           @icon = GD::Image.open(icon)
           @icon.alpha_blending = true
@@ -62,10 +62,11 @@ module GD
         @label = label
         @font  = font
         @size  = size
+
         @r, @g, @b, @a = color
         @a = 0 if @a.nil?
-        @count = count
 
+        @symbol = symbol
       end
 
       # Builds a default circular marker icon.
@@ -100,18 +101,19 @@ 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"
+                  @symbol
+                when "alphabetic"
+                  (@symbol + 96).chr
+                when "symbol"
+                  @symbol
+                else
+                  @icon
+                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 +129,30 @@ module GD
 
           text = @label.call(row)
           next if text.nil? || text.strip.empty?
-          font_h = @size * 1.1
 
-          if @icon == "numeric" || @icon == "alphabetic"
+          font_h = @size * 1.1
 
+          if @icon == "numeric" || @icon == "alphabetic" || @icon == "symbol"
             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: @font_color,
+                   font: @font)
         end
       end
 
@@ -159,7 +160,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
@@ -175,7 +176,7 @@ module GD
         # 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,
@@ -203,9 +204,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/gd/gis/map.rb

@@ -288,7 +288,7 @@ module GD
                 size:  size,
                 color: color,
                 font_color: font_color,
-                count: @count
+                symbol: @count
               )
               @count += 1
             elsif LINE_GEOMS.include?(geom_type)
@@ -298,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.2
+  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)